Bri12415/display device location fix (#1742)

* Replace deprecated plist entry and add whenInUse entry for ios DisplayDeviceLocation * Add Info.plist for mac DisplayDeviceLocation for location permissions entries * Add location permission entries to SampleViewer mac/info.plist * Modify SampleViewer/mac/info.plist * Remove old ios info.plist from DisplayDeviceLocation * Add permission entry for ios/Info.plist
Esri · Jul 25, 2024 · bed672d · bed672d
1 parent e2496ac
commit bed672d
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 4 deletions.
diff --git a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.pro b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.pro
@@ -55,7 +55,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/...les/Maps/DisplayDeviceLocation/Info.plist → ...Maps/DisplayDeviceLocation/ios/Info.plist b/...les/Maps/DisplayDeviceLocation/Info.plist → ...Maps/DisplayDeviceLocation/ios/Info.plist
@@ -32,6 +32,8 @@
 	<true/>
 	<key>NSLocationWhenInUseUsageDescription</key>
         <string>Location required for application</string>
+        <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+        <string>Location required for application</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

diff --git a/CppSamples/Maps/DisplayDeviceLocation/mac/Info.plist b/CppSamples/Maps/DisplayDeviceLocation/mac/Info.plist
@@ -0,0 +1,31 @@
+<?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>DisplayDeviceLocation</string>
+    <key>CFBundleExecutable</key>
+    <string>DisplayDeviceLocation</string>
+    <key>CFBundleGetInfoString</key>
+    <string>ArcGIS</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.esri.DisplayDeviceLocation</string>
+    <key>CFBundleName</key>
+    <string>DisplayDeviceLocation</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>DisplayDeviceLocation requires location services</string>
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>DisplayDeviceLocation requires location services</string>
+    <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+    <string>DisplayDeviceLocation requires location services</string>
+</dict>
+</plist>
+
diff --git a/SampleViewer/iOS/Info.plist b/SampleViewer/iOS/Info.plist
@@ -72,10 +72,10 @@
     <string>NO</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
-    <key>NSLocationAlwaysUsageDescription</key>
-    <string></string>
     <key>NSLocationWhenInUseUsageDescription</key>
-    <string></string>
+    <string>Location required for application</string>
+    <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+    <string>Location required for application</string>
     <key>NSPhotoLibraryUsageDescription</key>
     <string></string>
     <key>NSBluetoothAlwaysUsageDescription</key>

diff --git a/SampleViewer/mac/Info.plist b/SampleViewer/mac/Info.plist
@@ -24,5 +24,11 @@
     <true/>
     <key>NSRequiresAquaSystemAppearance</key>
     <string>true</string>
+    <key>NSLocationUsageDescription</key>
+    <string>Application requires location services</string>
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>Application requires location services</string>
+    <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+    <string>Application requires location services</string>
 </dict>
 </plist>