1 files changed, 0 insertions, 64 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
index d589b2e0e3..d82eec45ea 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
@@ -47,12 +47,6 @@ final class MapGestureDetector {
   private final AnnotationManager annotationManager;
   private final CameraChangeDispatcher cameraChangeDispatcher;
 
-  // deprecated map touch API
-  private MapboxMap.OnMapClickListener onMapClickListener;
-  private MapboxMap.OnMapLongClickListener onMapLongClickListener;
-  private MapboxMap.OnFlingListener onFlingListener;
-  private MapboxMap.OnScrollListener onScrollListener;
-
   // new map touch API
   private final CopyOnWriteArrayList<MapboxMap.OnMapClickListener> onMapClickListenerList
     = new CopyOnWriteArrayList<>();
@@ -63,9 +57,6 @@ final class MapGestureDetector {
   private final CopyOnWriteArrayList<MapboxMap.OnFlingListener> onFlingListenerList
     = new CopyOnWriteArrayList<>();
 
-  private final CopyOnWriteArrayList<MapboxMap.OnScrollListener> onScrollListenerList
-    = new CopyOnWriteArrayList<>();
-
   private final CopyOnWriteArrayList<MapboxMap.OnMoveListener> onMoveListenerList
     = new CopyOnWriteArrayList<>();
 
@@ -457,7 +448,6 @@ final class MapGestureDetector {
         // Scroll the map
         transform.moveBy(-distanceX, -distanceY, 0 /*no duration*/);
 
-        notifyOnScrollListeners();
         notifyOnMoveListeners(detector);
       }
       return true;
@@ -920,12 +910,6 @@ final class MapGestureDetector {
   }
 
   void notifyOnMapClickListeners(PointF tapPoint) {
-    // deprecated API
-    if (onMapClickListener != null) {
-      onMapClickListener.onMapClick(projection.fromScreenLocation(tapPoint));
-    }
-
-    // new API
     for (MapboxMap.OnMapClickListener listener : onMapClickListenerList) {
       if (listener.onMapClick(projection.fromScreenLocation(tapPoint))) {
         return;
@@ -934,12 +918,6 @@ final class MapGestureDetector {
   }
 
   void notifyOnMapLongClickListeners(PointF longClickPoint) {
-    // deprecated API
-    if (onMapLongClickListener != null) {
-      onMapLongClickListener.onMapLongClick(projection.fromScreenLocation(longClickPoint));
-    }
-
-    // new API
     for (MapboxMap.OnMapLongClickListener listener : onMapLongClickListenerList) {
       if (listener.onMapLongClick(projection.fromScreenLocation(longClickPoint))) {
         return;
@@ -948,29 +926,11 @@ final class MapGestureDetector {
   }
 
   void notifyOnFlingListeners() {
-    // deprecated API
-    if (onFlingListener != null) {
-      onFlingListener.onFling();
-    }
-
-    // new API
     for (MapboxMap.OnFlingListener listener : onFlingListenerList) {
       listener.onFling();
     }
   }
 
-  void notifyOnScrollListeners() {
-    //deprecated API
-    if (onScrollListener != null) {
-      onScrollListener.onScroll();
-    }
-
-    // new API
-    for (MapboxMap.OnScrollListener listener : onScrollListenerList) {
-      listener.onScroll();
-    }
-  }
-
   void notifyOnMoveBeginListeners(MoveGestureDetector detector) {
     for (MapboxMap.OnMoveListener listener : onMoveListenerList) {
       listener.onMoveBegin(detector);
@@ -1043,22 +1003,6 @@ final class MapGestureDetector {
     }
   }
 
-  void setOnMapClickListener(MapboxMap.OnMapClickListener onMapClickListener) {
-    this.onMapClickListener = onMapClickListener;
-  }
-
-  void setOnMapLongClickListener(MapboxMap.OnMapLongClickListener onMapLongClickListener) {
-    this.onMapLongClickListener = onMapLongClickListener;
-  }
-
-  void setOnFlingListener(MapboxMap.OnFlingListener onFlingListener) {
-    this.onFlingListener = onFlingListener;
-  }
-
-  void setOnScrollListener(MapboxMap.OnScrollListener onScrollListener) {
-    this.onScrollListener = onScrollListener;
-  }
-
   void addOnMapClickListener(MapboxMap.OnMapClickListener onMapClickListener) {
     onMapClickListenerList.add(onMapClickListener);
   }
@@ -1083,14 +1027,6 @@ final class MapGestureDetector {
     onFlingListenerList.remove(onFlingListener);
   }
 
-  void addOnScrollListener(MapboxMap.OnScrollListener onScrollListener) {
-    onScrollListenerList.add(onScrollListener);
-  }
-
-  void removeOnScrollListener(MapboxMap.OnScrollListener onScrollListener) {
-    onScrollListenerList.remove(onScrollListener);
-  }
-
   void addOnMoveListener(MapboxMap.OnMoveListener listener) {
     onMoveListenerList.add(listener);
   }