diff options
| author | Peng Liu <peng.liu@mapbox.com> | 2019-09-11 23:57:44 +0300 |
|---|---|---|
| committer | Peng Liu <peng.liu@mapbox.com> | 2019-09-11 23:57:44 +0300 |
| commit | c828d5da97318c6f05e172d4b42021267cfe0120 (patch) | |
| tree | c368c7ff9e9bc65a7a717c5334c4d1ce644dae57 | |
| parent | 5e57022ea5133b59ad611b3a254041a20d538ca1 (diff) | |
| download | qtlocation-mapboxgl-c828d5da97318c6f05e172d4b42021267cfe0120.tar.gz | |
[android] Fixes according to @tobrun's review.
3 files changed, 1 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index a35a384bf7..4521d2ae60 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -425,7 +425,6 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { if (mapboxMap != null) { mapboxMap.onDestroy(); - mapboxMap = null; } if (nativeMapView != null) { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt index 987892158c..59f0d04237 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/storage/FileSourceStandaloneTest.kt @@ -112,6 +112,5 @@ class FileSourceStandaloneTest : AppCenter() { @After fun cleanup() { fileSourceTestUtils.cleanup() - Assert.assertFalse("FileSource should not be active", fileSource.isActivated) } }
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt index c031bbee0d..7e18cbfa2f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt @@ -116,7 +116,7 @@ class LocationFragmentActivity : AppCompatActivity() { } override fun onSuccess(result: LocationEngineResult?) { - mapView.getMapAsync { it.animateCamera(CameraUpdateFactory.newLatLngZoom(LatLng(result?.lastLocation), 12.0)) } + if (!mapView.isDestroyed) mapboxMap.animateCamera(CameraUpdateFactory.newLatLngZoom(LatLng(result?.lastLocation), 12.0)) } override fun onFailure(exception: Exception) { |