1 files changed, 25 insertions, 21 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java
index 57a1412b55..95bb0d2324 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java
@@ -24,13 +24,32 @@ import java.text.DecimalFormat;
  * </p>
  */
 public class InfoWindowActivity extends AppCompatActivity
-  implements OnMapReadyCallback, MapboxMap.OnInfoWindowCloseListener, MapboxMap.OnMapLongClickListener,
-  MapboxMap.OnInfoWindowClickListener, MapboxMap.OnInfoWindowLongClickListener {
+  implements OnMapReadyCallback, MapboxMap.OnInfoWindowCloseListener, MapboxMap.OnInfoWindowClickListener,
+  MapboxMap.OnInfoWindowLongClickListener {
 
   private MapboxMap mapboxMap;
   private MapView mapView;
   private Marker customMarker;
 
+  private MapboxMap.OnMapLongClickListener mapLongClickListener = new MapboxMap.OnMapLongClickListener() {
+    @Override
+    public boolean onMapLongClick(@NonNull LatLng point) {
+      if (customMarker != null) {
+        // Remove previous added marker
+        mapboxMap.removeAnnotation(customMarker);
+        customMarker = null;
+      }
+
+      // Add marker on long click location with default marker image
+      customMarker = mapboxMap.addMarker(new MarkerOptions()
+        .title("Custom Marker")
+        .snippet(new DecimalFormat("#.#####").format(point.getLatitude()) + ", "
+          + new DecimalFormat("#.#####").format(point.getLongitude()))
+        .position(point));
+      return true;
+    }
+  };
+
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
@@ -77,7 +96,7 @@ public class InfoWindowActivity extends AppCompatActivity
 
   private void addInfoWindowListeners() {
     mapboxMap.setOnInfoWindowCloseListener(this);
-    mapboxMap.setOnMapLongClickListener(this);
+    mapboxMap.addOnMapLongClickListener(mapLongClickListener);
     mapboxMap.setOnInfoWindowClickListener(this);
     mapboxMap.setOnInfoWindowLongClickListener(this);
   }
@@ -109,24 +128,6 @@ public class InfoWindowActivity extends AppCompatActivity
   }
 
   @Override
-  public boolean onMapLongClick(@NonNull LatLng point) {
-    if (customMarker != null) {
-      // Remove previous added marker
-      mapboxMap.removeAnnotation(customMarker);
-      customMarker = null;
-    }
-
-    // Add marker on long click location with default marker image
-    customMarker = mapboxMap.addMarker(new MarkerOptions()
-      .title("Custom Marker")
-      .snippet(new DecimalFormat("#.#####").format(point.getLatitude()) + ", "
-        + new DecimalFormat("#.#####").format(point.getLongitude()))
-      .position(point));
-
-    return false;
-  }
-
-  @Override
   protected void onStart() {
     super.onStart();
     mapView.onStart();
@@ -159,6 +160,9 @@ public class InfoWindowActivity extends AppCompatActivity
   @Override
   protected void onDestroy() {
     super.onDestroy();
+    if (mapboxMap != null) {
+      mapboxMap.removeOnMapLongClickListener(mapLongClickListener);
+    }
     mapView.onDestroy();
   }