Merge pull request #24 from oxters168/fg-notification-action

Add exit button to service notification.

Author: oxters168

app/src/main/java/com/OxGames/Pluvia/NotificationHelper.kt

@@ -15,6 +15,8 @@ class NotificationHelper(private val context: Context) {
         private const val CHANNEL_ID = "pluvia_foreground_service"
         private const val CHANNEL_NAME = "Pluvia Foreground Service"
         private const val NOTIFICATION_ID = 1
+
+        const val ACTION_EXIT = "com.oxgames.pluvia.EXIT"
     }
 
     private val notificationManager: NotificationManager =
@@ -63,6 +65,16 @@ class NotificationHelper(private val context: Context) {
             PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
         )
 
+        val stopIntent = Intent(context, SteamService::class.java).apply {
+            action = ACTION_EXIT
+        }
+        val stopPendingIntent = PendingIntent.getService(
+            context,
+            0,
+            stopIntent,
+            PendingIntent.FLAG_IMMUTABLE
+        )
+
         return NotificationCompat.Builder(context, CHANNEL_ID)
             .setContentTitle(context.getString(R.string.app_name))
             .setContentText(content)
@@ -71,6 +83,7 @@ class NotificationHelper(private val context: Context) {
             .setAutoCancel(false)
             .setOngoing(true)
             .setContentIntent(pendingIntent)
+            .addAction(0, "Exit", stopPendingIntent) // 0 = no icon
             .build()
     }
 }

app/src/main/java/com/OxGames/Pluvia/SteamService.kt

@@ -37,6 +37,7 @@ import com.OxGames.Pluvia.enums.PathType
 import com.OxGames.Pluvia.enums.ReleaseState
 import com.OxGames.Pluvia.enums.SaveLocation
 import com.OxGames.Pluvia.enums.SyncResult
+import com.OxGames.Pluvia.events.AndroidEvent
 import com.OxGames.Pluvia.events.SteamEvent
 import com.OxGames.Pluvia.utils.FileUtils
 import com.OxGames.Pluvia.utils.SteamUtils
@@ -1723,6 +1724,15 @@ class SteamService : Service(), IChallengeUrlChanged {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+
+        // Notification intents
+        when (intent?.action) {
+            NotificationHelper.ACTION_EXIT -> {
+                PluviaApp.events.emit(AndroidEvent.EndProcess)
+                return START_NOT_STICKY
+            }
+        }
+
         if (!isRunning) {
             Timber.i("Using server list path: $serverListPath")