fix: MLS degraded dialogs [WPB-6607] (#2715)

Co-authored-by: boris <[email protected]> Co-authored-by: Boris Safonov <[email protected]>
wireapp · Feb 19, 2024 · bbeeb09 · bbeeb09
1 parent 0df0e03
commit bbeeb09
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 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
@@ -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
@@ -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
@@ -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
@@ -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
+1 −1		.github/workflows/gradle-ios-tests.yml
+4 −4		logic/src/commonMain/kotlin/com/wire/kalium/logic/configuration/UserConfigRepository.kt
+2 −2		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt
+3 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/user/UserRepository.kt
+2 −0		...commonMain/kotlin/com/wire/kalium/logic/feature/conversation/MLSConversationsVerificationStatusesHandler.kt
+7 −6		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/GetE2EICertificateUseCase.kt
+25 −29		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/user/ObserveE2EIRequiredUseCase.kt
+31 −30		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt
+29 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/user/UserRepositoryTest.kt
+25 −38		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/client/ObserveE2EIRequiredUseCaseTest.kt
+26 −0		...onTest/kotlin/com/wire/kalium/logic/feature/conversation/MLSConversationsVerificationStatusesHandlerTest.kt
+27 −5		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/GetE2eiCertificateUseCaseTest.kt
+9 −0		...rc/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/repository/ConversationRepositoryArrangement.kt
+25 −12		monkeys/README.md
+5 −0		monkeys/schema.json
+1 −0		monkeys/src/main/kotlin/com/wire/kalium/monkeys/Utils.kt
+12 −5		monkeys/src/main/kotlin/com/wire/kalium/monkeys/conversation/LocalMonkey.kt
+1 −0		monkeys/src/main/kotlin/com/wire/kalium/monkeys/model/TestData.kt
+30 −10		monkeys/src/main/kotlin/com/wire/kalium/monkeys/model/TestDataImporter.kt
+27 −4		monkeys/src/main/kotlin/com/wire/kalium/monkeys/model/UserData.kt
+3 −2		monkeys/src/main/kotlin/com/wire/kalium/monkeys/server/MonkeyServer.kt
+5 −4		monkeys/src/main/kotlin/com/wire/kalium/monkeys/server/routes/Monkey.kt
+1 −1		network/src/commonMain/kotlin/com/wire/kalium/network/BackendMetaDataUtil.kt
+3 −2		network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/AuthenticatedNetworkContainer.kt
+3 −2		network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/UnauthenticatedNetworkContainer.kt
+7 −0		network/src/commonTest/kotlin/com/wire/kalium/api/common/SupportedApiVersionTest.kt
+1 −0		persistence/src/commonMain/db_global/migrations/7.sqm
+4 −3		persistence/src/commonMain/db_user/com/wire/kalium/persistence/Conversations.sq
+10 −7		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/config/UserConfigStorage.kt
+160 −141		persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/ConversationDAOTest.kt