From e790e513e18666f82d371b4e2fdbb357d102ca94 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 24 Oct 2019 12:15:36 +0800
Subject: [PATCH] Declare location permission used by foreground properly

Fix #132.
---
 mobile/src/main/AndroidManifest.xml                      | 9 ++++++---
 .../src/main/java/be/mygod/vpnhotspot/RepeaterService.kt | 6 +++++-
 .../be/mygod/vpnhotspot/manage/RepeaterTileService.kt    | 4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index d10bc218..eff53f0c 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -73,13 +73,16 @@
 
         <service
             android:name=".LocalOnlyHotspotService"
-            android:directBootAware="true"/>
+            android:directBootAware="true"
+            android:foregroundServiceType="location|connectedDevice"/>
         <service
             android:name=".RepeaterService"
-            android:directBootAware="true"/>
+            android:directBootAware="true"
+            android:foregroundServiceType="location|connectedDevice"/>
         <service
             android:name=".TetheringService"
-            android:directBootAware="true"/>
+            android:directBootAware="true"
+            android:foregroundServiceType="connectedDevice"/>
 
         <service
             android:name=".manage.RepeaterTileService"
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
index 03b8f8e6..f86fed6f 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
@@ -46,6 +46,8 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene
          */
         private const val PLACEHOLDER_NETWORK_NAME = "DIRECT-00-VPNHotspot"
 
+        const val EXTRA_POSSIBLY_BACKGROUND = "possiblyBackground"
+
         /**
          * This is only a "ServiceConnection" to system service and its impact on system is minimal.
          */
@@ -255,7 +257,9 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene
         val channel = channel ?: return START_NOT_STICKY.also { stopSelf() }
         status = Status.STARTING
         // show invisible foreground notification on television to avoid being killed
-        if (Build.VERSION.SDK_INT >= 26 && app.uiMode.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION) {
+        if (Build.VERSION.SDK_INT >= 26 && app.uiMode.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION ||
+                // or bump self to foreground location service to use foreground location permission
+                Build.VERSION.SDK_INT >= 29 && intent?.getBooleanExtra(EXTRA_POSSIBLY_BACKGROUND, false) == true) {
             showNotification()
         }
         launch {
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterTileService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterTileService.kt
index 27b312ec..da6d2474 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterTileService.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterTileService.kt
@@ -35,8 +35,8 @@ class RepeaterTileService : KillableTileService() {
         val binder = binder
         if (binder == null) tapPending = true else when (binder.service.status) {
             RepeaterService.Status.ACTIVE -> binder.shutdown()
-            RepeaterService.Status.IDLE ->
-                ContextCompat.startForegroundService(this, Intent(this, RepeaterService::class.java))
+            RepeaterService.Status.IDLE -> ContextCompat.startForegroundService(this,
+                    Intent(this, RepeaterService::class.java).putExtra(RepeaterService.EXTRA_POSSIBLY_BACKGROUND, true))
             else -> { }
         }
     }