diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt index 9c0ebc4aa59..c676fe86ce4 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt @@ -276,6 +276,7 @@ fun ConversationScreen( ConversationScreenDialogType.VERIFICATION_DEGRADED -> { SureAboutCallingInDegradedConversationDialog( callAnyway = { + conversationCallViewModel.onApplyConversationDegradation() startCallIfPossible( conversationCallViewModel, showDialog, @@ -288,7 +289,6 @@ fun ConversationScreen( }, onDialogDismiss = { showDialog.value = ConversationScreenDialogType.NONE } ) - conversationCallViewModel.onConversationDegradedDialogShown() } ConversationScreenDialogType.NONE -> {} diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageComposerViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageComposerViewModel.kt index fbe5d4155cf..895d94e96de 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageComposerViewModel.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageComposerViewModel.kt @@ -525,11 +525,7 @@ class MessageComposerViewModel @Inject constructor( } fun dismissSureAboutSendingMessage() { - (sureAboutMessagingDialogState as? SureAboutMessagingDialogState.Visible)?.let { - viewModelScope.launch { - it.markAsNotified() - } - } + sureAboutMessagingDialogState = SureAboutMessagingDialogState.Hidden } private suspend fun SureAboutMessagingDialogState.markAsNotified() { diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/call/ConversationCallViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/call/ConversationCallViewModel.kt index 76bb7116b5f..cec753332d2 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/call/ConversationCallViewModel.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/call/ConversationCallViewModel.kt @@ -178,7 +178,7 @@ class ConversationCallViewModel @Inject constructor( suspend fun isConferenceCallingEnabled(conversationType: Conversation.Type): ConferenceCallingResult = isConferenceCallingEnabled.invoke(conversationId, conversationType) - fun onConversationDegradedDialogShown() { + fun onApplyConversationDegradation() { viewModelScope.launch { setUserInformedAboutVerification.invoke(conversationId) } diff --git a/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt index 687dfcc4359..3ef93208574 100644 --- a/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt +++ b/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt @@ -341,7 +341,7 @@ class DeviceDetailsViewModelTest { MockKAnnotations.init(this, relaxUnitFun = true) withFingerprintSuccess() coEvery { observeUserInfo(any()) } returns flowOf(GetUserInfoResult.Success(TestUser.OTHER_USER, null)) - coEvery { getE2eiCertificate(any()) } returns GetE2EICertificateUseCaseResult.Failure.NotActivated + coEvery { getE2eiCertificate(any()) } returns GetE2EICertificateUseCaseResult.NotActivated coEvery { isE2EIEnabledUseCase() } returns true } diff --git a/kalium b/kalium index dba769de889..701154449d9 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit dba769de889c4cbfa1c3d69ffa36893b89bed180 +Subproject commit 701154449d9b615f928b69aad03ba840353a88d1