1 files changed, 6 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
index 22da952560..21d843117e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
@@ -80,9 +80,9 @@ public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCa
 
   private void setupMapView(Bundle savedInstanceState) {
     mapView = (MapView) findViewById(R.id.mapView);
-    mapView.addOnMapChangedListener(change -> {
-      if (change == MapView.DID_FINISH_LOADING_STYLE && mapboxMap != null) {
-        Timber.v("New style loaded with JSON: %s", mapboxMap.getStyleJson());
+
+    mapView.addOnDidFinishLoadingStyleListener(() -> {
+      if (mapboxMap != null) {
         setupNavigationView(mapboxMap.getLayers());
       }
     });
@@ -99,6 +99,8 @@ public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCa
     mapboxMap.getUiSettings().setZoomControlsEnabled(true);
 
     setupNavigationView(mapboxMap.getLayers());
+
+    setupNavigationView(mapboxMap.getLayers());
     setupZoomView();
     setFpsView();
   }
@@ -111,6 +113,7 @@ public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCa
   }
 
   private void setupNavigationView(List<Layer> layerList) {
+    Timber.v("New style loaded with JSON: %s", mapboxMap.getStyleJson());
     final LayerListAdapter adapter = new LayerListAdapter(this, layerList);
     ListView listView = (ListView) findViewById(R.id.listView);
     listView.setAdapter(adapter);