[android] nullcheck region metadata in example activity, enable debug mode for MergeOfflineRegionsActivity

This commit is contained in:
Łukasz Paczos
2018-09-24 13:21:50 +02:00
committed by Łukasz Paczos
parent 1c6c7d5238
commit 5e747eafa7
2 changed files with 10 additions and 3 deletions

View File

@@ -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),

View File

@@ -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) ->