[android] remove nonexistent layer or source handling

4 files changed, 10 insertions, 48 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
index a07ad924d5..04c57636f2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
@@ -12,11 +12,9 @@ import android.view.View;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.layers.CannotAddLayerException;
 import com.mapbox.mapboxsdk.style.layers.FillLayer;
-import com.mapbox.mapboxsdk.style.layers.NoSuchLayerException;
 import com.mapbox.mapboxsdk.style.layers.Property;
 import com.mapbox.mapboxsdk.style.layers.PropertyFactory;
 import com.mapbox.mapboxsdk.style.sources.CannotAddSourceException;
-import com.mapbox.mapboxsdk.style.sources.NoSuchSourceException;
 import com.mapbox.mapboxsdk.style.sources.Source;
 import com.mapbox.mapboxsdk.style.sources.VectorSource;
 import com.mapbox.mapboxsdk.testapp.R;
@@ -69,11 +67,7 @@ public class RuntimeStyleTests {
 
     MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
     mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
-    try {
-      mapboxMap.removeSource("my-source");
-    } catch (NoSuchSourceException noSuchSourceException) {
-      // it's ok..
-    }
+    mapboxMap.removeSource("my-source");
 
     onView(withId(R.id.mapView)).perform(new AddRemoveSourceAction());
   }
@@ -109,11 +103,7 @@ public class RuntimeStyleTests {
       assertNotNull(mapboxMap.getLayer("building"));
 
       // Remove
-      try {
-        mapboxMap.removeLayer("building");
-      } catch (NoSuchLayerException noSuchSourceException) {
-        fail("Definitively exists: " + noSuchSourceException.getMessage());
-      }
+      mapboxMap.removeLayer("building");
       assertNull(mapboxMap.getLayer("building"));
 
       // Add
@@ -126,11 +116,7 @@ public class RuntimeStyleTests {
       layer.setProperties(PropertyFactory.visibility(Property.VISIBLE));
 
       // Remove, preserving the reference
-      try {
-        mapboxMap.removeLayer(layer);
-      } catch (NoSuchLayerException noSuchSourceException) {
-        fail("Definitively exists: " + noSuchSourceException.getMessage());
-      }
+      mapboxMap.removeLayer(layer);
 
       // Property setters should still work
       layer.setProperties(PropertyFactory.fillColor(Color.RED));
@@ -161,11 +147,7 @@ public class RuntimeStyleTests {
       mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
 
       // Remove
-      try {
-        mapboxMap.removeSource("my-source");
-      } catch (NoSuchSourceException noSuchSourceException) {
-        fail("Definitively exists: " + noSuchSourceException.getMessage());
-      }
+      mapboxMap.removeSource("my-source");
       assertNull(mapboxMap.getLayer("my-source"));
 
       // Add
@@ -173,11 +155,7 @@ public class RuntimeStyleTests {
       mapboxMap.addSource(source);
 
       // Remove, preserving the reference
-      try {
-        mapboxMap.removeSource(source);
-      } catch (NoSuchSourceException noSuchSourceException) {
-        fail("Definitively exists: " + noSuchSourceException.getMessage());
-      }
+      mapboxMap.removeSource(source);
 
       // Re-add the reference...
       mapboxMap.addSource(source);
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java
index d410c349f0..50e6b75194 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java
@@ -14,12 +14,9 @@ import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.style.layers.CustomLayer;
-import com.mapbox.mapboxsdk.style.layers.NoSuchLayerException;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.model.customlayer.ExampleCustomLayer;
 
-import timber.log.Timber;
-
 public class CustomLayerActivity extends AppCompatActivity {
 
   private MapboxMap mapboxMap;
@@ -58,12 +55,8 @@ public class CustomLayerActivity extends AppCompatActivity {
 
   private void swapCustomLayer() {
     if (customLayer != null) {
-      try {
-        mapboxMap.removeLayer(customLayer.getId());
-        customLayer = null;
-      } catch (NoSuchLayerException noSuchLayerException) {
-        Timber.e("No custom layer to remove");
-      }
+      mapboxMap.removeLayer(customLayer);
+      customLayer = null;
       fab.setImageResource(R.drawable.ic_layers);
     } else {
       customLayer = new CustomLayer("custom",
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
index 07b677a788..ca4fe4e4fd 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
@@ -62,12 +62,8 @@ public class QueryRenderedFeaturesBoxHighlightActivity extends AppCompatActivity
               Toast.LENGTH_SHORT).show();
 
             // remove layer / source if already added
-            try {
-              mapboxMap.removeSource("highlighted-shapes-source");
-              mapboxMap.removeLayer("highlighted-shapes-layer");
-            } catch (Exception exception) {
-              // that's ok
-            }
+            mapboxMap.removeSource("highlighted-shapes-source");
+            mapboxMap.removeLayer("highlighted-shapes-layer");
 
             // Add layer / source
             mapboxMap.addSource(
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
index e6650e8300..58321718d6 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
@@ -20,7 +20,6 @@ import com.mapbox.mapboxsdk.style.functions.stops.Stop;
 import com.mapbox.mapboxsdk.style.layers.FillLayer;
 import com.mapbox.mapboxsdk.style.layers.Layer;
 import com.mapbox.mapboxsdk.style.layers.LineLayer;
-import com.mapbox.mapboxsdk.style.layers.NoSuchLayerException;
 import com.mapbox.mapboxsdk.style.layers.Property;
 import com.mapbox.mapboxsdk.style.layers.PropertyValue;
 import com.mapbox.mapboxsdk.style.layers.RasterLayer;
@@ -247,11 +246,7 @@ public class RuntimeStyleActivity extends AppCompatActivity {
 
   private void removeBuildings() {
     // Zoom to see buildings first
-    try {
-      mapboxMap.removeLayer("building");
-    } catch (NoSuchLayerException noSuchLayerException) {
-      Toast.makeText(RuntimeStyleActivity.this, noSuchLayerException.getMessage(), Toast.LENGTH_SHORT).show();
-    }
+    mapboxMap.removeLayer("building");
   }
 
   private void addParksLayer() {