fixed issue #162 for android 11

kike-canaries · Mar 5, 2024 · 5f3c4a4 · 5f3c4a4
1 parent 046334a
commit 5f3c4a4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/MainActivity.java b/app/src/main/java/hpsaturn/pollutionreporter/MainActivity.java
@@ -578,8 +578,10 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
                     break;
                 }
                 Log.i(TAG, "[PERM] User granted bluetooth connect permission");
-                requestBluetoothScanPermission();
-
+                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R)
+                    requestBluetoothScanPermission();
+                else
+                    requestLocationPermission();
             case BLUETOOTH_SCAN:
                 if (grantResults.length == 0 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
                     Log.i(TAG, "[PERM] User denied scan nearby devices");

diff --git a/app/src/main/java/hpsaturn/pollutionreporter/PermissionUtil.java b/app/src/main/java/hpsaturn/pollutionreporter/PermissionUtil.java
@@ -36,9 +36,16 @@ public static String[] getBackgroundPermissions() {
     }
 
     public static String[] getBluetoothPermission() {
-        return new String[]{
-                Manifest.permission.BLUETOOTH_CONNECT,
-        };
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) {
+            return new String[]{
+                    Manifest.permission.BLUETOOTH_CONNECT,
+            };
+        }
+        else {
+            return new String[]{
+                    Manifest.permission.BLUETOOTH,
+            };
+        }
     }
 
     public static String[] getBluetoothScanPermission() {