Request Background location permission if on API level 29+ (pluscubed…

…#118)
ErdbeerbaerLP · Jul 1, 2023 · 8d74b19 · 8d74b19
1 parent 981a0e2
commit 8d74b19
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
     package="com.pluscubed.velociraptor">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/app/src/main/java/com/pluscubed/velociraptor/settings/PermissionsFragment.kt b/app/src/main/java/com/pluscubed/velociraptor/settings/PermissionsFragment.kt
@@ -95,10 +95,16 @@ class PermissionsFragment : Fragment() {
         }
 
         enableLocationButton.setOnClickListener { v ->
-            requestPermissions(
-                    arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
-                    REQUEST_LOCATION
-            )
+            if (Build.VERSION.SDK_INT < 29)
+                requestPermissions(
+                        arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
+                        REQUEST_LOCATION
+                )
+            else
+                requestPermissions(
+                        arrayOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION),
+                        REQUEST_LOCATION
+                )
         }
     }
 

diff --git a/app/src/main/java/com/pluscubed/velociraptor/utils/Utils.kt b/app/src/main/java/com/pluscubed/velociraptor/utils/Utils.kt
@@ -128,10 +128,19 @@ object Utils {
 
     fun isLocationPermissionGranted(context: Context?): Boolean {
         if (context != null) {
-            return ContextCompat.checkSelfPermission(
-                    context,
-                    Manifest.permission.ACCESS_FINE_LOCATION
-            ) == PackageManager.PERMISSION_GRANTED
+            return if (Build.VERSION.SDK_INT < 29)
+                ContextCompat.checkSelfPermission(
+                        context,
+                        Manifest.permission.ACCESS_FINE_LOCATION
+                ) == PackageManager.PERMISSION_GRANTED
+            else
+                ContextCompat.checkSelfPermission(
+                        context,
+                        Manifest.permission.ACCESS_FINE_LOCATION
+                ) == PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(
+                        context,
+                        Manifest.permission.ACCESS_BACKGROUND_LOCATION
+                ) == PackageManager.PERMISSION_GRANTED
         }
         return false
     }