deprecate MapboxMap#cycleDebugActive

mapbox · Dec 16, 2019 · 95c6cc9 · 95c6cc9
1 parent 7b90328
commit 95c6cc9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 Mapbox welcomes participation and contributions from everyone.  If you'd like to do so please see the [`Contributing Guide`](https://github.com/mapbox/mapbox-gl-native/blob/master/CONTRIBUTING.md) first to get started.
 
+## master
+- Deprecate `MapboxMap#cycleDebugOptions` and prevent UnsatisfiedLinkError. [#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):
 ### Features

diff --git 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
@@ -209,8 +209,6 @@ List<Feature> 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
@@ -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/...tApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java b/...tApp/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();
       }
     });
   }