From 8c068d3be7ec08d99c806636cb5b04c9acd4a1d1 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 23 Jan 2024 11:44:27 +0100 Subject: [PATCH] Prevent call trusted toast to be displayed multiple times + fixed number of paused calls when > 2 --- .../java/org/linphone/ui/call/viewmodel/CallsViewModel.kt | 2 +- .../org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt index a666e2582..501c3c1c0 100644 --- a/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt @@ -224,7 +224,7 @@ class CallsViewModel @UiThread constructor() : ViewModel() { } } else { otherCallsLabel.postValue( - AppUtils.getFormattedString(R.string.calls_paused_count_label, core.callsNb) + AppUtils.getFormattedString(R.string.calls_paused_count_label, core.callsNb - 1) ) otherCallsStatus.postValue("") // TODO: improve ? } diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt index 72f361729..bc00650ed 100644 --- a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt @@ -694,7 +694,9 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() { Log.i( "$TAG Current call media encryption is ZRTP, auth token is ${if (isDeviceTrusted) "trusted" else "not trusted yet"}" ) - isRemoteDeviceTrusted.postValue(isDeviceTrusted) + if (isDeviceTrusted != isRemoteDeviceTrusted.value) { + isRemoteDeviceTrusted.postValue(isDeviceTrusted) + } val securityLevel = if (isDeviceTrusted) SecurityLevel.Safe else SecurityLevel.Encrypted val avatarModel = contact.value if (avatarModel != null) {