fix: Crash when starting starting PersistentWebsocketService (WPB-107…

…12) - cherrypick RC (#3353)
wireapp · Aug 22, 2024 · b95dbbb · b95dbbb
1 parent 8bd27f1
commit b95dbbb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -342,7 +342,7 @@
         <service
                 android:name=".services.PersistentWebSocketService"
                 android:exported="false"
-                android:foregroundServiceType="specialUse"></service>
+                android:foregroundServiceType="specialUse"/>
 
         <service
                 android:name=".services.OngoingCallService"

diff --git a/app/src/main/kotlin/com/wire/android/services/PersistentWebSocketService.kt b/app/src/main/kotlin/com/wire/android/services/PersistentWebSocketService.kt
@@ -28,7 +28,6 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.ServiceCompat
 import com.wire.android.R
 import com.wire.android.appLogger
-import com.wire.android.di.CurrentSessionFlowService
 import com.wire.android.di.KaliumCoreLogic
 import com.wire.android.notification.NotificationChannelsManager
 import com.wire.android.notification.NotificationConstants.WEB_SOCKET_CHANNEL_ID
@@ -39,7 +38,6 @@ import com.wire.android.notification.openAppPendingIntent
 import com.wire.android.util.dispatchers.DispatcherProvider
 import com.wire.kalium.logic.CoreLogic
 import com.wire.kalium.logic.data.sync.ConnectionPolicy
-import com.wire.kalium.logic.feature.session.CurrentSessionFlowUseCase
 import com.wire.kalium.logic.feature.user.webSocketStatus.ObservePersistentWebSocketConnectionStatusUseCase
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
@@ -65,11 +63,6 @@ class PersistentWebSocketService : Service() {
     @Inject
     lateinit var notificationManager: WireNotificationManager
 
-    // TODO: remove since it is not used
-    @Inject
-    @CurrentSessionFlowService
-    lateinit var currentSessionFlow: CurrentSessionFlowUseCase
-
     @Inject
     lateinit var notificationChannelsManager: NotificationChannelsManager
 
@@ -84,6 +77,15 @@ class PersistentWebSocketService : Service() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        /**
+         * When service is restarted by system onCreate lifecycle method is not guaranteed to be called
+         * so we need to check if service is already started and if not generate notification and call startForeground()
+         * https://issuetracker.google.com/issues/307329994#comment100
+         */
+        if (!isServiceStarted) {
+            isServiceStarted = true
+            generateForegroundNotification()
+        }
         scope.launch {
             coreLogic.getGlobalScope().observePersistentWebSocketConnectionStatus().let { result ->
                 when (result) {