fix(e2ei): loading e2ei state during the app initialisation (#2755)

Co-authored-by: Mojtaba Chenani <[email protected]> Co-authored-by: Mohamad Jaara <[email protected]>
wireapp · Mar 4, 2024 · f54e896 · f54e896
1 parent 1875400
commit f54e896
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt
@@ -145,16 +145,19 @@ class WireActivityViewModel @Inject constructor(
     private val _observeSyncFlowState: MutableStateFlow<SyncState?> = MutableStateFlow(null)
     val observeSyncFlowState: StateFlow<SyncState?> = _observeSyncFlowState
 
-    private val _observeE2EIState: MutableStateFlow<Boolean?> = MutableStateFlow(null)
-    private val observeE2EIState: StateFlow<Boolean?> = _observeE2EIState
+    private val observeE2EIState = observeUserId
+        .flatMapLatest {
+            it?.let { observeIfE2EIRequiredDuringLoginUseCaseProviderFactory.create(it).observeIfE2EIIsRequiredDuringLogin() }
+                ?: flowOf(null)
+        }
+        .distinctUntilChanged()
 
     init {
         observeSyncState()
         observeUpdateAppState()
         observeNewClientState()
         observeScreenshotCensoringConfigState()
         observeAppThemeState()
-        observerE2EIState()
     }
 
     private fun observeAppThemeState() {
@@ -167,18 +170,6 @@ class WireActivityViewModel @Inject constructor(
         }
     }
 
-    fun observerE2EIState() {
-        viewModelScope.launch(dispatchers.io()) {
-            observeUserId
-                .flatMapLatest {
-                    it?.let { observeIfE2EIRequiredDuringLoginUseCaseProviderFactory.create(it).observeIfE2EIIsRequiredDuringLogin() }
-                        ?: flowOf(null)
-                }
-                .distinctUntilChanged()
-                .collect { _observeE2EIState.emit(it) }
-        }
-    }
-
     private fun observeSyncState() {
         viewModelScope.launch(dispatchers.io()) {
             observeUserId
@@ -434,8 +425,8 @@ class WireActivityViewModel @Inject constructor(
 
     fun shouldLogIn(): Boolean = !hasValidCurrentSession()
 
-    fun blockedByE2EI(): Boolean {
-        return observeE2EIState.value == true
+    private fun blockedByE2EI(): Boolean = runBlocking {
+        observeE2EIState.first() ?: false
     }
 
     private fun hasValidCurrentSession(): Boolean = runBlocking {

diff --git a/app/src/test/kotlin/com/wire/android/ui/WireActivityViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/WireActivityViewModelTest.kt
@@ -590,9 +590,6 @@ class WireActivityViewModelTest {
 
     private class Arrangement {
 
-        // TODO add tests for cases when observeIfE2EIIsRequiredDuringLogin emits semothing
-        private val observeIfE2EIIsRequiredDuringLogin = MutableSharedFlow<Boolean?>()
-
         init {
             // Tests setup
             MockKAnnotations.init(this, relaxUnitFun = true)
@@ -614,7 +611,7 @@ class WireActivityViewModelTest {
             coEvery { currentScreenManager.observeCurrentScreen(any()) } returns MutableStateFlow(CurrentScreen.SomeOther)
             coEvery { globalDataStore.selectedThemeOptionFlow() } returns flowOf(ThemeOption.LIGHT)
             coEvery { observeIfE2EIRequiredDuringLoginUseCaseProviderFactory.create(any()).observeIfE2EIIsRequiredDuringLogin() } returns
-                    observeIfE2EIIsRequiredDuringLogin
+                    flowOf(false)
         }
 
         @MockK
@@ -766,6 +763,7 @@ class WireActivityViewModelTest {
 
         fun withCurrentScreen(currentScreenFlow: StateFlow<CurrentScreen>) = apply {
             coEvery { currentScreenManager.observeCurrentScreen(any()) } returns currentScreenFlow
+            coEvery { coreLogic.getSessionScope(TEST_ACCOUNT_INFO.userId).observeIfE2EIRequiredDuringLogin() } returns flowOf(false)
         }
 
         suspend fun withScreenshotCensoringConfig(result: ObserveScreenshotCensoringConfigResult) = apply {