From f6c61f4e4b086489398bf2067d6a401cb9192083 Mon Sep 17 00:00:00 2001
From: Albert Vaca Cintora <albertvaka@gmail.com>
Date: Sat, 25 Feb 2023 11:31:18 +0100
Subject: [PATCH] Specify the foreground service type in Android 29+

---
 AndroidManifest.xml                           | 3 +--
 src/org/kde/kdeconnect/BackgroundService.java | 7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 13d6420e..d8a02fb8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -46,8 +46,7 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.READ_LOGS" tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-
-
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
 
     <application
         android:icon="@mipmap/ic_launcher"
diff --git a/src/org/kde/kdeconnect/BackgroundService.java b/src/org/kde/kdeconnect/BackgroundService.java
index 5f0b5936..720085e9 100644
--- a/src/org/kde/kdeconnect/BackgroundService.java
+++ b/src/org/kde/kdeconnect/BackgroundService.java
@@ -16,6 +16,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkRequest;
@@ -453,7 +454,11 @@ public class BackgroundService extends Service {
         }
 
         if (NotificationHelper.isPersistentNotificationEnabled(this)) {
-            startForeground(FOREGROUND_NOTIFICATION_ID, createForegroundNotification());
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                startForeground(FOREGROUND_NOTIFICATION_ID, createForegroundNotification(), ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE);
+            } else {
+                startForeground(FOREGROUND_NOTIFICATION_ID, createForegroundNotification());
+            }
         }
         return Service.START_STICKY;
     }