fix: app lock dialog blinking (WPB-5610) (#2470)

Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Alexandre Ferris <[email protected]>
wireapp · Nov 27, 2023 · 471f583 · 471f583
1 parent 36fd8d6
commit 471f583
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt b/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
@@ -96,6 +96,7 @@ import com.wire.android.util.debug.FeatureVisibilityFlags
 import com.wire.android.util.debug.LocalFeatureVisibilityFlags
 import com.wire.android.util.deeplink.DeepLinkResult
 import com.wire.android.util.ui.updateScreenSettings
+import com.wire.kalium.logic.data.user.UserId
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.collectLatest
@@ -206,7 +207,10 @@ class WireActivity : AppCompatActivity() {
                         setUpNavigation(navigator.navController, onComplete)
                         isLoaded = true
                         handleScreenshotCensoring()
-                        handleDialogs(navigator::navigate)
+                        handleDialogs(
+                            navigator::navigate,
+                            viewModel.currentUserId.value
+                        )
                     }
                 }
             }
@@ -261,8 +265,10 @@ class WireActivity : AppCompatActivity() {
 
     @Suppress("ComplexMethod")
     @Composable
-    private fun handleDialogs(navigate: (NavigationCommand) -> Unit) {
-        featureFlagNotificationViewModel.loadInitialSync()
+    private fun handleDialogs(navigate: (NavigationCommand) -> Unit, userId: UserId?) {
+        LaunchedEffect(userId) {
+            featureFlagNotificationViewModel.loadInitialSync()
+        }
         with(featureFlagNotificationViewModel.featureFlagState) {
             if (shouldShowTeamAppLockDialog) {
                 TeamAppLockFeatureFlagDialog(

diff --git a/app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt
@@ -21,6 +21,7 @@
 package com.wire.android.ui
 
 import android.content.Intent
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -120,6 +121,7 @@ class WireActivityViewModel @Inject constructor(
                 if (it.accountInfo.isValid().not()) {
                     handleInvalidSession((it.accountInfo as AccountInfo.Invalid).logoutReason)
                 }
+                currentUserId.value = it.accountInfo.userId
             }
         }
         .map { result ->
@@ -137,6 +139,8 @@ class WireActivityViewModel @Inject constructor(
     private val _observeSyncFlowState: MutableStateFlow<SyncState?> = MutableStateFlow(null)
     val observeSyncFlowState: StateFlow<SyncState?> = _observeSyncFlowState
 
+    val currentUserId: MutableState<UserId?> = mutableStateOf(null)
+
     init {
         observeSyncState()
         observeUpdateAppState()