From 734b217cda0603cb9ea8303b5d719616e2f18155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Tue, 19 Feb 2019 13:23:49 +0100 Subject: [android] when changing the resource path, recreate database instead of the whole FileSource --- .../offline/ChangeResourcesCachePathActivity.kt | 37 ++++++++++++++++------ 1 file changed, 28 insertions(+), 9 deletions(-) (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox') diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/ChangeResourcesCachePathActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/ChangeResourcesCachePathActivity.kt index 2c429e829d..f2f4eb26c3 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/ChangeResourcesCachePathActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/ChangeResourcesCachePathActivity.kt @@ -12,27 +12,36 @@ import android.widget.AdapterView import android.widget.BaseAdapter import android.widget.TextView import android.widget.Toast +import com.mapbox.mapboxsdk.log.Logger +import com.mapbox.mapboxsdk.offline.OfflineManager +import com.mapbox.mapboxsdk.offline.OfflineRegion import com.mapbox.mapboxsdk.storage.FileSource import com.mapbox.mapboxsdk.testapp.R import kotlinx.android.synthetic.main.activity_change_resources_cache_path.* import java.io.File class ChangeResourcesCachePathActivity : AppCompatActivity(), - AdapterView.OnItemClickListener, - FileSource.SetResourcesCachePathCallback { + AdapterView.OnItemClickListener, + FileSource.SetResourcesCachePathCallback { + + companion object { + private const val TAG = "Mbgl-ChangeResourcesCachePathActivity" + } lateinit var adapter: PathAdapter + private lateinit var offlineManager: OfflineManager + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_change_resources_cache_path) - Thread(Runnable { - adapter = PathAdapter(this, obtainFilesPaths(this)) - listView.adapter = adapter - listView.emptyView = empty - listView.onItemClickListener = this - }).start() + adapter = PathAdapter(this, obtainFilesPaths(this)) + listView.adapter = adapter + listView.emptyView = empty + listView.onItemClickListener = this + + offlineManager = OfflineManager.getInstance(this) } override fun onStart() { @@ -55,6 +64,16 @@ class ChangeResourcesCachePathActivity : AppCompatActivity(), override fun onSuccess(path: String?) { listView.onItemClickListener = this Toast.makeText(this, "New path: $path", Toast.LENGTH_LONG).show() + + offlineManager.listOfflineRegions(object : OfflineManager.ListOfflineRegionsCallback { + override fun onList(offlineRegions: Array?) { + Logger.i(TAG, "Number of saved offline regions in the new path: ${offlineRegions?.size.toString()}") + } + + override fun onError(error: String?) { + Logger.e(TAG, error) + } + }) } private fun obtainFilesPaths(context: Context): List { @@ -71,7 +90,7 @@ class ChangeResourcesCachePathActivity : AppCompatActivity(), private fun obtainExternalFilesPathsLegacy(context: Context): List { val postFix = - "${File.separator}Android${File.separator}data${File.separator}${context.packageName}${File.separator}files" + "${File.separator}Android${File.separator}data${File.separator}${context.packageName}${File.separator}files" val paths = ArrayList() val externalStorage = System.getenv("EXTERNAL_STORAGE") val secondaryStorage = System.getenv("SECONDARY_STORAGE") -- cgit v1.2.1