Remove notification on disconnect

hannesa2 · hannesa2 · commit 6071b5d2262e · 2023-04-11T08:02:13.000+02:00
diff --git a/extendedSample/src/main/java/info/mqtt/android/extsample/internal/MqttCallbackHandler.kt b/extendedSample/src/main/java/info/mqtt/android/extsample/internal/MqttCallbackHandler.kt
@@ -18,12 +18,13 @@ internal class MqttCallbackHandler(private val context: Context, private val cli
         val connection = getInstance(context).getConnection(clientHandle)
         connection?.addHistory("Connection Lost")
         connection?.changeConnectionStatus(Connection.ConnectionStatus.DISCONNECTED)
+        cause?.let {
+            val intent = Intent()
+            intent.setClassName(context, activityClass)
+            intent.putExtra("handle", clientHandle)
 
-        val intent = Intent()
-        intent.setClassName(context, activityClass)
-        intent.putExtra("handle", clientHandle)
-
-        notification(context, "id=${connection?.id} host=${connection?.hostName}", intent, R.string.notifyTitle_connectionLost)
+            notification(context, "id=${connection?.id} host=${connection?.hostName}", intent, R.string.notifyTitle_connectionLost)
+        }
     }
 
     @Throws(Exception::class)
diff --git a/serviceLibrary/src/main/java/info/mqtt/android/service/MqttAndroidClient.kt b/serviceLibrary/src/main/java/info/mqtt/android/service/MqttAndroidClient.kt
@@ -1,5 +1,6 @@
 package info.mqtt.android.service
 
+import android.app.ActivityManager
 import android.app.Notification
 import android.content.*
 import android.os.Build
@@ -40,7 +41,8 @@ import javax.net.ssl.TrustManagerFactory
  */
 class MqttAndroidClient @JvmOverloads constructor(
     val context: Context, private val serverURI: String, private val clientId: String, ackType: Ack = Ack.AUTO_ACK,
-    private var persistence: MqttClientPersistence? = null) :
+    private var persistence: MqttClientPersistence? = null
+) :
     BroadcastReceiver(), IMqttAsyncClient {
 
     // Listener for when the service is connected or disconnected
@@ -195,7 +197,13 @@ class MqttAndroidClient @JvmOverloads constructor(
          * The actual connection depends on the service, which we start and bind to here, but which we can't actually use until the serviceConnection
          * onServiceConnected() method has run (asynchronously), so the connection itself takes place in the onServiceConnected() method
          */
-        if (mqttService == null) { // First time - must bind to the service
+        val isRunning = isMqServiceRunning()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            Timber.d("isRunning=$isRunning ${mqttService?.connections?.size} foregroundServiceType=${mqttService?.foregroundServiceType}")
+        } else
+            Timber.d("isRunning=$isRunning ${mqttService?.connections?.size}")
+
+        if (mqttService == null || mqttService?.connections?.size == 0) { // First time - must bind to the service
             val serviceStartIntent = Intent()
             serviceStartIntent.setClassName(context, SERVICE_NAME)
             var service: Any? = null
@@ -235,6 +243,12 @@ class MqttAndroidClient @JvmOverloads constructor(
         return token
     }
 
+    private fun isMqServiceRunning(): Boolean {
+        val manager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+        return manager.getRunningServices(Integer.MAX_VALUE)
+            .any { it.service.className == SERVICE_NAME }
+    }
+
     private fun registerReceiver(receiver: BroadcastReceiver) {
         val filter = IntentFilter()
         filter.addAction(MqttServiceConstants.CALLBACK_TO_ACTIVITY)
@@ -247,13 +261,13 @@ class MqttAndroidClient @JvmOverloads constructor(
      */
     private fun doConnect() {
         if (clientHandle == null) {
-            clientHandle = mqttService!!.getClient(serverURI, clientId, context.applicationInfo.packageName, persistence)
+            clientHandle = mqttService?.getClient(serverURI, clientId, context.applicationInfo.packageName, persistence)
         }
-        mqttService!!.isTraceEnabled = traceEnabled
-        mqttService!!.setTraceCallbackId(clientHandle)
+        mqttService?.isTraceEnabled = traceEnabled
+        mqttService?.setTraceCallbackId(clientHandle)
         val activityToken = storeToken(connectToken)
         try {
-            mqttService!!.connect(clientHandle!!, clientConnectOptions, activityToken)
+            mqttService?.connect(clientHandle!!, clientConnectOptions, activityToken)
         } catch (e: Exception) {
             val listener = connectToken!!.actionCallback
             listener?.onFailure(connectToken, e)
@@ -271,9 +285,26 @@ class MqttAndroidClient @JvmOverloads constructor(
      * @see .disconnect
      */
     override fun disconnect(): IMqttToken {
+        val isRunning = isMqServiceRunning()
+        Timber.d("isRunning=$isRunning ${mqttService?.connections?.size}")
+
         val token: IMqttToken = MqttTokenAndroid(this, null, null)
         val activityToken = storeToken(token)
-        mqttService!!.disconnect(clientHandle!!, null, activityToken)
+        clientHandle?.let {
+            mqttService?.disconnect(it, null, activityToken)
+        }
+
+        // if there are no more connections, we can shutdown the service
+        if (mqttService?.connections?.isEmpty() == true) {
+            Timber.d("Shutdown service")
+            // For < Android O this should work (untested)
+            val myService = Intent(context, MqttService::class.java)
+            context.stopService(myService)
+            // For Android O it's probably enough
+            mqttService!!.stopForeground(true)
+
+            //unregisterResources()
+        }
         return token
     }
 
@@ -293,7 +324,7 @@ class MqttAndroidClient @JvmOverloads constructor(
     override fun disconnect(quiesceTimeout: Long): IMqttToken {
         val token: IMqttToken = MqttTokenAndroid(this, null, null)
         val activityToken = storeToken(token)
-        mqttService!!.disconnect(clientHandle!!, quiesceTimeout, null, activityToken)
+        mqttService?.disconnect(clientHandle!!, quiesceTimeout, null, activityToken)
         return token
     }
 
@@ -311,7 +342,7 @@ class MqttAndroidClient @JvmOverloads constructor(
     override fun disconnect(userContext: Any?, callback: IMqttActionListener?): IMqttToken {
         val token: IMqttToken = MqttTokenAndroid(this, userContext, callback)
         val activityToken = storeToken(token)
-        mqttService!!.disconnect(clientHandle!!, null, activityToken)
+        mqttService?.disconnect(clientHandle!!, null, activityToken)
         return token
     }
 
@@ -345,7 +376,7 @@ class MqttAndroidClient @JvmOverloads constructor(
     override fun disconnect(quiesceTimeout: Long, userContext: Any?, callback: IMqttActionListener): IMqttToken {
         val token: IMqttToken = MqttTokenAndroid(this, userContext, callback)
         val activityToken = storeToken(token)
-        mqttService!!.disconnect(clientHandle!!, quiesceTimeout, null, activityToken)
+        mqttService?.disconnect(clientHandle!!, quiesceTimeout, null, activityToken)
         return token
     }
 
@@ -406,7 +437,7 @@ class MqttAndroidClient @JvmOverloads constructor(
         message.isRetained = retained
         val token = MqttDeliveryTokenAndroid(this, userContext, callback, message)
         val activityToken = storeToken(token)
-        val internalToken = mqttService!!.publish(clientHandle!!, topic, payload, QoS.valueOf(qos), retained, null, activityToken)
+        val internalToken = mqttService?.publish(clientHandle!!, topic, payload, QoS.valueOf(qos), retained, null, activityToken)
         token.setDelegate(internalToken)
         return token
     }
@@ -468,7 +499,7 @@ class MqttAndroidClient @JvmOverloads constructor(
     override fun publish(topic: String, message: MqttMessage, userContext: Any?, callback: IMqttActionListener?): IMqttDeliveryToken {
         val token = MqttDeliveryTokenAndroid(this, userContext, callback, message)
         val activityToken = storeToken(token)
-        val internalToken = mqttService!!.publish(clientHandle!!, topic, message, null, activityToken)
+        val internalToken = mqttService?.publish(clientHandle!!, topic, message, null, activityToken)
         token.setDelegate(internalToken)
         return token
     }
@@ -520,7 +551,7 @@ class MqttAndroidClient @JvmOverloads constructor(
     override fun subscribe(topic: String, qos: Int, userContext: Any?, callback: IMqttActionListener?): IMqttToken {
         val token: IMqttToken = MqttTokenAndroid(this, userContext, callback, arrayOf(topic))
         val activityToken = storeToken(token)
-        mqttService!!.subscribe(clientHandle!!, topic, QoS.valueOf(qos), null, activityToken)
+        mqttService?.subscribe(clientHandle!!, topic, QoS.valueOf(qos), null, activityToken)
         return token
     }
 
@@ -624,7 +655,7 @@ class MqttAndroidClient @JvmOverloads constructor(
     override fun subscribe(topic: Array<String>, qos: IntArray, userContext: Any?, callback: IMqttActionListener?): IMqttToken {
         val token: IMqttToken = MqttTokenAndroid(this, userContext, callback, topic)
         val activityToken = storeToken(token)
-        mqttService!!.subscribe(clientHandle!!, topic, qos, null, activityToken)
+        mqttService?.subscribe(clientHandle!!, topic, qos, null, activityToken)
         return token
     }
 
@@ -703,7 +734,7 @@ class MqttAndroidClient @JvmOverloads constructor(
     ): IMqttToken {
         val token: IMqttToken = MqttTokenAndroid(this, userContext, callback, topicFilters)
         val activityToken = storeToken(token)
-        mqttService!!.subscribe(clientHandle!!, topicFilters, qos.map { QoS.valueOf(it) }.toTypedArray(), null, activityToken, messageListeners)
+        mqttService?.subscribe(clientHandle!!, topicFilters, qos.map { QoS.valueOf(it) }.toTypedArray(), null, activityToken, messageListeners)
         return token
     }
 
@@ -741,7 +772,7 @@ class MqttAndroidClient @JvmOverloads constructor(
     override fun unsubscribe(topic: String, userContext: Any?, callback: IMqttActionListener?): IMqttToken {
         val token: IMqttToken = MqttTokenAndroid(this, userContext, callback)
         val activityToken = storeToken(token)
-        mqttService!!.unsubscribe(clientHandle!!, topic, null, activityToken)
+        mqttService?.unsubscribe(clientHandle!!, topic, null, activityToken)
         return token
     }
 
@@ -772,7 +803,7 @@ class MqttAndroidClient @JvmOverloads constructor(
     override fun unsubscribe(topic: Array<String>, userContext: Any?, callback: IMqttActionListener?): IMqttToken {
         val token: IMqttToken = MqttTokenAndroid(this, userContext, callback)
         val activityToken = storeToken(token)
-        mqttService!!.unsubscribe(clientHandle!!, topic, null, activityToken)
+        mqttService?.unsubscribe(clientHandle!!, topic, null, activityToken)
         return token
     }
 
@@ -903,7 +934,7 @@ class MqttAndroidClient @JvmOverloads constructor(
         } else if (MqttServiceConstants.TRACE_ACTION == action) {
             traceAction(data)
         } else {
-            mqttService!!.traceError("Callback action doesn't exist.")
+            mqttService?.traceError("Callback action doesn't exist.")
         }
     }
 
@@ -918,7 +949,7 @@ class MqttAndroidClient @JvmOverloads constructor(
      */
     fun acknowledgeMessage(messageId: String): Boolean {
         if (messageAck == Ack.MANUAL_ACK) {
-            val status = mqttService!!.acknowledgeMessageArrival(clientHandle!!, messageId)
+            val status = mqttService?.acknowledgeMessageArrival(clientHandle!!, messageId)
             return status == Status.OK
         }
         return false
@@ -1008,7 +1039,7 @@ class MqttAndroidClient @JvmOverloads constructor(
                 (token as MqttTokenAndroid).notifyFailure(exceptionThrown)
             }
         } else {
-            mqttService!!.traceError("simpleAction : token is null")
+            mqttService?.traceError("simpleAction : token is null")
         }
     }
 
@@ -1066,15 +1097,15 @@ class MqttAndroidClient @JvmOverloads constructor(
                 callbacksList.forEach { callback ->
                     callback.messageArrived(destinationName, message)
                 }
-                mqttService!!.acknowledgeMessageArrival(clientHandle!!, messageId)
+                mqttService?.acknowledgeMessageArrival(clientHandle!!, messageId)
             } else {
                 message.messageId = messageId
                 callbacksList.forEach { callback ->
                     callback.messageArrived(destinationName, message)
                 }
             }
         } catch (e: Exception) {
-            mqttService!!.traceError("messageArrivedAction failed: $e")
+            mqttService?.traceError("messageArrivedAction failed: $e")
         }
     }
 
@@ -1157,7 +1188,7 @@ class MqttAndroidClient @JvmOverloads constructor(
      * @param bufferOpts the DisconnectedBufferOptions
      */
     override fun setBufferOpts(bufferOpts: DisconnectedBufferOptions) {
-        mqttService!!.setBufferOpts(clientHandle!!, bufferOpts)
+        mqttService?.setBufferOpts(clientHandle!!, bufferOpts)
     }
 
     override fun getBufferedMessageCount(): Int {
@@ -1169,7 +1200,7 @@ class MqttAndroidClient @JvmOverloads constructor(
     }
 
     override fun deleteBufferedMessage(bufferIndex: Int) {
-        mqttService!!.deleteBufferedMessage(clientHandle!!, bufferIndex)
+        mqttService?.deleteBufferedMessage(clientHandle!!, bufferIndex)
     }
 
     override fun getInFlightMessageCount() = 0
