fix(deps): update kotlin to 2.3.0 (#5917)
* fix(deps): update kotlin to 2.3.0 * Cleanup - remove `datetime` compat version * Fix several lint issues caused by the Kotlin compiler inference working better (checks in nullables, vars, etc.) * Fix tests by removing mock in `File.readBytes`, it seems like it's no longer allowed. Using a tmp file works well enough. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Benoit Marty <benoit@matrix.org> Co-authored-by: Jorge Martín <jorgem@element.io>
This commit is contained in:
parent
dbf32a1bfe
commit
00dcbf4a7f
11 changed files with 119 additions and 107 deletions
|
|
@ -177,8 +177,8 @@ class DefaultActiveCallManager(
|
|||
suspend fun incomingCallTimedOut(displayMissedCallNotification: Boolean) = mutex.withLock {
|
||||
Timber.tag(tag).d("Incoming call timed out")
|
||||
|
||||
val previousActiveCall = activeCall.value ?: return
|
||||
val notificationData = (previousActiveCall.callState as? CallState.Ringing)?.notificationData ?: return
|
||||
val previousActiveCall = activeCall.value ?: return@withLock
|
||||
val notificationData = (previousActiveCall.callState as? CallState.Ringing)?.notificationData ?: return@withLock
|
||||
activeCall.value = null
|
||||
if (activeWakeLock?.isHeld == true) {
|
||||
Timber.tag(tag).d("Releasing partial wakelock after timeout")
|
||||
|
|
@ -196,11 +196,11 @@ class DefaultActiveCallManager(
|
|||
Timber.tag(tag).d("Hung up call: $callType")
|
||||
val currentActiveCall = activeCall.value ?: run {
|
||||
Timber.tag(tag).w("No active call, ignoring hang up")
|
||||
return
|
||||
return@withLock
|
||||
}
|
||||
if (currentActiveCall.callType != callType) {
|
||||
Timber.tag(tag).w("Call type $callType does not match the active call type, ignoring")
|
||||
return
|
||||
return@withLock
|
||||
}
|
||||
if (currentActiveCall.callState is CallState.Ringing) {
|
||||
// Decline the call
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue