Merge pull request #597 from hannesa2/RemoveForegroundNotification

Remove foreground notification when the service is started in foreground

serviceLibrary/src/main/java/info/mqtt/android/service/MqttService.kt

@@ -185,6 +185,7 @@ class MqttService : Service(), MqttTraceHandler {
 
     // callback id for making trace callbacks to the Activity needs to be set by the activity as appropriate
     private var traceCallbackId: String? = null
+    private var isForegroundStarted = false
 
     var isTraceEnabled = false
 
@@ -228,6 +229,7 @@ class MqttService : Service(), MqttTraceHandler {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val foregroundServiceNotification = intent?.getParcelableExtra<Notification>(MQTT_FOREGROUND_SERVICE_NOTIFICATION)
             if (foregroundServiceNotification != null) {
+                isForegroundStarted = true
                 startForeground(
                     intent.getIntExtra(MQTT_FOREGROUND_SERVICE_NOTIFICATION_ID, 1),
                     foregroundServiceNotification
@@ -312,6 +314,19 @@ class MqttService : Service(), MqttTraceHandler {
         client.close()
     }
 
+    /**
+     * Stop service, removing the notification if needed
+     */
+    private fun stopService() {
+        if (isForegroundStarted) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                stopForeground(Service.STOP_FOREGROUND_REMOVE)
+            else
+                stopForeground(true)
+        }
+        stopSelf()
+    }
+
     /**
      * Disconnect from the server
      *
@@ -328,7 +343,7 @@ class MqttService : Service(), MqttTraceHandler {
         // the activity has finished using us, so we can stop the service
         // the activities are bound with BIND_AUTO_CREATE, so the service will
         // remain around until the last activity disconnects
-        stopSelf()
+        stopService()
     }
 
     /**
@@ -347,7 +362,7 @@ class MqttService : Service(), MqttTraceHandler {
         // the activity has finished using us, so we can stop the service
         // the activities are bound with BIND_AUTO_CREATE, so the service will
         // remain around until the last activity disconnects
-        stopSelf()
+        stopService()
     }
 
     /**