fix: e2e webview close [WPB-6788] (#2764)

Co-authored-by: Jakub Żerko <[email protected]>
wireapp · Mar 7, 2024 · c816a0b · c816a0b
1 parent 8b0809e
commit c816a0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/e2eiEnrollment/GetE2EICertificateUI.kt b/app/src/main/kotlin/com/wire/android/ui/e2eiEnrollment/GetE2EICertificateUI.kt
@@ -39,7 +39,6 @@ fun GetE2EICertificateUI(
     val coroutineScope = rememberCoroutineScope()
     val context = LocalContext.current
 
-    // FIXME issue happens when this UI is called from WireActivity: WebView is just canceled by itself
     LaunchedEffect(Unit) {
         viewModel.requestOAuthFlow.onEach {
             OAuthUseCase(context, it.target, it.oAuthClaims, it.oAuthState).launch(
@@ -51,6 +50,7 @@ fun GetE2EICertificateUI(
     LaunchedEffect(Unit) {
         viewModel.enrollmentResultFlow.onEach { enrollmentResultHandler(it) }.launchIn(coroutineScope)
     }
-
-    viewModel.getCertificate(isNewClient)
+    LaunchedEffect(Unit) {
+        viewModel.getCertificate(isNewClient)
+    }
 }
diff --git a/kalium b/kalium
+2 −0		logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/CoreCryptoExceptionMapper.kt
+8 −6		logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/CallManagerImpl.kt
+2 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreFailure.kt
+7 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/configuration/UserConfigRepository.kt
+1 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ClientModel.kt
+22 −22		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/e2ei/CertificateRevocationListRepository.kt
+0 −12		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/e2ei/E2EIRepository.kt
+4 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/team/TeamRepository.kt
+16 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+60 −0		.../commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/CheckRevocationListForCurrentClientUseCase.kt
+4 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/CheckRevocationListUseCase.kt
+41 −21		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/user/UpdateSelfUserSupportedProtocolsUseCase.kt
+2 −0		.../src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/MLSMessageFailureHandler.kt
+27 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/client/ClientTest.kt
+7 −5		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/team/TeamRepositoryTest.kt
+1 −1		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/user/UserRepositoryTest.kt
+208 −0		...monTest/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/CheckRevocationListForCurrentClientUseCaseTest.kt
+152 −104		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/user/UpdateSupportedProtocolsUseCaseTest.kt
+5 −0		monkeys/schema.json
+2 −1		monkeys/src/main/kotlin/com/wire/kalium/monkeys/MonkeyApplication.kt
+1 −0		monkeys/src/main/kotlin/com/wire/kalium/monkeys/model/TestData.kt
+11 −5		monkeys/src/main/kotlin/com/wire/kalium/monkeys/model/TestDataImporter.kt
+13 −1		monkeys/src/main/kotlin/com/wire/kalium/monkeys/model/UserData.kt
+16 −5		monkeys/src/main/kotlin/com/wire/kalium/monkeys/pool/MonkeyPool.kt
+12 −4		network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/TeamsApi.kt
+2 −1		network/src/commonMain/kotlin/com/wire/kalium/network/api/base/unbound/acme/ACMEApi.kt
+8 −3		network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/TeamsApiV0.kt
+9 −10		network/src/commonMain/kotlin/com/wire/kalium/network/api/v4/authenticated/ConversationApiV4.kt
+11 −5		network/src/commonMain/kotlin/com/wire/kalium/network/utils/NetworkUtils.kt
+19 −0		network/src/commonTest/kotlin/com/wire/kalium/api/v0/teams/TeamsApiV0Test.kt
+1 −1		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationDAO.kt
+3 −3		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationDAOImpl.kt
+11 −0		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/unread/UserConfigDAO.kt
+16 −0		persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/ConversationDAOTest.kt