fix: 1:1 calls can not be established on staging environment (WPB-935…

…9) - approach 3 (#3037) Co-authored-by: Oussama Hassine <[email protected]>
wireapp · May 27, 2024 · 5d92eb5 · 5d92eb5
1 parent c4d8002
commit 5d92eb5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 33 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -130,6 +130,7 @@ dependencies {
     implementation(libs.androidx.lifecycle.viewModel)
     implementation(libs.androidx.lifecycle.viewModelCompose)
     implementation(libs.androidx.lifecycle.liveData)
+    implementation(libs.androidx.lifecycle.process)
     implementation(libs.androidx.lifecycle.runtime)
     implementation(libs.androidx.lifecycle.viewModelSavedState)
 

diff --git a/app/src/main/kotlin/com/wire/android/WireApplication.kt b/app/src/main/kotlin/com/wire/android/WireApplication.kt
@@ -22,11 +22,13 @@ import android.app.Application
 import android.content.ComponentCallbacks2
 import android.os.Build
 import android.os.StrictMode
+import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.work.Configuration
 import co.touchlab.kermit.platformLogWriter
 import com.wire.android.datastore.GlobalDataStore
 import com.wire.android.di.ApplicationScope
 import com.wire.android.di.KaliumCoreLogic
+import com.wire.android.util.CurrentScreenManager
 import com.wire.android.util.DataDogLogger
 import com.wire.android.util.LogFileWriter
 import com.wire.android.util.getGitBuildId
@@ -39,8 +41,10 @@ import com.wire.kalium.logic.CoreLogic
 import dagger.Lazy
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 @HiltAndroidApp
@@ -69,6 +73,9 @@ class WireApplication : Application(), Configuration.Provider {
     @ApplicationScope
     lateinit var globalAppScope: CoroutineScope
 
+    @Inject
+    lateinit var currentScreenManager: CurrentScreenManager
+
     override val workManagerConfiguration: Configuration
         get() = Configuration.Builder()
             .setWorkerFactory(wireWorkerFactory.get())
@@ -84,6 +91,9 @@ class WireApplication : Application(), Configuration.Provider {
             initializeApplicationLoggingFrameworks()
 
             appLogger.i("$TAG app lifecycle")
+            withContext(Dispatchers.Main) {
+                ProcessLifecycleOwner.get().lifecycle.addObserver(currentScreenManager)
+            }
             connectionPolicyManager.get().startObservingAppLifecycle()
 
             appLogger.i("$TAG api version update")

diff --git a/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt b/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
@@ -149,7 +149,6 @@ class WireActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         splashScreen.setKeepOnScreenCondition { shouldKeepSplashOpen }
 
-        lifecycle.addObserver(currentScreenManager)
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
         lifecycleScope.launch(Dispatchers.Default) {

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallViewModel.kt
@@ -28,8 +28,6 @@ import com.wire.android.appLogger
 import com.wire.android.datastore.GlobalDataStore
 import com.wire.android.di.CurrentAccount
 import com.wire.android.ui.calling.model.UICallParticipant
-import com.wire.android.util.CurrentScreen
-import com.wire.android.util.CurrentScreenManager
 import com.wire.kalium.logic.data.call.Call
 import com.wire.kalium.logic.data.call.CallClient
 import com.wire.kalium.logic.data.call.VideoState
@@ -58,7 +56,6 @@ class OngoingCallViewModel @AssistedInject constructor(
     private val establishedCalls: ObserveEstablishedCallsUseCase,
     private val requestVideoStreams: RequestVideoStreamsUseCase,
     private val setVideoSendState: SetVideoSendStateUseCase,
-    private val currentScreenManager: CurrentScreenManager
 ) : ViewModel() {
     var shouldShowDoubleTapToast: Boolean by mutableStateOf(false)
         private set
@@ -112,10 +109,7 @@ class OngoingCallViewModel @AssistedInject constructor(
             .distinctUntilChanged()
             .collect { calls ->
                 val currentCall = calls.find { call -> call.conversationId == conversationId }
-                val currentScreen =
-                    currentScreenManager.observeCurrentScreen(viewModelScope).first()
-                val isOnBackground = currentScreen is CurrentScreen.InBackground
-                if (currentCall == null && isOnBackground) {
+                if (currentCall == null) {
                     state = state.copy(flowState = OngoingCallState.FlowState.CallClosed)
                 }
             }

diff --git a/app/src/main/kotlin/com/wire/android/util/CurrentScreenManager.kt b/app/src/main/kotlin/com/wire/android/util/CurrentScreenManager.kt
@@ -99,11 +99,6 @@ class CurrentScreenManager @Inject constructor(
      */
     fun isAppVisibleFlow(): StateFlow<Boolean> = isApplicationVisibleFlow
 
-    override fun onResume(owner: LifecycleOwner) {
-        super.onResume(owner)
-        appLogger.i("${TAG}: onResume called")
-    }
-
     override fun onStart(owner: LifecycleOwner) {
         super.onStart(owner)
         appLogger.i("${TAG}: onStart called")

diff --git a/app/src/test/kotlin/com/wire/android/ui/calling/OngoingCallViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/calling/OngoingCallViewModelTest.kt
@@ -24,8 +24,6 @@ import com.wire.android.datastore.GlobalDataStore
 import com.wire.android.ui.calling.model.UICallParticipant
 import com.wire.android.ui.calling.ongoing.OngoingCallViewModel
 import com.wire.android.ui.home.conversationslist.model.Membership
-import com.wire.android.util.CurrentScreen
-import com.wire.android.util.CurrentScreenManager
 import com.wire.kalium.logic.data.call.Call
 import com.wire.kalium.logic.data.call.CallClient
 import com.wire.kalium.logic.data.call.CallStatus
@@ -42,7 +40,6 @@ import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.impl.annotations.MockK
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
 import org.amshove.kluent.internal.assertEquals
@@ -58,7 +55,6 @@ class OngoingCallViewModelTest {
     fun givenAnOngoingCall_WhenTurningOnCamera_ThenSetVideoSendStateToStarted() = runTest {
         val (arrangement, ongoingCallViewModel) = Arrangement()
             .withCall(provideCall())
-            .withCurrentScreen(CurrentScreen.SomeOther)
             .withShouldShowDoubleTapToastReturning(false)
             .withSetVideoSendState()
             .arrange()
@@ -72,7 +68,6 @@ class OngoingCallViewModelTest {
     fun givenAnOngoingCall_WhenTurningOffCamera_ThenSetVideoSendStateToStopped() = runTest {
         val (arrangement, ongoingCallViewModel) = Arrangement()
             .withCall(provideCall())
-            .withCurrentScreen(CurrentScreen.SomeOther)
             .withShouldShowDoubleTapToastReturning(false)
             .withSetVideoSendState()
             .arrange()
@@ -92,7 +87,6 @@ class OngoingCallViewModelTest {
 
             val (arrangement, ongoingCallViewModel) = Arrangement()
                 .withCall(provideCall())
-                .withCurrentScreen(CurrentScreen.SomeOther)
                 .withShouldShowDoubleTapToastReturning(false)
                 .withSetVideoSendState()
                 .withRequestVideoStreams(conversationId, expectedClients)
@@ -112,7 +106,6 @@ class OngoingCallViewModelTest {
     fun givenDoubleTabIndicatorIsDisplayed_whenUserTapsOnIt_thenHideIt() = runTest {
         val (arrangement, ongoingCallViewModel) = Arrangement()
             .withCall(provideCall())
-            .withCurrentScreen(CurrentScreen.SomeOther)
             .withShouldShowDoubleTapToastReturning(false)
             .withSetVideoSendState()
             .withSetShouldShowDoubleTapToastStatus(currentUserId.toString(), false)
@@ -134,7 +127,6 @@ class OngoingCallViewModelTest {
         runTest {
             val (arrangement, ongoingCallViewModel) = Arrangement()
                 .withCall(provideCall())
-                .withCurrentScreen(CurrentScreen.SomeOther)
                 .withShouldShowDoubleTapToastReturning(false)
                 .withSetVideoSendState()
                 .arrange()
@@ -151,7 +143,6 @@ class OngoingCallViewModelTest {
         runTest {
             val (arrangement, ongoingCallViewModel) = Arrangement()
                 .withCall(provideCall())
-                .withCurrentScreen(CurrentScreen.SomeOther)
                 .withShouldShowDoubleTapToastReturning(false)
                 .withSetVideoSendState()
                 .arrange()
@@ -168,7 +159,6 @@ class OngoingCallViewModelTest {
         runTest {
             val (arrangement, ongoingCallViewModel) = Arrangement()
                 .withCall(provideCall().copy(isCameraOn = true))
-                .withCurrentScreen(CurrentScreen.SomeOther)
                 .withShouldShowDoubleTapToastReturning(false)
                 .withSetVideoSendState()
                 .arrange()
@@ -188,9 +178,6 @@ class OngoingCallViewModelTest {
         @MockK
         lateinit var requestVideoStreams: RequestVideoStreamsUseCase
 
-        @MockK
-        private lateinit var currentScreenManager: CurrentScreenManager
-
         @MockK
         lateinit var setVideoSendState: SetVideoSendStateUseCase
 
@@ -202,7 +189,6 @@ class OngoingCallViewModelTest {
                 conversationId = conversationId,
                 establishedCalls = establishedCall,
                 requestVideoStreams = requestVideoStreams,
-                currentScreenManager = currentScreenManager,
                 currentUserId = currentUserId,
                 setVideoSendState = setVideoSendState,
                 globalDataStore = globalDataStore,
@@ -219,12 +205,6 @@ class OngoingCallViewModelTest {
             coEvery { establishedCall() } returns flowOf(listOf(call))
         }
 
-        fun withCurrentScreen(screen: CurrentScreen) = apply {
-            coEvery { currentScreenManager.observeCurrentScreen(any()) } returns MutableStateFlow(
-                screen
-            )
-        }
-
         fun withShouldShowDoubleTapToastReturning(shouldShow: Boolean) = apply {
             coEvery { globalDataStore.getShouldShowDoubleTapToast(any()) } returns shouldShow
         }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -156,6 +156,7 @@ firebase-fcm = { module = "com.google.firebase:firebase-messaging-ktx" }
 
 ## AndroidX - Lifecycle
 androidx-lifecycle-liveData = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewModel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }