From 26fbbc36e5df4ceca2ad80fccbdcd9e9771d21b2 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 8 Jun 2023 19:49:48 -0400
Subject: [PATCH] Add support for foreground service permission

---
 mobile/src/main/AndroidManifest.xml                        | 7 +++++--
 .../main/java/be/mygod/vpnhotspot/ServiceNotification.kt   | 7 ++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 980ab420..3a2ef675 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -32,6 +32,7 @@
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS"
                      tools:ignore="ProtectedPermissions" />
@@ -102,11 +103,13 @@
         <service
             android:name=".LocalOnlyHotspotService"
             android:directBootAware="true"
-            android:foregroundServiceType="location|connectedDevice"/>
+            android:foregroundServiceType="location|connectedDevice"
+            tools:ignore="ForegroundServicePermission"/>
         <service
             android:name=".RepeaterService"
             android:directBootAware="true"
-            android:foregroundServiceType="location|connectedDevice"/>
+            android:foregroundServiceType="location|connectedDevice"
+            tools:ignore="ForegroundServicePermission"/>
         <service
             android:name=".TetheringService"
             android:directBootAware="true"
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/ServiceNotification.kt b/mobile/src/main/java/be/mygod/vpnhotspot/ServiceNotification.kt
index 68022e03..bc986176 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/ServiceNotification.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/ServiceNotification.kt
@@ -3,6 +3,8 @@ package be.mygod.vpnhotspot
 import android.app.*
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ServiceInfo
+import android.os.Build
 import androidx.core.content.getSystemService
 import be.mygod.vpnhotspot.App.Companion.app
 import java.util.*
@@ -53,7 +55,10 @@ object ServiceNotification {
         synchronized(this) {
             deviceCountsMap[service] = deviceCounts
             if (inactive.isEmpty()) inactiveMap.remove(service) else inactiveMap[service] = inactive
-            service.startForeground(NOTIFICATION_ID, buildNotification(service))
+            if (Build.VERSION.SDK_INT >= 33) {
+                service.startForeground(NOTIFICATION_ID, buildNotification(service),
+                    ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE)
+            } else service.startForeground(NOTIFICATION_ID, buildNotification(service))
         }
     }
     fun stopForeground(service: Service) = synchronized(this) {