[gateway] conditional SSE connection

Author: capcom6

app/src/main/java/me/capcom/smsgateway/helpers/SettingsHelper.kt

@@ -27,10 +27,6 @@ class SettingsHelper(private val context: Context) {
             settings.edit { putBoolean(PREF_KEY_AUTOSTART, value) }
         }
 
-    var fcmToken: String?
-        get() = settings.getString(PREF_KEY_FCM_TOKEN, null)
-        set(value) = settings.edit { putString(PREF_KEY_FCM_TOKEN, value) }
-
     private fun migrate() {
         // remove after 2025-11-28
         val PREF_KEY_SERVER_TOKEN = "server_token"

app/src/main/java/me/capcom/smsgateway/modules/gateway/EventsReceiver.kt

@@ -6,9 +6,11 @@ import kotlinx.coroutines.launch
 import me.capcom.smsgateway.domain.EntitySource
 import me.capcom.smsgateway.modules.events.EventBus
 import me.capcom.smsgateway.modules.events.EventsReceiver
+import me.capcom.smsgateway.modules.gateway.events.DeviceRegisteredEvent
 import me.capcom.smsgateway.modules.gateway.events.MessageEnqueuedEvent
 import me.capcom.smsgateway.modules.gateway.events.SettingsUpdatedEvent
 import me.capcom.smsgateway.modules.gateway.events.WebhooksUpdatedEvent
+import me.capcom.smsgateway.modules.gateway.services.SSEForegroundService
 import me.capcom.smsgateway.modules.gateway.workers.PullMessagesWorker
 import me.capcom.smsgateway.modules.gateway.workers.SendStateWorker
 import me.capcom.smsgateway.modules.gateway.workers.SettingsUpdateWorker
@@ -79,6 +81,18 @@ class EventsReceiver : EventsReceiver() {
                     SettingsUpdateWorker.start(get())
                 }
             }
+
+            launch {
+                Log.d("EventsReceiver", "launched DeviceRegisteredEvent")
+                eventBus.collect<DeviceRegisteredEvent> {
+                    Log.d("EventsReceiver", "Event: $it")
+
+                    if (!settings.enabled) return@collect
+                    if (settings.fcmToken != null) return@collect
+
+                    SSEForegroundService.start(get())
+                }
+            }
         }
 
     }

app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayService.kt

@@ -46,7 +46,6 @@ class GatewayService(
         PullMessagesWorker.start(context)
         WebhooksUpdateWorker.start(context)
         SettingsUpdateWorker.start(context)
-        SSEForegroundService.start(context)
 
         eventsReceiver.start()
     }
@@ -109,9 +108,7 @@ class GatewayService(
         if (accessToken != null) {
             // if there's an access token, try to update push token
             try {
-                pushToken?.let {
-                    updateDevice(it)
-                }
+                updateDevice(pushToken)
                 return
             } catch (e: ClientRequestException) {
                 // if token is invalid, try to register new one
@@ -135,6 +132,8 @@ class GatewayService(
                     registerMode.login to registerMode.password
                 )
             }
+
+            this.settings.fcmToken = pushToken
             this.settings.registrationInfo = response
 
             events.emit(
@@ -156,19 +155,23 @@ class GatewayService(
         }
     }
 
-    internal suspend fun updateDevice(pushToken: String) {
+    internal suspend fun updateDevice(pushToken: String?) {
         if (!settings.enabled) return
 
         val settings = settings.registrationInfo ?: return
         val accessToken = settings.token
 
-        api.devicePatch(
-            accessToken,
-            GatewayApi.DevicePatchRequest(
-                settings.id,
-                pushToken
+        pushToken?.let {
+            api.devicePatch(
+                accessToken,
+                GatewayApi.DevicePatchRequest(
+                    settings.id,
+                    it
+                )
             )
-        )
+        }
+
+        this.settings.fcmToken = pushToken
 
         events.emit(
             DeviceRegisteredEvent.Success(

app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewaySettings.kt

@@ -19,6 +19,10 @@ class GatewaySettings(
         get() = storage.get(REGISTRATION_INFO)
         set(value) = storage.set(REGISTRATION_INFO, value)
 
+    var fcmToken: String?
+        get() = storage.get(FCM_TOKEN)
+        set(value) = storage.set(FCM_TOKEN, value)
+
     val username: String?
         get() = registrationInfo?.login
     val password: String?
@@ -32,6 +36,7 @@ class GatewaySettings(
     companion object {
         private const val REGISTRATION_INFO = "REGISTRATION_INFO"
         private const val ENABLED = "ENABLED"
+        private const val FCM_TOKEN = "fcm_token"
 
         private const val CLOUD_URL = "cloud_url"
         private const val PRIVATE_TOKEN = "private_token"

app/src/main/java/me/capcom/smsgateway/modules/gateway/services/SSEForegroundService.kt

@@ -119,7 +119,13 @@ class SSEForegroundService : Service() {
         if (wakeLock.isHeld) {
             wakeLock.release()
         }
-        stopForeground(true)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+        } else {
+            @Suppress("DEPRECATION")
+            stopForeground(true)
+        }
 
         super.onDestroy()
     }

app/src/main/java/me/capcom/smsgateway/services/PushService.kt

@@ -2,11 +2,9 @@ package me.capcom.smsgateway.services
 
 import android.content.Context
 import android.util.Log
-import com.google.android.gms.tasks.OnCompleteListener
 import com.google.firebase.messaging.FirebaseMessaging
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
-import me.capcom.smsgateway.helpers.SettingsHelper
 import me.capcom.smsgateway.modules.events.ExternalEvent
 import me.capcom.smsgateway.modules.events.ExternalEventType
 import me.capcom.smsgateway.modules.gateway.workers.RegistrationWorker
@@ -18,14 +16,10 @@ import org.koin.core.component.get
 import org.koin.core.component.inject
 
 class PushService : FirebaseMessagingService(), KoinComponent {
-    private val settingsHelper by inject<SettingsHelper>()
-
     private val logsService by inject<LogsService>()
     private val eventsRouter by inject<EventsRouter>()
 
     override fun onNewToken(token: String) {
-        settingsHelper.fcmToken = token
-
         RegistrationWorker.start(this@PushService, token, true)
     }
 
@@ -47,7 +41,7 @@ class PushService : FirebaseMessagingService(), KoinComponent {
             )
         } catch (e: Throwable) {
             Log.e(this.javaClass.name, "Error processing push message", e)
-            get<LogsService>().insert(
+            logsService.insert(
                 priority = LogEntry.Priority.ERROR,
                 module = this.javaClass.simpleName,
                 message = "Failed to process push message: ${e.message}",
@@ -65,7 +59,7 @@ class PushService : FirebaseMessagingService(), KoinComponent {
                 module = PushService::class.java.simpleName,
                 message = "FCM registration started"
             )
-            FirebaseMessaging.getInstance().token.addOnCompleteListener(OnCompleteListener { task ->
+            FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
                 if (!task.isSuccessful || task.isCanceled) {
                     logger.insert(
                         priority = LogEntry.Priority.ERROR,
@@ -90,7 +84,7 @@ class PushService : FirebaseMessagingService(), KoinComponent {
 
                 // Log and toast
                 RegistrationWorker.start(context, token, false)
-            })
+            }
         }
     }
 }