From 78be9c9cf2a98c36e31ada888854c952326806d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Mon, 16 Dec 2019 19:18:43 +0100 Subject: [PATCH] deprecate MapboxMap#cycleDebugActive --- CHANGELOG.md | 1 + .../java/com/mapbox/mapboxsdk/maps/MapboxMap.java | 6 ++++-- .../java/com/mapbox/mapboxsdk/maps/NativeMap.java | 2 -- .../java/com/mapbox/mapboxsdk/maps/NativeMapView.java | 11 ----------- .../testapp/activity/maplayout/DebugModeActivity.java | 2 +- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 826785071..1e5de0b01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Mapbox welcomes participation and contributions from everyone. If you'd like to ## master ### Bug fixes - Fixed a crash caused by an unintentional minification of the `LocalGlyphRasterizer`. [#102](https://github.com/mapbox/mapbox-gl-native-android/pull/102) +- Deprecated `MapboxMap#cycleDebugOptions` and fixed an `UnsatisfiedLinkError` when accessed. [#104](https://github.com/mapbox/mapbox-gl-native-android/pull/104) ## 8.6.0-beta.1 - December 6, 2019 [Changes](https://github.com/mapbox/mapbox-gl-native/compare/android-v8.6.0-alpha.2...android-v8.6.0-beta.1) since [Mapbox Maps SDK for Android v8.6.0-alpha.2](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.6.0-alpha.2): diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index 8f4cb9438..c6b923865 100644 --- a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -775,10 +775,12 @@ public void setDebugActive(boolean debugActive) { * any map debug options enabled or disabled. * * @see #isDebugActive() + * @deprecated use {@link #setDebugActive(boolean)} */ + @Deprecated public void cycleDebugOptions() { - nativeMapView.cycleDebugOptions(); - this.debugActive = nativeMapView.getDebug(); + this.debugActive = !nativeMapView.getDebug(); + nativeMapView.setDebug(debugActive); } // diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java index 2c6a49305..4f7db45ff 100644 --- a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java +++ b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java @@ -209,8 +209,6 @@ List queryRenderedFeatures(@NonNull RectF coordinates, boolean getDebug(); - void cycleDebugOptions(); - void setReachability(boolean status); void setApiBaseUrl(String baseUrl); diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java index 2c69cb322..5917a8b42 100755 --- a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java +++ b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java @@ -583,14 +583,6 @@ public void setDebug(boolean debug) { nativeSetDebug(debug); } - @Override - public void cycleDebugOptions() { - if (checkState("cycleDebugOptions")) { - return; - } - nativeCycleDebugOptions(); - } - @Override public boolean getDebug() { if (checkState("getDebug")) { @@ -1263,9 +1255,6 @@ private native void nativeSetVisibleCoordinateBounds(LatLng[] coordinates, RectF @Keep private native void nativeSetDebug(boolean debug); - @Keep - private native void nativeCycleDebugOptions(); - @Keep private native boolean nativeGetDebug(); diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java b/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java index 097ef316f..85b31b85f 100644 --- a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java +++ b/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java @@ -164,8 +164,8 @@ private void setupDebugChangeView() { FloatingActionButton fabDebug = findViewById(R.id.fabDebug); fabDebug.setOnClickListener(view -> { if (mapboxMap != null) { + mapboxMap.setDebugActive(!mapboxMap.isDebugActive()); Timber.d("Debug FAB: isDebug Active? %s", mapboxMap.isDebugActive()); - mapboxMap.cycleDebugOptions(); } }); }