Guard against null object when checking permissions

opengisch · Dec 12, 2023 · 14a2258 · 14a2258 · qfield-fairy · Dec 12, 2023
1 parent 77b98ec
commit 14a2258
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 41 deletions.
diff --git a/src/core/positioning/bluetoothdevicemodel.cpp b/src/core/positioning/bluetoothdevicemodel.cpp
@@ -62,19 +62,29 @@ void BluetoothDeviceModel::startServiceDiscovery( const bool fullDiscovery )
   {
     QBluetoothPermission bluetoothPermission;
     bluetoothPermission.setCommunicationModes( QBluetoothPermission::Access );
-    qApp->requestPermission( bluetoothPermission, [=]( const QPermission &permission ) {
-      if ( permission.status() == Qt::PermissionStatus::Granted )
-      {
-        mPermissionChecked = true;
-        startServiceDiscovery( fullDiscovery );
-      }
-      else
-      {
-        mLastError = tr( "Bluetooth permission denied" );
-        emit lastErrorChanged( mLastError );
-      }
-    } );
-    return;
+    Qt::PermissionStatus permissionStatus = qApp->checkPermission( bluetoothPermission );
+    if ( permissionStatus == Qt::PermissionStatus::Undetermined )
+    {
+      qApp->requestPermission( bluetoothPermission, this, [=]( const QPermission &permission ) {
+        if ( permission.status() == Qt::PermissionStatus::Granted )
+        {
+          mPermissionChecked = true;
+          startServiceDiscovery( fullDiscovery );
+        }
+        else
+        {
+          mLastError = tr( "Bluetooth permission denied" );
+          emit lastErrorChanged( mLastError );
+        }
+      } );
+      return;
+    }
+    else if ( permissionStatus == Qt::PermissionStatus::Denied )
+    {
+      mLastError = tr( "Bluetooth permission denied" );
+      emit lastErrorChanged( mLastError );
+      return;
+    }
   }
 #endif
 

diff --git a/src/core/positioning/bluetoothreceiver.cpp b/src/core/positioning/bluetoothreceiver.cpp
@@ -97,20 +97,31 @@ void BluetoothReceiver::handleConnectDevice()
   {
     QBluetoothPermission bluetoothPermission;
     bluetoothPermission.setCommunicationModes( QBluetoothPermission::Access );
-    qApp->requestPermission( bluetoothPermission, [=]( const QPermission &permission ) {
-      if ( permission.status() == Qt::PermissionStatus::Granted )
-      {
-        mPermissionChecked = true;
-        handleConnectDevice();
-      }
-      else
-      {
-        setValid( false );
-        mLastError = tr( "Bluetooth permission denied" );
-        emit lastErrorChanged( mLastError );
-      }
-    } );
-    return;
+    Qt::PermissionStatus permissionStatus = qApp->checkPermission( bluetoothPermission );
+    if ( permissionStatus == Qt::PermissionStatus::Undetermined )
+    {
+      qApp->requestPermission( bluetoothPermission, this, [=]( const QPermission &permission ) {
+        if ( permission.status() == Qt::PermissionStatus::Granted )
+        {
+          mPermissionChecked = true;
+          handleConnectDevice();
+        }
+        else
+        {
+          setValid( false );
+          mLastError = tr( "Bluetooth permission denied" );
+          emit lastErrorChanged( mLastError );
+        }
+      } );
+      return;
+    }
+    else if ( permissionStatus == Qt::PermissionStatus::Denied )
+    {
+      setValid( false );
+      mLastError = tr( "Bluetooth permission denied" );
+      emit lastErrorChanged( mLastError );
+      return;
+    }
   }
 #endif
   if ( mAddress.isEmpty() )

diff --git a/src/core/positioning/internalgnssreceiver.cpp b/src/core/positioning/internalgnssreceiver.cpp
@@ -112,20 +112,31 @@ void InternalGnssReceiver::handleConnectDevice()
   {
     QLocationPermission locationPermission;
     locationPermission.setAccuracy( QLocationPermission::Precise );
-    qApp->requestPermission( locationPermission, [=]( const QPermission &permission ) {
-      if ( permission.status() == Qt::PermissionStatus::Granted )
-      {
-        mPermissionChecked = true;
-        handleConnectDevice();
-      }
-      else
-      {
-        setValid( false );
-        mLastError = tr( "Location permission denied" );
-        emit lastErrorChanged( mLastError );
-      }
-    } );
-    return;
+    Qt::PermissionStatus permissionStatus = qApp->checkPermission( locationPermission );
+    if ( permissionStatus == Qt::PermissionStatus::Undetermined )
+    {
+      qApp->requestPermission( locationPermission, [=]( const QPermission &permission ) {
+        if ( permission.status() == Qt::PermissionStatus::Granted )
+        {
+          mPermissionChecked = true;
+          handleConnectDevice();
+        }
+        else
+        {
+          setValid( false );
+          mLastError = tr( "Location permission denied" );
+          emit lastErrorChanged( mLastError );
+        }
+      } );
+      return;
+    }
+    else if ( permissionStatus == Qt::PermissionStatus::Denied )
+    {
+      setValid( false );
+      mLastError = tr( "Location permission denied" );
+      emit lastErrorChanged( mLastError );
+      return;
+    }
   }
 #endif
   if ( mGeoPositionSource )