From e4ac7ff737fe7581a47efcfb8aeb25146e963a15 Mon Sep 17 00:00:00 2001 From: Alex Gotev Date: Sun, 15 Oct 2023 22:41:22 +0200 Subject: [PATCH 1/2] #634 set foreground service behavior on API 31+ --- .../java/net/gotev/uploadservice/UploadService.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/uploadservice/src/main/java/net/gotev/uploadservice/UploadService.kt b/uploadservice/src/main/java/net/gotev/uploadservice/UploadService.kt index 9c5bb907..1f2c16fb 100644 --- a/uploadservice/src/main/java/net/gotev/uploadservice/UploadService.kt +++ b/uploadservice/src/main/java/net/gotev/uploadservice/UploadService.kt @@ -5,6 +5,7 @@ import android.app.Service import android.content.Context import android.content.Intent import android.os.Build +import android.os.Build.VERSION.SDK_INT import android.os.IBinder import android.os.PowerManager import androidx.core.app.NotificationCompat @@ -167,7 +168,7 @@ class UploadService : Service() { } private fun stopServiceForeground() { - if (Build.VERSION.SDK_INT >= 24) { + if (SDK_INT >= 24) { stopForeground(STOP_FOREGROUND_REMOVE) } else { @Suppress("DEPRECATION") @@ -213,11 +214,16 @@ class UploadService : Service() { "Starting UploadService. Debug info: $UploadServiceConfig" } - val notification = NotificationCompat.Builder(this, UploadServiceConfig.defaultNotificationChannel!!) + val builder = NotificationCompat.Builder(this, UploadServiceConfig.defaultNotificationChannel!!) .setSmallIcon(android.R.drawable.ic_menu_upload) .setOngoing(true) .setGroup(UploadServiceConfig.namespace) - .build() + + if (SDK_INT >= 31) { + builder.foregroundServiceBehavior = Notification.FOREGROUND_SERVICE_IMMEDIATE + } + + val notification = builder.build() startForeground(UPLOAD_NOTIFICATION_BASE_ID, notification) From aa24354bfc2ec17a4d7fc8fa38765fdc354994be Mon Sep 17 00:00:00 2001 From: Alex Gotev Date: Sun, 15 Oct 2023 22:48:55 +0200 Subject: [PATCH 2/2] fix: unused import --- .../src/main/java/net/gotev/uploadservice/UploadService.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/uploadservice/src/main/java/net/gotev/uploadservice/UploadService.kt b/uploadservice/src/main/java/net/gotev/uploadservice/UploadService.kt index 1f2c16fb..60c0d462 100644 --- a/uploadservice/src/main/java/net/gotev/uploadservice/UploadService.kt +++ b/uploadservice/src/main/java/net/gotev/uploadservice/UploadService.kt @@ -4,7 +4,6 @@ import android.app.Notification import android.app.Service import android.content.Context import android.content.Intent -import android.os.Build import android.os.Build.VERSION.SDK_INT import android.os.IBinder import android.os.PowerManager