updated sample provisioning

Author: shubham7109

add-feature-layers/src/main/java/com/esri/arcgisruntime/sample/addfeaturelayers/DownloadActivity.kt

@@ -3,14 +3,18 @@ package com.esri.arcgisruntime.sample.addfeaturelayers
 import android.content.Intent
 import android.os.Bundle
 import com.esri.arcgisruntime.sample.sampleslib.DownloaderActivity
+import java.io.File
 
 class DownloadActivity : DownloaderActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        val downloadFolder = File(
+            getExternalFilesDir(null)?.path.toString() + File.separator + getString(R.string.app_name)
+        )
         downloadAndStartSample(
             Intent(this, MainActivity::class.java),
             // get the download path of the sample
-            getExternalFilesDir(null)?.path.toString(),
+            downloadFolder.path,
             listOf(
                 // ArcGIS Portal item containing the .mmpk mobile map package
                 "https://www.arcgis.com/home/item.html?id=2b0f9e17105847809dfeb04e3cad69e0",

add-feature-layers/src/main/java/com/esri/arcgisruntime/sample/addfeaturelayers/MainActivity.kt

@@ -57,6 +57,10 @@ class MainActivity : AppCompatActivity() {
         activityMainBinding.mapView
     }
 
+    private val provisionPath: String by lazy {
+        getExternalFilesDir(null)?.path.toString() + File.separator + getString(R.string.app_name)
+    }
+
     // enum to keep track of the selected source to display the feature layer
     enum class FeatureLayerSource(val menuPosition: Int) {
         SERVICE_FEATURE_TABLE(0),
@@ -134,8 +138,7 @@ class MainActivity : AppCompatActivity() {
      */
     private suspend fun loadGeodatabase() {
         // locate the .geodatabase file in the device
-        val geodatabaseFile =
-            File(getExternalFilesDir(null), getString(R.string.geodatabase_la_trails))
+        val geodatabaseFile = File(provisionPath, getString(R.string.geodatabase_la_trails))
         // instantiate the geodatabase with the file path
         val geodatabase = Geodatabase(geodatabaseFile.path)
         // load the geodatabase
@@ -163,7 +166,7 @@ class MainActivity : AppCompatActivity() {
      */
     private suspend fun loadGeopackage() {
         // locate the .gpkg file in the device
-        val geopackageFile = File(getExternalFilesDir(null), "/AuroraCO.gpkg")
+        val geopackageFile = File(provisionPath, "/AuroraCO.gpkg")
         // instantiate the geopackage with the file path
         val geoPackage = GeoPackage(geopackageFile.path)
         // load the geopackage
@@ -187,7 +190,7 @@ class MainActivity : AppCompatActivity() {
     private suspend fun loadShapefile() {
         // locate the shape file in device
         val file = File(
-            getExternalFilesDir(null),
+            provisionPath,
             "/ScottishWildlifeTrust_ReserveBoundaries_20201102.shp"
         )
         // create a shapefile feature table from a named bundle resource

add-feature-layers/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Display feature layers</string>
+    <string name="app_name">Add feature layers</string>
     <string name="hint">Select a feature layer source</string>
     <string name="sample_service_url">https://sampleserver6.arcgisonline.com/arcgis/rest/services/NapervilleShelters/FeatureServer/0</string>
     <string name="geodatabase_la_trails">/LA_Trails.geodatabase</string>

display-map-from-mobile-map-package/src/main/java/com/esri/arcgisruntime/sample/displaymapfrommobilemappackage/DownloadActivity.kt

@@ -19,14 +19,18 @@ package com.esri.arcgisruntime.sample.displaymapfrommobilemappackage
 import android.content.Intent
 import android.os.Bundle
 import com.esri.arcgisruntime.sample.sampleslib.DownloaderActivity
+import java.io.File
 
 class DownloadActivity : DownloaderActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        val downloadFolder = File(
+            getExternalFilesDir(null)?.path.toString() + File.separator + getString(R.string.app_name)
+        )
         downloadAndStartSample(
             Intent(this, MainActivity::class.java),
             // get the download path of the sample
-            getExternalFilesDir(null)?.path.toString(),
+            downloadFolder.path,
             listOf(
                 // ArcGIS Portal item containing the .mmpk mobile map package
                 "https://www.arcgis.com/home/item.html?id=e1f3a7254cb845b09450f54937c16061"

display-map-from-mobile-map-package/src/main/java/com/esri/arcgisruntime/sample/displaymapfrommobilemappackage/MainActivity.kt

@@ -28,11 +28,16 @@ import arcgisruntime.mapping.MobileMapPackage
 import com.esri.arcgisruntime.sample.displaymapfrommobilemappackage.databinding.ActivityMainBinding
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.launch
+import java.io.File
 
 class MainActivity : AppCompatActivity() {
 
     private val TAG = MainActivity::class.java.simpleName
 
+    private val provisionPath: String by lazy {
+        getExternalFilesDir(null)?.path.toString() + File.separator + getString(R.string.app_name)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -48,7 +53,7 @@ class MainActivity : AppCompatActivity() {
         lifecycle.addObserver(mapView)
 
         // get the file path of the (.mmpk) file
-        val filePath = getExternalFilesDir(null)?.path + getString(R.string.yellowstone_mmpk)
+        val filePath = provisionPath + getString(R.string.yellowstone_mmpk)
 
         // create the mobile map package
         val mapPackage = MobileMapPackage(filePath)

samples-lib/src/main/java/com/esri/arcgisruntime/sample/sampleslib/DownloaderActivity.kt

@@ -95,6 +95,9 @@ abstract class DownloaderActivity : AppCompatActivity() {
 
         // the provision folder at the destination
         val provisionFolder = File(destinationPath)
+        if (!provisionFolder.exists()) {
+            provisionFolder.mkdirs()
+        }
 
         // suspends the coroutine until the dialog is resolved.
         val downloadRequired: Boolean =
@@ -103,7 +106,7 @@ abstract class DownloaderActivity : AppCompatActivity() {
                 val provisionQuestionDialog = AlertDialog.Builder(this@DownloaderActivity)
                     .setTitle("Download data?")
 
-                if (provisionFolder.exists()) {
+                if (provisionFolder.list()?.isNotEmpty() == true) {
                     // folder exists, prompt user to download again
                     provisionQuestionDialog.setMessage(getString(R.string.already_provisioned))
                     // if user taps "Re-download" data