From 54530b768109a1881242f3619b4fe9ce602536db Mon Sep 17 00:00:00 2001
From: boris <safonovboris@gmail.com>
Date: Thu, 15 Feb 2024 22:05:43 +0200
Subject: [PATCH] fix: MLS degraded dialogs [WPB-6607] (#2712)

---
 .../android/ui/home/conversations/ConversationScreen.kt     | 2 +-
 .../ui/home/conversations/MessageComposerViewModel.kt       | 6 +-----
 .../ui/home/conversations/call/ConversationCallViewModel.kt | 2 +-
 kalium                                                      | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

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 3f1f02df25b..489031fba1d 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
@@ -281,6 +281,7 @@ fun ConversationScreen(
         ConversationScreenDialogType.VERIFICATION_DEGRADED -> {
             SureAboutCallingInDegradedConversationDialog(
                 callAnyway = {
+                    conversationCallViewModel.onApplyConversationDegradation()
                     startCallIfPossible(
                         conversationCallViewModel,
                         showDialog,
@@ -293,7 +294,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 7850cdd67f2..c95e4d6a1b0 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
@@ -186,7 +186,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/kalium b/kalium
index 469b32aa1a2..5a54e99268d 160000
--- a/kalium
+++ b/kalium
@@ -1 +1 @@
-Subproject commit 469b32aa1a25cdfa3dd1dab801407b3b5fafc95e
+Subproject commit 5a54e99268db9a3ce8a625bffaf0fcc506da9019