From c816a0be3fbd5a706c2efe6d020a549651a90118 Mon Sep 17 00:00:00 2001 From: AndroidBob Date: Thu, 7 Mar 2024 11:18:14 +0100 Subject: [PATCH] fix: e2e webview close [WPB-6788] (#2764) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Żerko --- .../wire/android/ui/e2eiEnrollment/GetE2EICertificateUI.kt | 6 +++--- kalium | 2 +- 2 files changed, 4 insertions(+), 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 index 65a869c0167..9a844bea755 100644 --- 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 index 5c7e158aaec..1cfa01fb202 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 5c7e158aaec6b4f5dec4377259eb1f0f45667ff2 +Subproject commit 1cfa01fb2024a56a4494a757b174a056b3883acb