Notification service remains active even if web service is disabled #244

Author: ismartcoding

app/src/main/java/com/ismartcoding/plain/services/HttpServerService.kt

@@ -24,6 +24,7 @@ import com.ismartcoding.plain.helpers.NotificationHelper
 import com.ismartcoding.plain.helpers.UrlHelper
 import com.ismartcoding.plain.web.HttpServerManager
 import com.ismartcoding.plain.web.NsdHelper
+import com.ismartcoding.plain.features.Permission
 import io.ktor.client.request.get
 import io.ktor.http.HttpStatusCode
 import kotlinx.coroutines.delay
@@ -116,6 +117,7 @@ class HttpServerService : LifecycleService() {
             HttpServerManager.portsInUse.clear()
             NsdHelper.registerService(this, TempData.httpPort)
             sendEvent(HttpServerStateChangedEvent(HttpServerState.ON))
+            PNotificationListenerService.toggle(this, Permission.NOTIFICATION_LISTENER.isEnabledAsync(this))
         } else {
             if (!checkResult.http) {
                 if (PortHelper.isPortInUse(TempData.httpPort)) {
@@ -142,6 +144,7 @@ class HttpServerService : LifecycleService() {
             }
 
             sendEvent(HttpServerStateChangedEvent(HttpServerState.ERROR))
+            PNotificationListenerService.toggle(this, false)
         }
     }
 
@@ -167,5 +170,6 @@ class HttpServerService : LifecycleService() {
             LogCat.e(ex.toString())
             ex.printStackTrace()
         }
+        PNotificationListenerService.toggle(this, false)
     }
 }

app/src/main/java/com/ismartcoding/plain/ui/MainActivity.kt

@@ -279,7 +279,9 @@ class MainActivity : AppCompatActivity() {
 
     private suspend fun doWhenReadyAsync() {
         // PackageHelper.cacheAppLabels()
-        PNotificationListenerService.toggle(this@MainActivity, Permission.NOTIFICATION_LISTENER.isEnabledAsync(this@MainActivity))
+        val webEnabled = WebPreference.getAsync(this@MainActivity)
+        val permissionEnabled = Permission.NOTIFICATION_LISTENER.isEnabledAsync(this@MainActivity)
+        PNotificationListenerService.toggle(this@MainActivity, webEnabled && permissionEnabled)
     }
 
     override fun onDestroy() {

app/src/main/java/com/ismartcoding/plain/ui/page/web/WebSettingsPage.kt

@@ -99,7 +99,8 @@ fun WebSettingsPage(
                         permissionList = Permissions.getWebList(context)
                         systemAlertWindow = Permission.SYSTEM_ALERT_WINDOW.can(context)
                         if (event.map[Permission.NOTIFICATION_LISTENER.toSysPermission()] == true) {
-                            PNotificationListenerService.toggle(context, true)
+                            // Only enable listener if web is enabled
+                            PNotificationListenerService.toggle(context, WebPreference.getAsync(context))
                         }
                     }
 
@@ -125,7 +126,9 @@ fun WebSettingsPage(
             scope.launch {
                 withIO { ApiPermissionsPreference.putAsync(context, m.permission, enable) }
                 if (m.permission == Permission.NOTIFICATION_LISTENER) {
-                    PNotificationListenerService.toggle(context, enable)
+                    // Enable only when web is enabled; otherwise disable
+                    val webEnabled = WebPreference.getAsync(context)
+                    PNotificationListenerService.toggle(context, enable && webEnabled)
                 }
                 if (enable) {
                     val ps = m.permissions.filter { !it.can(context) }

app/src/main/java/com/ismartcoding/plain/web/HttpServerManager.kt

@@ -91,6 +91,8 @@ object HttpServerManager {
             ex.printStackTrace()
         }
         context.stopService(Intent(context, HttpServerService::class.java))
+        // Ensure notification listener is disabled when server is stopped explicitly
+        com.ismartcoding.plain.services.PNotificationListenerService.toggle(context, false)
         httpServerError = ""
         portsInUse.clear()
         sendEvent(HttpServerStateChangedEvent(HttpServerState.OFF))