Merge pull request #149 from Esri/release/100.6.1

Merge 100.6.1 into master

Author: gunt0001

arcgis-android-toolkit/src/main/java/com/esri/arcgisruntime/toolkit/ar/ArcGISArView.kt

@@ -425,6 +425,15 @@ class ArcGISArView : FrameLayout, DefaultLifecycleObserver, Scene.OnUpdateListen
             cameraController.translationFactor = value
         }
 
+    /**
+     * List of permissions requested during this session.
+     *
+     * @since 100.6.1
+     */
+    private val requestedPermissions: MutableList<String> by lazy {
+        ArrayList<String>()
+    }
+
     /**
      * Exposes an [Exception] should it occur when using this view.
      *
@@ -559,9 +568,18 @@ class ArcGISArView : FrameLayout, DefaultLifecycleObserver, Scene.OnUpdateListen
         // permission on Android M and above, now is a good time to ask the user for it.
         // when the permission is requested and the user responds to the request from the OS this is executed again
         // during onResume()
-        if (isUsingARCore == ARCoreUsage.YES && renderVideoFeed && !hasPermission(CAMERA_PERMISSION)) {
-            requestPermission(context as Activity, CAMERA_PERMISSION, CAMERA_PERMISSION_CODE)
-            return
+        if (isUsingARCore == ARCoreUsage.YES && !hasPermission(CAMERA_PERMISSION)) {
+            if (permissionHasBeenPermanentlyDenied(context as Activity, CAMERA_PERMISSION)) {
+                error = Exception(
+                    resources.getString(
+                        R.string.arcgis_ar_view_exception_permission_permanently_denied,
+                        CAMERA_PERMISSION
+                    )
+                )
+            } else {
+                requestPermission(context as Activity, CAMERA_PERMISSION, CAMERA_PERMISSION_CODE)
+                return
+            }
         }
 
         if (isUsingARCore == ARCoreUsage.YES) {
@@ -607,11 +625,20 @@ class ArcGISArView : FrameLayout, DefaultLifecycleObserver, Scene.OnUpdateListen
         // Request location permission if user has provided a LocationDataSource
         locationDataSource?.let {
             if (!hasPermission(LOCATION_PERMISSION)) {
-                requestPermission(
-                    context as Activity,
-                    LOCATION_PERMISSION,
-                    LOCATION_PERMISSION_CODE
-                )
+                if (permissionHasBeenPermanentlyDenied(context as Activity, LOCATION_PERMISSION)) {
+                    error = Exception(
+                        resources.getString(
+                            R.string.arcgis_ar_view_exception_permission_permanently_denied,
+                            LOCATION_PERMISSION
+                        )
+                    )
+                } else {
+                    requestPermission(
+                        context as Activity,
+                        LOCATION_PERMISSION,
+                        LOCATION_PERMISSION_CODE
+                    )
+                }
                 return
             }
         }
@@ -838,13 +865,36 @@ class ArcGISArView : FrameLayout, DefaultLifecycleObserver, Scene.OnUpdateListen
         ) == PackageManager.PERMISSION_GRANTED
     }
 
+    /**
+     * We use [ActivityCompat.shouldShowRequestPermissionRationale] as a workaround to detect whether
+     * the user has denied the permission permanently, i.e. has selected `Don't Ask Again`. There is
+     * no official API to detect that, so we use a variation of a workaround described here:
+     * https://blog.usejournal.com/method-to-detect-if-user-has-selected-dont-ask-again-while-requesting-for-permission-921b95ded536
+     *
+     * Checks [requestedPermissions] property for permission to determine if it has already been
+     * requested this session. Returns false if permission has never been requested and therefore the
+     * user has not selected `Don't Ask Again`. Returns true otherwise.
+     *
+     * @since 100.6.1
+     */
+    private fun permissionHasBeenPermanentlyDenied(
+        activity: Activity,
+        permission: String
+    ): Boolean {
+        return requestedPermissions.contains(permission) && ActivityCompat.shouldShowRequestPermissionRationale(
+            activity,
+            permission
+        ).not()
+    }
+
     /**
      * Request a [permission] using the provided [activity] and [permissionCode].
      *
      * @since 100.6.0
      */
     private fun requestPermission(activity: Activity, permission: String, permissionCode: Int) {
         ActivityCompat.requestPermissions(activity, arrayOf(permission), permissionCode)
+        requestedPermissions.add(permission)
     }
 
     /**

arcgis-android-toolkit/src/main/res/values/strings.xml

@@ -16,7 +16,10 @@
   -->
 
 <resources>
+
+    <!-- ArcGISArView -->
     <string name="arcgis_ar_view_ar_core_unsupported_error">ARCore is unsupported: %s</string>
+    <string name="arcgis_ar_view_exception_permission_permanently_denied">%s permission has been permanently denied</string>
 
     <!-- ArCalibrationView -->
     <string name="ar_calibration_view_elevation_label">Elevation</string>

gradle/script/aar-publishing.gradle

@@ -16,13 +16,20 @@
 
 apply from: "$rootProject.projectDir/gradle/script/artifact.gradle"
 
+// https://docs.gradle.org/current/userguide/publishing_maven.html
 publishing {
     publications {
-        mavenAar(MavenPublication) {
+        aar(MavenPublication) {
             from components.android
             groupId _groupId
             artifactId _artifactId
             version _versionName
         }
     }
 }
+
+// Rewrites default filename for pom to match that of the artifact
+// https://docs.gradle.org/current/dsl/org.gradle.api.publish.maven.tasks.GenerateMavenPom.html
+generatePomFileForAarPublication {
+    destination = "$buildDir/outputs/aar/${_artifactId}-${_versionName}.xml"
+}

gradle/script/artifact.gradle

@@ -15,8 +15,8 @@
  */
 
 ext {
-    _versionCode = 106
-    _versionName = "100.6.0"
+    _versionCode = 108
+    _versionName = "100.6.1"
     _groupId = "com.esri.arcgisruntime"
     _artifactId = 'arcgis-android-toolkit'
 }

gradle/script/versions.gradle

@@ -17,16 +17,16 @@
 ext {
     droid = ext {
         minSdk = 19
-        targetSdk = 28
-        buildTools = "28.0.3"
-        androidGradlePlugin = "3.5.0"
+        targetSdk = 29
+        buildTools = "29.0.2"
+        androidGradlePlugin = "3.5.1"
         androidMavenGradlePlugin = "2.1"
         dokka = "0.9.18"
         constraintLayout = "1.1.3"
         multiDex = "1.0.3"
         support = "28.0.0"
         testRunner = "1.0.2"
-        arCore = "1.8.0"
+        arCore = "1.12.0"
         lifecycle = "1.1.1"
     }
     test = ext {