From 13e707da5e4a5bc8611f6d54394ad6390bd00c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lukas.paczos@gmail.com>
Date: Mon, 24 Sep 2018 13:21:50 +0200
Subject: [android] nullcheck region metadata in example activity, enable debug
 mode for MergeOfflineRegionsActivity

---
 .../testapp/activity/offline/MergeOfflineRegionsActivity.kt       | 8 ++++++--
 .../testapp/activity/offline/UpdateMetadataActivity.java          | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt
index fea571f1e0..a3c29185f4 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt
@@ -17,6 +17,7 @@ class MergeOfflineRegionsActivity : AppCompatActivity() {
   companion object {
     private const val LOG_TAG = "Mbgl-MergeOfflineRegionsActivity"
     private const val TEST_DB_FILE_NAME = "offline.db"
+    private const val TEST_STYLE = Style.SATELLITE
   }
 
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -26,12 +27,15 @@ class MergeOfflineRegionsActivity : AppCompatActivity() {
     // forcing offline state
     Mapbox.setConnected(false)
 
-    mapView.setStyleUrl(Style.SATELLITE)
+    mapView.setStyleUrl(TEST_STYLE)
 
     mapView.onCreate(savedInstanceState)
     load_region_btn.setOnClickListener {
       copyAsset()
     }
+    mapView.getMapAsync {
+      it.isDebugActive = true
+    }
   }
 
   private fun copyAsset() {
@@ -55,7 +59,7 @@ class MergeOfflineRegionsActivity : AppCompatActivity() {
       FileSource.getResourcesCachePath(this) + "/" + TEST_DB_FILE_NAME,
       object : OfflineManager.MergeOfflineRegionsCallback {
         override fun onMerge(offlineRegions: Array<OfflineRegion>) {
-          mapView.setStyleUrl(Style.SATELLITE)
+          mapView.setStyleUrl(TEST_STYLE)
           Toast.makeText(
             this@MergeOfflineRegionsActivity,
             String.format("Merged %d regions.", offlineRegions.size),
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/UpdateMetadataActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/UpdateMetadataActivity.java
index e1a524790d..58482032be 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/UpdateMetadataActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/UpdateMetadataActivity.java
@@ -14,6 +14,7 @@ import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.offline.OfflineManager;
 import com.mapbox.mapboxsdk.offline.OfflineRegion;
@@ -57,7 +58,9 @@ public class UpdateMetadataActivity extends AppCompatActivity implements Adapter
     final EditText input = new EditText(this);
     input.setText(metadata);
     input.setInputType(InputType.TYPE_CLASS_TEXT);
-    input.setSelection(metadata.length());
+    if (metadata != null) {
+      input.setSelection(metadata.length());
+    }
     builder.setView(input);
 
     builder.setPositiveButton("OK", (dialog, which) ->
-- 
cgit v1.2.1