diff --git a/app/src/main/java/org/linphone/ui/call/model/CallMediaEncryptionModel.kt b/app/src/main/java/org/linphone/ui/call/model/CallMediaEncryptionModel.kt index 97cd407eb..30df43516 100644 --- a/app/src/main/java/org/linphone/ui/call/model/CallMediaEncryptionModel.kt +++ b/app/src/main/java/org/linphone/ui/call/model/CallMediaEncryptionModel.kt @@ -26,9 +26,10 @@ import org.linphone.core.Call import org.linphone.core.MediaEncryption import org.linphone.core.StreamType import org.linphone.utils.AppUtils -import org.linphone.utils.Event -class CallMediaEncryptionModel @WorkerThread constructor() { +class CallMediaEncryptionModel @WorkerThread constructor( + private val showZrtpSasValidationDialog: () -> Unit +) { val mediaEncryption = MutableLiveData() val isMediaEncryptionZrtp = MutableLiveData() @@ -38,10 +39,6 @@ class CallMediaEncryptionModel @WorkerThread constructor() { val zrtpAuthTag = MutableLiveData() val zrtpAuthSas = MutableLiveData() - val showZrtpSasValidationDialogEvent: MutableLiveData> by lazy { - MutableLiveData>() - } - @WorkerThread fun update(call: Call) { isMediaEncryptionZrtp.postValue(false) @@ -112,6 +109,6 @@ class CallMediaEncryptionModel @WorkerThread constructor() { } fun showSasValidationDialog() { - showZrtpSasValidationDialogEvent.value = Event(true) + showZrtpSasValidationDialog.invoke() } } 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 6b084dfcc..e470a9c97 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 @@ -106,7 +106,9 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() { val callStatsModel = CallStatsModel() - val callMediaEncryptionModel = CallMediaEncryptionModel() + val callMediaEncryptionModel = CallMediaEncryptionModel() { + showZrtpSasDialogIfPossible() + } val incomingCallTitle: MutableLiveData by lazy { MutableLiveData()