Adjust Bluetooth permission handling for Android SDK >= 31

opengisch · Nov 17, 2022 · 2fe8800 · 2fe8800 · qfield-fairy · Nov 17, 2022
1 parent 4dcd70d
commit 2fe8800
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 11 deletions.
diff --git a/platform/android/AndroidManifest.xml.in b/platform/android/AndroidManifest.xml.in
@@ -11,8 +11,14 @@
   <uses-permission android:name="android.permission.CAMERA" />
   <uses-permission android:name="android.permission.FLASHLIGHT" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-permission android:name="android.permission.BLUETOOTH" />
-  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+  <uses-permission android:name="android.permission.BLUETOOTH"
+      android:maxSdkVersion="30"
+      />
+  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+      android:maxSdkVersion="30"
+      />
+  <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+  <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
       android:maxSdkVersion="28"

diff --git a/platform/android/src/ch/opengis/qfield/QFieldActivity.java b/platform/android/src/ch/opengis/qfield/QFieldActivity.java
@@ -868,15 +868,29 @@ private void checkPermissions() {
             PackageManager.PERMISSION_DENIED) {
             permissionsList.add(Manifest.permission.ACCESS_MEDIA_LOCATION);
         }
-        if (ContextCompat.checkSelfPermission(QFieldActivity.this,
-                                              Manifest.permission.BLUETOOTH) ==
-            PackageManager.PERMISSION_DENIED) {
-            permissionsList.add(Manifest.permission.BLUETOOTH);
-        }
-        if (ContextCompat.checkSelfPermission(
-                QFieldActivity.this, Manifest.permission.BLUETOOTH_ADMIN) ==
-            PackageManager.PERMISSION_DENIED) {
-            permissionsList.add(Manifest.permission.BLUETOOTH_ADMIN);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            if (ContextCompat.checkSelfPermission(
+                    QFieldActivity.this, Manifest.permission.BLUETOOTH_SCAN) ==
+                PackageManager.PERMISSION_DENIED) {
+                permissionsList.add(Manifest.permission.BLUETOOTH_SCAN);
+            }
+            if (ContextCompat.checkSelfPermission(
+                    QFieldActivity.this,
+                    Manifest.permission.BLUETOOTH_CONNECT) ==
+                PackageManager.PERMISSION_DENIED) {
+                permissionsList.add(Manifest.permission.BLUETOOTH_CONNECT);
+            }
+        } else {
+            if (ContextCompat.checkSelfPermission(
+                    QFieldActivity.this, Manifest.permission.BLUETOOTH) ==
+                PackageManager.PERMISSION_DENIED) {
+                permissionsList.add(Manifest.permission.BLUETOOTH);
+            }
+            if (ContextCompat.checkSelfPermission(
+                    QFieldActivity.this, Manifest.permission.BLUETOOTH_ADMIN) ==
+                PackageManager.PERMISSION_DENIED) {
+                permissionsList.add(Manifest.permission.BLUETOOTH_ADMIN);
+            }
         }
         if (permissionsList.size() > 0) {
             String[] permissions = new String[permissionsList.size()];