QtBluetooth: use public QPermission API to check for permissions on Android

Now when we have the fine-grained public QBluetoothPermission API, we
can use it to check for permissions in the Android implementation.

Adapt QtBluetooth examples to use only the minimal required set of
permissions.

As a drive-by: fix a couple of qCWarning() strings.

Task-number: QTBUG-109964
Change-Id: I55c67bcae27926e76bf9c1a8a9367af2b58883ff
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/bluetooth/qbluetoothlocaldevice_android.cpp b/src/bluetooth/qbluetoothlocaldevice_android.cpp
index ca7faed0..381f3c15 100644
--- a/src/bluetooth/qbluetoothlocaldevice_android.cpp
+++ b/src/bluetooth/qbluetoothlocaldevice_android.cpp
@@ -55,8 +55,7 @@ void QBluetoothLocalDevicePrivate::initialize(const QBluetoothAddress &address)
         return;
     }
 
-    if (!(ensureAndroidPermission(BluetoothPermission::Scan) &&
-          ensureAndroidPermission(BluetoothPermission::Connect))) {
+    if (!ensureAndroidPermission(QBluetoothPermission::Access)) {
         qCWarning(QT_BT_ANDROID) <<  "Local device initialize() failed due to missing permissions";
         return;
     }
@@ -244,8 +243,8 @@ void QBluetoothLocalDevice::setHostMode(QBluetoothLocalDevice::HostMode requeste
     }
 
     case QBluetoothLocalDevice::HostDiscoverable: {
-        if (!ensureAndroidPermission(BluetoothPermission::Advertise)) {
-            qCWarning(QT_BT_ANDROID) << "Local device setHostMode() failed due to"
+        if (!ensureAndroidPermission(QBluetoothPermission::Advertise)) {
+            qCWarning(QT_BT_ANDROID) << "Local device setHostMode() failed due to "
                                         "missing permissions";
             emit errorOccurred(QBluetoothLocalDevice::MissingPermissionsError);
             return;
@@ -288,8 +287,8 @@ QBluetoothLocalDevice::HostMode QBluetoothLocalDevice::hostMode() const
 QList<QBluetoothHostInfo> QBluetoothLocalDevice::allDevices()
 {
     // As a static class function we need to ensure permissions here (in addition to initialize())
-    if (!ensureAndroidPermission(BluetoothPermission::Connect)) {
-        qCWarning(QT_BT_ANDROID) <<  "Local device allDevices() failed due to"
+    if (!ensureAndroidPermission(QBluetoothPermission::Access)) {
+        qCWarning(QT_BT_ANDROID) <<  "Local device allDevices() failed due to "
                                      "missing permissions";
         return {};
     }