1 files changed, 58 insertions, 25 deletions

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 5a410c247e..0d6e23fe21 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
@@ -553,7 +553,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the camera region will change
    */
-  public void addOnCameraWillChangeListener(OnCameraWillChangeListener listener) {
+  public void addOnCameraWillChangeListener(@NonNull OnCameraWillChangeListener listener) {
     mapChangeReceiver.addOnCameraWillChangeListener(listener);
   }
 
@@ -562,7 +562,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the camera region will change
    */
-  public void removeOnCameraWillChangeListener(OnCameraWillChangeListener listener) {
+  public void removeOnCameraWillChangeListener(@NonNull OnCameraWillChangeListener listener) {
     mapChangeReceiver.removeOnCameraWillChangeListener(listener);
   }
 
@@ -571,7 +571,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the camera is changing
    */
-  public void addOnCameraIsChangingListener(OnCameraIsChangingListener listener) {
+  public void addOnCameraIsChangingListener(@NonNull OnCameraIsChangingListener listener) {
     mapChangeReceiver.addOnCameraIsChangingListener(listener);
   }
 
@@ -580,7 +580,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the camera is changing
    */
-  public void removeOnCameraIsChangingListener(OnCameraIsChangingListener listener) {
+  public void removeOnCameraIsChangingListener(@NonNull OnCameraIsChangingListener listener) {
     mapChangeReceiver.removeOnCameraIsChangingListener(listener);
   }
 
@@ -589,7 +589,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the camera region did change
    */
-  public void addOnCameraDidChangeListener(OnCameraDidChangeListener listener) {
+  public void addOnCameraDidChangeListener(@NonNull OnCameraDidChangeListener listener) {
     mapChangeReceiver.addOnCameraDidChangeListener(listener);
   }
 
@@ -598,7 +598,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the camera region did change
    */
-  public void removeOnCameraDidChangeListener(OnCameraDidChangeListener listener) {
+  public void removeOnCameraDidChangeListener(@NonNull OnCameraDidChangeListener listener) {
     mapChangeReceiver.removeOnCameraDidChangeListener(listener);
   }
 
@@ -607,7 +607,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map will start loading
    */
-  public void addOnWillStartLoadingMapListener(OnWillStartLoadingMapListener listener) {
+  public void addOnWillStartLoadingMapListener(@NonNull OnWillStartLoadingMapListener listener) {
     mapChangeReceiver.addOnWillStartLoadingMapListener(listener);
   }
 
@@ -616,7 +616,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map will start loading
    */
-  public void removeOnWillStartLoadingMapListener(OnWillStartLoadingMapListener listener) {
+  public void removeOnWillStartLoadingMapListener(@NonNull OnWillStartLoadingMapListener listener) {
     mapChangeReceiver.removeOnWillStartLoadingMapListener(listener);
   }
 
@@ -625,7 +625,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map has finished loading
    */
-  public void addOnDidFinishLoadingMapListener(OnDidFinishLoadingMapListener listener) {
+  public void addOnDidFinishLoadingMapListener(@NonNull OnDidFinishLoadingMapListener listener) {
     mapChangeReceiver.addOnDidFinishLoadingMapListener(listener);
   }
 
@@ -634,7 +634,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map has finished loading
    */
-  public void removeOnDidFinishLoadingMapListener(OnDidFinishLoadingMapListener listener) {
+  public void removeOnDidFinishLoadingMapListener(@NonNull OnDidFinishLoadingMapListener listener) {
     mapChangeReceiver.removeOnDidFinishLoadingMapListener(listener);
   }
 
@@ -643,7 +643,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map failed to load
    */
-  public void addOnDidFailLoadingMapListener(OnDidFailLoadingMapListener listener) {
+  public void addOnDidFailLoadingMapListener(@NonNull OnDidFailLoadingMapListener listener) {
     mapChangeReceiver.addOnDidFailLoadingMapListener(listener);
   }
 
@@ -652,7 +652,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map failed to load
    */
-  public void removeOnDidFailLoadingMapListener(OnDidFailLoadingMapListener listener) {
+  public void removeOnDidFailLoadingMapListener(@NonNull OnDidFailLoadingMapListener listener) {
     mapChangeReceiver.removeOnDidFailLoadingMapListener(listener);
   }
 
@@ -661,7 +661,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the camera will start rendering a frame
    */
-  public void addOnWillStartRenderingFrameListener(OnWillStartRenderingFrameListener listener) {
+  public void addOnWillStartRenderingFrameListener(@NonNull OnWillStartRenderingFrameListener listener) {
     mapChangeReceiver.addOnWillStartRenderingFrameListener(listener);
   }
 
@@ -670,7 +670,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the camera will start rendering a frame
    */
-  public void removeOnWillStartRenderingFrameListener(OnWillStartRenderingFrameListener listener) {
+  public void removeOnWillStartRenderingFrameListener(@NonNull OnWillStartRenderingFrameListener listener) {
     mapChangeReceiver.removeOnWillStartRenderingFrameListener(listener);
   }
 
@@ -679,7 +679,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map has finished rendering a frame
    */
-  public void addOnDidFinishRenderingFrameListener(OnDidFinishRenderingFrameListener listener) {
+  public void addOnDidFinishRenderingFrameListener(@NonNull OnDidFinishRenderingFrameListener listener) {
     mapChangeReceiver.addOnDidFinishRenderingFrameListener(listener);
   }
 
@@ -688,7 +688,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map has finished rendering a frame
    */
-  public void removeOnDidFinishRenderingFrameListener(OnDidFinishRenderingFrameListener listener) {
+  public void removeOnDidFinishRenderingFrameListener(@NonNull OnDidFinishRenderingFrameListener listener) {
     mapChangeReceiver.removeOnDidFinishRenderingFrameListener(listener);
   }
 
@@ -697,7 +697,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map will start rendering
    */
-  public void addOnWillStartRenderingMapListener(OnWillStartRenderingMapListener listener) {
+  public void addOnWillStartRenderingMapListener(@NonNull OnWillStartRenderingMapListener listener) {
     mapChangeReceiver.addOnWillStartRenderingMapListener(listener);
   }
 
@@ -706,7 +706,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map will start rendering
    */
-  public void removeOnWillStartRenderingMapListener(OnWillStartRenderingMapListener listener) {
+  public void removeOnWillStartRenderingMapListener(@NonNull OnWillStartRenderingMapListener listener) {
     mapChangeReceiver.removeOnWillStartRenderingMapListener(listener);
   }
 
@@ -715,7 +715,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map has finished rendering
    */
-  public void addOnDidFinishRenderingMapListener(OnDidFinishRenderingMapListener listener) {
+  public void addOnDidFinishRenderingMapListener(@NonNull OnDidFinishRenderingMapListener listener) {
     mapChangeReceiver.addOnDidFinishRenderingMapListener(listener);
   }
 
@@ -733,7 +733,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map has entered the idle state.
    */
-  public void addOnDidBecomeIdleListener(OnDidBecomeIdleListener listener) {
+  public void addOnDidBecomeIdleListener(@NonNull OnDidBecomeIdleListener listener) {
     mapChangeReceiver.addOnDidBecomeIdleListener(listener);
   }
 
@@ -742,7 +742,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the map has entered the idle state.
    */
-  public void removeOnDidBecomeIdleListener(OnDidBecomeIdleListener listener) {
+  public void removeOnDidBecomeIdleListener(@NonNull OnDidBecomeIdleListener listener) {
     mapChangeReceiver.removeOnDidBecomeIdleListener(listener);
   }
 
@@ -753,7 +753,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the style has finished loading
    */
-  public void addOnDidFinishLoadingStyleListener(OnDidFinishLoadingStyleListener listener) {
+  public void addOnDidFinishLoadingStyleListener(@NonNull OnDidFinishLoadingStyleListener listener) {
     mapChangeReceiver.addOnDidFinishLoadingStyleListener(listener);
   }
 
@@ -762,7 +762,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the style has finished loading
    */
-  public void removeOnDidFinishLoadingStyleListener(OnDidFinishLoadingStyleListener listener) {
+  public void removeOnDidFinishLoadingStyleListener(@NonNull OnDidFinishLoadingStyleListener listener) {
     mapChangeReceiver.removeOnDidFinishLoadingStyleListener(listener);
   }
 
@@ -771,7 +771,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the source has changed
    */
-  public void addOnSourceChangedListener(OnSourceChangedListener listener) {
+  public void addOnSourceChangedListener(@NonNull OnSourceChangedListener listener) {
     mapChangeReceiver.addOnSourceChangedListener(listener);
   }
 
@@ -780,11 +780,29 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    *
    * @param listener The callback that's invoked when the source has changed
    */
-  public void removeOnSourceChangedListener(OnSourceChangedListener listener) {
+  public void removeOnSourceChangedListener(@NonNull OnSourceChangedListener listener) {
     mapChangeReceiver.removeOnSourceChangedListener(listener);
   }
 
   /**
+   * Set a callback that's invoked when the id of an icon is missing.
+   *
+   * @param listener The callback that's invoked when the id of an icon is missing
+   */
+  public void addOnStyleImageMissingListener(@NonNull OnStyleImageMissingListener listener) {
+    mapChangeReceiver.addOnStyleImageMissingListener(listener);
+  }
+
+  /**
+   * Set a callback that's invoked when a map source has changed.
+   *
+   * @param listener The callback that's invoked when the source has changed
+   */
+  public void removeOnStyleImageMissingListener(@NonNull OnStyleImageMissingListener listener) {
+    mapChangeReceiver.removeOnStyleImageMissingListener(listener);
+  }
+
+  /**
    * Interface definition for a callback to be invoked when the camera will change.
    * <p>
    * {@link MapView#addOnCameraWillChangeListener(OnCameraWillChangeListener)}
@@ -963,6 +981,21 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
   }
 
   /**
+   * Interface definition for a callback to be invoked with the id of a missing icon.
+   * <p>
+   * {@link MapView#addOnStyleImageMissingListener(OnStyleImageMissingListener)}
+   * </p>
+   */
+  public interface OnStyleImageMissingListener {
+    /**
+     * Called when the map is missing an icon.
+     *
+     * @param id the id of the icon that is missing
+     */
+    void onStyleImageMissing(@NonNull String id);
+  }
+
+  /**
    * Sets a callback object which will be triggered when the {@link MapboxMap} instance is ready to be used.
    *
    * @param callback The callback object that will be triggered when the map is ready to be used.