From e0312ef208797983b8b143f6d104b644493db4b5 Mon Sep 17 00:00:00 2001 From: Ivo van Dongen Date: Fri, 15 Sep 2017 10:52:36 +0300 Subject: [android] fix ZoomButtonController initialisation order - prevents "java.lang.IllegalArgumentException: Receiver not registered: android.widget.ZoomButtonsController" when quitting the map before the receiver is properly registered --- .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6612110649..271bd155be 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 @@ -125,7 +125,6 @@ public class MapView extends FrameLayout { myLocationView = (MyLocationView) view.findViewById(R.id.userLocationView); attrView = (ImageView) view.findViewById(R.id.attributionView); logoView = (ImageView) view.findViewById(R.id.logoView); - mapZoomButtonController = new MapZoomButtonController(new ZoomButtonsController(this)); // add accessibility support setContentDescription(context.getString(R.string.mapbox_mapActionDescription)); @@ -187,6 +186,7 @@ public class MapView extends FrameLayout { annotationManager, cameraChangeDispatcher); mapKeyListener = new MapKeyListener(transform, trackingSettings, uiSettings); + mapZoomButtonController = new MapZoomButtonController(new ZoomButtonsController(this)); MapZoomControllerListener zoomListener = new MapZoomControllerListener(mapGestureDetector, uiSettings, transform); mapZoomButtonController.bind(uiSettings, zoomListener); -- cgit v1.2.1