Merge pull request #66 from KoalaSat/recover-background-service

Recover background service
KoalaSat · Dec 20, 2024 · 35ca19c · 35ca19c
2 parents b4850d9 + a31d980
commit 35ca19c
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/app/src/main/java/com/koalasat/pokey/service/NotificationsService.kt b/app/src/main/java/com/koalasat/pokey/service/NotificationsService.kt
@@ -185,15 +185,7 @@ class NotificationsService : Service() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        Log.d("Pokey", "Starting foreground service...")
-        startForeground(1, createNotification())
-        keepAlive()
-
-        startSubscription()
-
-        val connectivityManager =
-            (getSystemService(ConnectivityManager::class.java) as ConnectivityManager)
-        connectivityManager.registerDefaultNetworkCallback(networkCallback)
+        startService()
 
         return START_STICKY
     }
@@ -213,6 +205,23 @@ class NotificationsService : Service() {
         super.onDestroy()
     }
 
+    private fun startService() {
+        try {
+            Log.d("Pokey", "Starting foreground service...")
+            startForeground(1, createNotification())
+            keepAlive()
+
+            startSubscription()
+
+            val connectivityManager =
+                (getSystemService(ConnectivityManager::class.java) as ConnectivityManager)
+            connectivityManager.registerDefaultNetworkCallback(networkCallback)
+        } catch (e: Exception) {
+            Log.e("NotificationsService", "Error in service", e)
+            startService()
+        }
+    }
+
     private fun startSubscription() {
         if (!Client.isSubscribed(clientNotificationListener)) Client.subscribe(clientNotificationListener)