Update samples to request permissions (#1753)

Esri · Oct 23, 2024 · d97cee6 · d97cee6
1 parent 39dfeb1
commit d97cee6
Show file tree

Hide file tree

Showing 12 changed files with 334 additions and 3 deletions.
diff --git a/...aps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.cpp b/...aps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.cpp
@@ -33,6 +33,11 @@
 #include "MapViewTypes.h"
 #include "PortalItem.h"
 
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) || defined(Q_OS_IOS) || defined(Q_OS_MACOS) || defined(Q_OS_ANDROID)
+#define PERMISSIONS_PLATFORM
+#include <QPermissions>
+#endif
+
 using namespace Esri::ArcGISRuntime;
 
 namespace {
@@ -79,11 +84,54 @@ void ShowDeviceLocationUsingIndoorPositioning::setMapView(MapQuickView* mapView)
   m_mapView = mapView;
   m_mapView->setMap(m_map);
 
-  setupIndoorsLocationDataSource();
+  // Issue expected with Android - https://bugreports.qt.io/browse/QTBUG-130301
+  #ifdef PERMISSIONS_PLATFORM
+    requestBluetoothThenLocationPermissions();
+  #else
+    setupIndoorsLocationDataSource();
+  #endif
 
   emit mapViewChanged();
 }
 
+void ShowDeviceLocationUsingIndoorPositioning::requestBluetoothThenLocationPermissions()
+{
+    qApp->requestPermission(QBluetoothPermission{}, [this](const QPermission& permission)
+  {
+    Q_UNUSED(permission);
+    requestLocationPermissionThenSetupILDS();
+  });
+}
+
+void ShowDeviceLocationUsingIndoorPositioning::requestLocationPermissionThenSetupILDS()
+{
+  QLocationPermission locationPermission{};
+  locationPermission.setAccuracy(QLocationPermission::Accuracy::Precise);
+  locationPermission.setAvailability(QLocationPermission::Availability::WhenInUse);
+  qApp->requestPermission(locationPermission, [this](const QPermission& permission)
+  {
+    Q_UNUSED(permission);
+    checkPermissions();
+    setupIndoorsLocationDataSource();
+  });
+}
+
+void ShowDeviceLocationUsingIndoorPositioning::checkPermissions()
+{
+  if (qApp->checkPermission(QBluetoothPermission{}) == Qt::PermissionStatus::Denied)
+  {
+    emit bluetoothPermissionDenied();
+  }
+
+  QLocationPermission locationPermission{};
+  locationPermission.setAccuracy(QLocationPermission::Accuracy::Precise);
+  locationPermission.setAvailability(QLocationPermission::Availability::WhenInUse);
+  if (qApp->checkPermission(locationPermission) == Qt::PermissionStatus::Denied)
+  {
+    emit locationPermissionDenied();
+  }
+}
+
 // This function uses a helper class `IndoorsLocationDataSourceCreator` to construct the IndoorsLocationDataSource
 void ShowDeviceLocationUsingIndoorPositioning::setupIndoorsLocationDataSource()
 {

diff --git a/.../Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.h b/.../Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.h
@@ -52,6 +52,8 @@ class ShowDeviceLocationUsingIndoorPositioning : public QObject
 signals:
   void mapViewChanged();
   void locationPropertiesChanged();
+  void locationPermissionDenied();
+  void bluetoothPermissionDenied();
 
 private:
   Esri::ArcGISRuntime::MapQuickView* mapView() const;
@@ -61,6 +63,9 @@ class ShowDeviceLocationUsingIndoorPositioning : public QObject
   void setupIndoorsLocationDataSource();
   void locationChangedHandler(const Esri::ArcGISRuntime::Location& loc);
   void changeFloorDisplay();
+  void requestLocationPermissionThenSetupILDS();
+  void requestBluetoothThenLocationPermissions();
+  void checkPermissions();
 
   Esri::ArcGISRuntime::Map* m_map = nullptr;
   Esri::ArcGISRuntime::MapQuickView* m_mapView = nullptr;

diff --git a/...aps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.pro b/...aps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.pro
@@ -57,7 +57,11 @@ ios {
     OTHER_FILES += \
         $$PWD/Info.plist
 
-    QMAKE_INFO_PLIST = $$PWD/Info.plist
+    QMAKE_INFO_PLIST = $$PWD/ios/Info.plist
+}
+
+macx {
+    QMAKE_INFO_PLIST = $$PWD/mac/Info.plist
 }
 
 android {

diff --git a/...aps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.qml b/...aps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.qml
@@ -18,6 +18,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Esri.Samples
+import QtQuick.Dialogs
 
 Item {
 
@@ -80,4 +81,46 @@ Item {
         id: model
         mapView: view
     }
+
+    Connections {
+        target: model
+        function onLocationPermissionDenied() {
+            locationPermissionDeniedDialog.open()
+        }
+    }
+
+    Dialog {
+        id: locationPermissionDeniedDialog
+        title: "Location Permission Denied"
+        modal: true
+        standardButtons: Dialog.Ok
+        x: (parent.width - width) / 2
+        y: (parent.height - height) / 2
+
+        Text {
+            text: "This application requires location permission."
+            color: "white"
+        }
+    }
+
+    Connections {
+        target: model
+        function onBluetoothPermissionDenied() {
+            bluetoothPermissionDeniedDialog.open()
+        }
+    }
+
+    Dialog {
+        id: bluetoothPermissionDeniedDialog
+        title: "Bluetooth Permission Denied"
+        modal: true
+        standardButtons: Dialog.Ok
+        x: (parent.width - width) / 2
+        y: (parent.height - height) / 2
+
+        Text {
+            text: "This application requires bluetooth permission."
+            color: "white"
+        }
+    }
 }
diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ios/Info.plist b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ios/Info.plist
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>CFBundleDisplayName</key>
+        <string>ShowDeviceLocationUsingIndoorPositioning</string>
+        <key>CFBundleExecutable</key>
+        <string>ShowDeviceLocationUsingIndoorPositioning</string>
+        <key>CFBundleGetInfoString</key>
+        <string>ArcGIS</string>
+        <key>CFBundleIcons~ipad</key>
+        <dict/>
+        <key>CFBundleIdentifier</key>
+        <string>com.esri.${PRODUCT_NAME:rfc1034identifier}</string>
+        <key>CFBundleName</key>
+        <string>${PRODUCT_NAME}</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>1.0</string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleVersion</key>
+        <string>1.0</string>
+        <key>NOTE</key>
+        <string>This app is cool</string>
+        <key>UIFileSharingEnabled</key>
+        <string>FALSE</string>
+        <key>UIRequiresPersistentWiFi</key>
+        <string>NO</string>
+        <key>LSRequiresIPhoneOS</key>
+        <true/>
+        <key>NSLocationWhenInUseUsageDescription</key>
+        <string>Location required for application</string>
+        <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+        <string>Location required for application</string>
+        <key>NSBluetoothAlwaysUsageDescription</key>
+        <string>Bluetooth access is required for Indoor Positioning</string>
+        <key>UISupportedInterfaceOrientations</key>
+        <array>
+                <string>UIInterfaceOrientationPortrait</string>
+                <string>UIInterfaceOrientationPortraitUpsideDown</string>
+                <string>UIInterfaceOrientationLandscapeLeft</string>
+                <string>UIInterfaceOrientationLandscapeRight</string>
+        </array>
+        <key>UISupportedInterfaceOrientations~ipad</key>
+        <array>
+                <string>UIInterfaceOrientationPortrait</string>
+                <string>UIInterfaceOrientationPortraitUpsideDown</string>
+                <string>UIInterfaceOrientationLandscapeLeft</string>
+                <string>UIInterfaceOrientationLandscapeRight</string>
+        </array>
+        <key>UILaunchStoryboardName</key>
+        <string>LaunchScreen</string>
+</dict>
+</plist>
diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/mac/Info.plist b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/mac/Info.plist
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDisplayName</key>
+    <string>ShowDeviceLocationUsingIndoorPositioning</string>
+    <key>CFBundleExecutable</key>
+    <string>ShowDeviceLocationUsingIndoorPositioning</string>
+    <key>CFBundleGetInfoString</key>
+    <string>ArcGIS</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.esri.ShowDeviceLocationUsingIndoorPositioning</string>
+    <key>CFBundleName</key>
+    <string>ShowDeviceLocationUsingIndoorPositioning</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>1.0</string>
+    <key>NSLocationUsageDescription</key>
+    <string>Location required for application</string>
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>Location required for application</string>
+    <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+    <string>Location required for application</string>
+    <key>NSBluetoothAlwaysUsageDescription</key>
+    <string>Bluetooth access is required for Indoor Positioning</string>
+</dict>
+</plist>
+
diff --git a/CppSamples/Search/FindPlace/FindPlace.cpp b/CppSamples/Search/FindPlace/FindPlace.cpp
@@ -52,6 +52,11 @@
 #include <QUrl>
 #include <QUuid>
 
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) || defined(Q_OS_IOS) || defined(Q_OS_MACOS) || defined(Q_OS_ANDROID)
+#define PERMISSIONS_PLATFORM
+#include <QPermissions>
+#endif
+
 using namespace Esri::ArcGISRuntime;
 
 FindPlace::FindPlace(QQuickItem* parent /* = nullptr */):
@@ -96,6 +101,9 @@ void FindPlace::componentComplete()
   m_mapView->calloutData()->setVisible(false);
   m_calloutData = m_mapView->calloutData();
 
+  // start location permission
+  startLocationPermission();
+
   // connect mapview signals
   connectSignals();
 }
@@ -143,6 +151,26 @@ void FindPlace::connectSignals()
   });
 }
 
+void FindPlace::startLocationPermission()
+{
+#ifdef PERMISSIONS_PLATFORM
+  QLocationPermission locationPermission{};
+  locationPermission.setAccuracy(QLocationPermission::Accuracy::Precise);
+  locationPermission.setAvailability(QLocationPermission::Availability::WhenInUse);
+  switch (qApp->checkPermission(locationPermission))
+  {
+  case Qt::PermissionStatus::Undetermined:
+    qApp->requestPermission(locationPermission, this, &FindPlace::startLocationPermission);
+    return;
+  case Qt::PermissionStatus::Granted:
+    return;
+  case Qt::PermissionStatus::Denied:
+    emit locationPermissionDenied();
+    return;
+  }
+#endif
+}
+
 void FindPlace::addGraphicsOverlay()
 {
   // add a graphics overlay to the mapview

diff --git a/CppSamples/Search/FindPlace/FindPlace.h b/CppSamples/Search/FindPlace/FindPlace.h
@@ -69,6 +69,7 @@ class FindPlace : public QQuickItem
   void hideCallout();
   void showCallout();
   void showExtentButton();
+  void locationPermissionDenied();
 
 private:
   void addGraphicsOverlay();
@@ -78,6 +79,7 @@ class FindPlace : public QQuickItem
   void setPoiTextHasFocus(bool hasFocus);
   Esri::ArcGISRuntime::GeocodeParameters createParameters();
   void onGeocodingCompleted_(const QList<Esri::ArcGISRuntime::GeocodeResult>& results);
+  void startLocationPermission();
 
 private:
   Esri::ArcGISRuntime::Map* m_map = nullptr;

diff --git a/CppSamples/Search/FindPlace/FindPlace.pro b/CppSamples/Search/FindPlace/FindPlace.pro
@@ -64,7 +64,11 @@ ios {
     OTHER_FILES += \
         $$PWD/Info.plist
 
-    QMAKE_INFO_PLIST = $$PWD/Info.plist
+    QMAKE_INFO_PLIST = $$PWD/ios/Info.plist
+}
+
+macx {
+    QMAKE_INFO_PLIST = $$PWD/mac/Info.plist
 }
 
 android {

diff --git a/CppSamples/Search/FindPlace/FindPlace.qml b/CppSamples/Search/FindPlace/FindPlace.qml
@@ -19,6 +19,7 @@ import QtQuick.Controls
 import QtPositioning
 import Esri.ArcGISRuntime.Toolkit
 import Esri.Samples
+import QtQuick.Dialogs
 
 FindPlaceSample {
     id: findPlaceSample
@@ -151,4 +152,25 @@ FindPlaceSample {
             callout.dismiss();
         }
     }
+
+    Connections {
+        target: findPlaceSample
+        function onLocationPermissionDenied() {
+            permissionDeniedDialog.open()
+        }
+    }
+
+    Dialog {
+        id: permissionDeniedDialog
+        title: "Location Permission Denied"
+        modal: true
+        standardButtons: Dialog.Ok
+        x: (parent.width - width) / 2
+        y: (parent.height - height) / 2
+
+        Text {
+            text: "This application requires location permissions."
+            color: "white"
+        }
+    }
 }