move broadcasting of notification refresh to TorService

Author: 05nelsonm

topl-service/src/main/java/io/matthewnelson/topl_service/notification/ServiceNotification.kt

@@ -501,8 +501,9 @@ class ServiceNotification internal constructor(
             notificationBuilder?.let {
                 torService.startForeground(notificationID, it.build())
                 inForeground = true
+                return true
             }
-            inForeground
+            false
         } else {
             false
         }
@@ -579,11 +580,22 @@ class ServiceNotification internal constructor(
         )
     }
 
+    /**
+     * Refreshes the notification Actions.
+     *
+     * @return `true` if actions were present to be refreshed, `false` if actions weren't
+     *   present, thus not needing a refresh
+     * @see [TorServiceReceiver.deviceIsLocked]
+     * */
     @Synchronized
-    internal fun refreshActions(torService: BaseService) {
-        if (!actionsPresent) return
-        removeActions(torService)
-        addActions(torService)
+    internal fun refreshActions(torService: BaseService): Boolean {
+        return if (actionsPresent) {
+            removeActions(torService)
+            addActions(torService)
+            true
+        } else {
+            false
+        }
     }
 
     @Synchronized

topl-service/src/main/java/io/matthewnelson/topl_service/service/BaseService.kt

@@ -306,8 +306,8 @@ internal abstract class BaseService: Service() {
             }
         }
     }
-    fun refreshNotificationActions() {
-        serviceNotification.refreshActions(this)
+    open fun refreshNotificationActions(): Boolean {
+        return serviceNotification.refreshActions(this)
     }
     fun removeNotification() {
         serviceNotification.remove()

topl-service/src/main/java/io/matthewnelson/topl_service/service/TorService.kt

@@ -161,6 +161,17 @@ internal class TorService: BaseService() {
 
     // See BaseService
 
+    override fun refreshNotificationActions(): Boolean {
+        val wasRefreshed = super.refreshNotificationActions()
+        if (wasRefreshed) {
+            val debugMsg = if (TorServiceReceiver.deviceIsLocked == true)
+                "Removed Notification Actions"
+            else
+                "Added Notification Actions"
+            broadcastLogger.debug(debugMsg)
+        }
+        return wasRefreshed
+    }
     override fun startForegroundService(): Boolean {
         val wasStarted = super.startForegroundService()
         if (wasStarted)

topl-service/src/main/java/io/matthewnelson/topl_service/service/components/receiver/TorServiceReceiver.kt

@@ -165,7 +165,6 @@ internal class TorServiceReceiver(private val torService: BaseService): Broadcas
                             if (locked != deviceIsLocked) {
                                 setDeviceIsLocked(locked)
                                 broadcastLogger.debug("Device is locked: $deviceIsLocked")
-                                broadcastLogger.debug("Refreshing Notification Actions")
                                 torService.refreshNotificationActions()
                             }
                         }