diff --git a/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt index 2200f2e4d..cbb091a06 100644 --- a/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt +++ b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt @@ -281,7 +281,7 @@ class ActiveCallFragment : GenericCallFragment() { ) } else { // Only allow "trying again" once - showZrtpAlertDialog(callViewModel.zrtpSasValidationAttempts == 1) + showZrtpAlertDialog(false) } } } @@ -432,7 +432,7 @@ class ActiveCallFragment : GenericCallFragment() { if (callViewModel.isZrtpAlertDialogVisible) { Log.i("$TAG Fragment resuming, showing ZRTP alert dialog") - showZrtpAlertDialog(callViewModel.zrtpSasValidationAttempts == 1) + showZrtpAlertDialog(false) } else if (callViewModel.isZrtpDialogVisible) { Log.i("$TAG Fragment resuming, showing ZRTP SAS validation dialog") callViewModel.showZrtpSasDialogIfPossible() 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 e8c558b07..da1ed8d73 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 @@ -177,8 +177,6 @@ class CurrentCallViewModel @UiThread constructor() : GenericViewModel() { MutableLiveData>() } - var zrtpSasValidationAttempts = 0 - var isZrtpDialogVisible: Boolean = false var isZrtpAlertDialogVisible: Boolean = false @@ -251,7 +249,6 @@ class CurrentCallViewModel @UiThread constructor() : GenericViewModel() { Log.w( "$TAG Notified that authentication token is [${if (verified) "verified" else "not verified!"}]" ) - zrtpSasValidationAttempts += 1 isZrtpSasValidationRequired.postValue(!verified) zrtpAuthTokenVerifiedEvent.postValue(Event(verified)) if (verified) { @@ -1022,7 +1019,6 @@ class CurrentCallViewModel @UiThread constructor() : GenericViewModel() { contact.value?.destroy() terminatedByUsed = false - zrtpSasValidationAttempts = 0 currentCall = call callStatsModel.update(call, call.audioStats) callMediaEncryptionModel.update(call) diff --git a/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml b/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml index 1c63689c1..17142a0b9 100644 --- a/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml +++ b/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml @@ -13,8 +13,8 @@ + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp"> + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp"> + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp"> + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp">