add BLUETOOTH_CONNECT permission

ostrya · ostrya · commit f92de60172f7 · 2023-04-21T08:03:16.000+02:00
fixes #62
diff --git a/README.md b/README.md
@@ -110,6 +110,7 @@ After you have imported your client certificate, you will be able to choose it f
 * ACCESS_WIFI_STATE: necessary to retrieve SSID of connected Wi-Fi
 * BLUETOOTH: necessary up to Android 11 to communicate with beacons
 * BLUETOOTH_ADMIN: necessary up to Android 11 to discover beacons
+* BLUETOOTH_CONNECT: on Android 12+, necessary to read beacon names
 * BLUETOOTH_SCAN: on Android 12+, necessary to discover beacons
 * INTERNET: only necessary if your MQTT server is not running locally
 * RECEIVE_BOOT_COMPLETED: necessary to start service on start-up
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -47,8 +47,8 @@ android {
         multiDexEnabled = true
         targetSdk = 33
         vectorDrawables.useSupportLibrary = true
-        versionCode = 49
-        versionName = "2.5.1"
+        versionCode = 50
+        versionName = "2.5.2"
         javaCompileOptions {
             annotationProcessorOptions {
                 argument("room.schemaLocation", "$projectDir/schemas")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
         android:maxSdkVersion="30" />
     <!-- Request Bluetooth permissions on Android 12+ -->
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/app/src/main/java/org/ostrya/presencepublisher/initialization/EnsureBluetoothPermission.java b/app/src/main/java/org/ostrya/presencepublisher/initialization/EnsureBluetoothPermission.java
@@ -15,20 +15,25 @@
 import org.ostrya.presencepublisher.dialog.ConfirmationDialogFragment;
 import org.ostrya.presencepublisher.log.DatabaseLogger;
 
+import java.util.Map;
 import java.util.Queue;
 
-public class EnsureBluetoothPermission extends AbstractChainedHandler<String, Boolean> {
+public class EnsureBluetoothPermission
+        extends AbstractChainedHandler<String[], Map<String, Boolean>> {
     protected EnsureBluetoothPermission(MainActivity activity, Queue<HandlerFactory> handlerChain) {
-        super(activity, new ActivityResultContracts.RequestPermission(), handlerChain);
+        super(activity, new ActivityResultContracts.RequestMultiplePermissions(), handlerChain);
     }
 
     @Override
     protected void doInitialize() {
         if (activity.isLocationPermissionNeeded()
                 && activity.isBluetoothBeaconConfigured()
                 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
-                && ContextCompat.checkSelfPermission(activity, Manifest.permission.BLUETOOTH_SCAN)
-                        != PackageManager.PERMISSION_GRANTED) {
+                && (ContextCompat.checkSelfPermission(activity, Manifest.permission.BLUETOOTH_SCAN)
+                                != PackageManager.PERMISSION_GRANTED
+                        || ContextCompat.checkSelfPermission(
+                                        activity, Manifest.permission.BLUETOOTH_CONNECT)
+                                != PackageManager.PERMISSION_GRANTED)) {
             DatabaseLogger.i(TAG, "Bluetooth scan permission not yet granted, asking user ...");
             FragmentManager fm = activity.getSupportFragmentManager();
             ConfirmationDialogFragment fragment =
@@ -45,19 +50,28 @@ protected void doInitialize() {
     @RequiresApi(api = Build.VERSION_CODES.S)
     private void onResult(Activity parent, boolean ok) {
         if (ok) {
-            getLauncher().launch(Manifest.permission.BLUETOOTH_SCAN);
+            getLauncher()
+                    .launch(
+                            new String[] {
+                                Manifest.permission.BLUETOOTH_SCAN,
+                                Manifest.permission.BLUETOOTH_CONNECT
+                            });
         } else {
             finishInitialization();
         }
     }
 
     @Override
-    protected void doHandleResult(Boolean result) {
-        if (result) {
-            DatabaseLogger.i(TAG, "Successfully granted bluetooth permission");
-        } else {
-            DatabaseLogger.w(TAG, "Bluetooth permission not granted, continuing anyway");
-        }
+    protected void doHandleResult(Map<String, Boolean> result) {
+        result.forEach(
+                (permission, enabled) ->
+                        DatabaseLogger.i(
+                                TAG,
+                                "Result for "
+                                        + permission
+                                        + ": "
+                                        + (enabled ? "granted" : "not granted")));
+        DatabaseLogger.i(TAG, "Continuing initialization");
         finishInitialization();
     }
 
diff --git a/app/src/main/java/org/ostrya/presencepublisher/preference/ConditionFragment.java b/app/src/main/java/org/ostrya/presencepublisher/preference/ConditionFragment.java
@@ -26,6 +26,8 @@
 import org.ostrya.presencepublisher.preference.condition.SendViaMobileNetworkPreference;
 import org.ostrya.presencepublisher.preference.condition.WifiCategorySupport;
 
+import java.util.Map;
+
 public class ConditionFragment extends AbstractConfigurationFragment {
     private static final String TAG = "ConditionFragment";
 
@@ -41,15 +43,15 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
         WifiCategorySupport wifiSupport = new WifiCategorySupport(this);
         ActivityResultLauncher<String> serviceStartLauncher;
-        ActivityResultLauncher<String> permissionRequestLauncher;
+        ActivityResultLauncher<String[]> permissionRequestLauncher;
         // to make linter happy
         if (beaconsSupported) {
             serviceStartLauncher =
-                    registerForActivityResult(new IntentActionContract(), this::onActivityResult);
+                    registerForActivityResult(new IntentActionContract(), this::onServiceStart);
             permissionRequestLauncher =
                     registerForActivityResult(
-                            new ActivityResultContracts.RequestPermission(),
-                            this::onActivityResult);
+                            new ActivityResultContracts.RequestMultiplePermissions(),
+                            this::onPermissionsGranted);
         } else {
             serviceStartLauncher = null;
             permissionRequestLauncher = null;
@@ -98,11 +100,19 @@ protected void onPreferencesChanged(SharedPreferences sharedPreferences, String
         }
     }
 
-    private void onActivityResult(boolean result) {
+    private void onServiceStart(boolean result) {
         DatabaseLogger.d(TAG, "Received result " + result);
         if (result && beaconSupport != null) {
             DatabaseLogger.i(TAG, "Start scanning after enabling bluetooth");
             beaconSupport.clickAdd();
         }
     }
+
+    private void onPermissionsGranted(Map<String, Boolean> result) {
+        DatabaseLogger.d(TAG, "Received result " + result);
+        if (result.values().stream().allMatch(b -> b) && beaconSupport != null) {
+            DatabaseLogger.i(TAG, "Start scanning after enabling bluetooth");
+            beaconSupport.clickAdd();
+        }
+    }
 }
diff --git a/app/src/main/java/org/ostrya/presencepublisher/preference/condition/AddBeaconChoicePreferenceDummy.java b/app/src/main/java/org/ostrya/presencepublisher/preference/condition/AddBeaconChoicePreferenceDummy.java
@@ -29,13 +29,13 @@ public class AddBeaconChoicePreferenceDummy extends ClickDummy {
     private static final String TAG = "AddBeaconChoicePreferenceDummy";
 
     private final ActivityResultLauncher<String> serviceStartLauncher;
-    private final ActivityResultLauncher<String> permissionRequestLauncher;
+    private final ActivityResultLauncher<String[]> permissionRequestLauncher;
 
     public AddBeaconChoicePreferenceDummy(
             Context context,
             Fragment fragment,
             ActivityResultLauncher<String> serviceStartLauncher,
-            ActivityResultLauncher<String> permissionRequestLauncher) {
+            ActivityResultLauncher<String[]> permissionRequestLauncher) {
         super(
                 context,
                 R.drawable.baseline_playlist_add_24,
@@ -49,10 +49,16 @@ public AddBeaconChoicePreferenceDummy(
     @Override
     protected void onClick() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
-                && ContextCompat.checkSelfPermission(
-                                getContext(), Manifest.permission.BLUETOOTH_SCAN)
-                        != PackageManager.PERMISSION_GRANTED) {
-            permissionRequestLauncher.launch(Manifest.permission.BLUETOOTH_SCAN);
+                && (ContextCompat.checkSelfPermission(
+                                        getContext(), Manifest.permission.BLUETOOTH_SCAN)
+                                != PackageManager.PERMISSION_GRANTED
+                        || ContextCompat.checkSelfPermission(
+                                        getContext(), Manifest.permission.BLUETOOTH_CONNECT)
+                                != PackageManager.PERMISSION_GRANTED)) {
+            permissionRequestLauncher.launch(
+                    new String[] {
+                        Manifest.permission.BLUETOOTH_SCAN, Manifest.permission.BLUETOOTH_CONNECT
+                    });
             return;
         }
         BluetoothManager bluetoothManager =
diff --git a/app/src/main/java/org/ostrya/presencepublisher/preference/condition/BeaconCategorySupport.java b/app/src/main/java/org/ostrya/presencepublisher/preference/condition/BeaconCategorySupport.java
@@ -20,7 +20,7 @@ public class BeaconCategorySupport extends AbstractDynamicPreferenceCategorySupp
     public BeaconCategorySupport(
             AbstractConfigurationFragment fragment,
             @Nullable ActivityResultLauncher<String> serviceStartLauncher,
-            @Nullable ActivityResultLauncher<String> permissionRequestLauncher) {
+            @Nullable ActivityResultLauncher<String[]> permissionRequestLauncher) {
         super(
                 fragment,
                 R.string.category_beacon_regions,
@@ -35,7 +35,7 @@ private static Preference createAdderEntry(
             Context context,
             Fragment fragment,
             @Nullable ActivityResultLauncher<String> serviceStartLauncher,
-            @Nullable ActivityResultLauncher<String> permissionRequestLauncher) {
+            @Nullable ActivityResultLauncher<String[]> permissionRequestLauncher) {
         if (serviceStartLauncher != null && permissionRequestLauncher != null) {
             return new AddBeaconChoicePreferenceDummy(
                     context, fragment, serviceStartLauncher, permissionRequestLauncher);
diff --git a/app/src/main/play/listings/de-DE/full-description.txt b/app/src/main/play/listings/de-DE/full-description.txt
@@ -28,6 +28,7 @@ Datenschutzerklärung unter <a href="https://ostrya.github.io/PresencePublisher/
 • ACCESS_WIFI_STATE: notwendig, um den Namen des verbundenen WLANs zu erfassen
 • BLUETOOTH: notwendig bis Android 11, um mit Bluetooth-Beacons zu kommunizieren
 • BLUETOOTH_ADMIN: notwendig bis Android 11, um unbekannte Bluetooth-Beacons zu finden
+• BLUETOOTH_CONNECT: notwendig ab Android 12, um Namen von unbekannten Bluetooth-Beacons zu lesen
 • BLUETOOTH_SCAN: notwendig ab Android 12, um unbekannte Bluetooth-Beacons zu finden
 • FOREGROUND_SERVICE: notwendig ab Android 9, damit die App zuverlässig laufen kann
 • INTERNET: nur notwendig, wenn dein MQTT-Broker nicht im lokalen Netzwerk läuft
diff --git a/app/src/main/play/listings/en-US/full-description.txt b/app/src/main/play/listings/en-US/full-description.txt
@@ -25,6 +25,7 @@ please have a look at the privacy policy at <a href="https://ostrya.github.io/Pr
 • ACCESS_WIFI_STATE: necessary to retrieve SSID of connected Wi-Fi
 • BLUETOOTH: necessary up to Android 11 to communicate with beacons
 • BLUETOOTH_ADMIN: necessary up to Android 11 to discover beacons
+• BLUETOOTH_CONNECT: on Android 12+, necessary to read beacon names
 • BLUETOOTH_SCAN: on Android 12+, necessary to discover beacons
 • FOREGROUND_SERVICE: necessary on Android 9+ to run the app reliably
 • INTERNET: only necessary if your MQTT server is not running locally
diff --git a/app/src/main/play/release-notes/de-DE/default.txt b/app/src/main/play/release-notes/de-DE/default.txt
@@ -1,3 +1,6 @@
+v2.5.2
+• weitere fehlende Bluetooth-Berechtigung hinzugefügt
+
 v2.5.1
 • Hell- und Dunkelmodus
 • neue Berechtigungen für Bluetooth-Erkennung mit Android 12+
diff --git a/app/src/main/play/release-notes/en-US/default.txt b/app/src/main/play/release-notes/en-US/default.txt
@@ -1,3 +1,6 @@
+v2.5.2
+• added another missing bluetooth permission
+
 v2.5.1
 • bright and dark mode
 • new permissions for bluetooth detection on Android 12+
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -22,7 +22,7 @@
     </string>
     <string name="location_consent_summary">Erlaube dieser App, deine Standortdaten zu erfassen und zu verarbeiten.</string>
     <string name="bluetooth_permission_dialog_title">Bluetooth-Berechtigung</string>
-    <string name="bluetooth_permission_dialog_message">Bitte erlaube das Suchen nach Bluetooth-Geräten, damit diese App auf deine Beacons reagieren kann.</string>
+    <string name="bluetooth_permission_dialog_message">Bitte erlaube das Suchen nach sowie das Verbinden mit Bluetooth-Geräten, damit diese App auf deine Beacons reagieren kann.</string>
     <string name="bluetooth_dialog_title">Bluetooth</string>
     <string name="bluetooth_dialog_message">Bitte schalte Bluetooth an, damit diese App nach Beacons suchen kann. Andernfalls
         wird die App keine Beacons finden.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -29,7 +29,7 @@
     </string>
     <string name="location_consent_summary">Allow this app to access and process your location information.</string>
     <string name="bluetooth_permission_dialog_title">Bluetooth permission</string>
-    <string name="bluetooth_permission_dialog_message">Please allow scanning for bluetooth devices so this app can react to your beacons\' presence.</string>
+    <string name="bluetooth_permission_dialog_message">Please allow scanning for and connecting to bluetooth devices so this app can react to your beacons\' presence.</string>
     <string name="bluetooth_dialog_title">Bluetooth</string>
     <string name="bluetooth_dialog_message">Please enable Bluetooth so that this app can scan for beacons. Otherwise,
         no beacons will be found.
