1 files changed, 24 insertions, 17 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
index 7ef2d5b6d4..afeb3b8979 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
@@ -16,7 +16,6 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.mapbox.mapboxsdk.annotations.Icon;
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.annotations.MarkerViewOptions;
@@ -26,18 +25,16 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.utils.GeoParseUtil;
 import com.mapbox.mapboxsdk.testapp.utils.IconUtils;
-
-import org.json.JSONException;
+import timber.log.Timber;
 
 import java.io.IOException;
+import java.lang.ref.WeakReference;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Random;
 
-import timber.log.Timber;
-
 /**
  * Test activity showcasing adding a large amount of Markers or MarkerViews.
  */
@@ -47,6 +44,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
   private MapView mapView;
   private boolean customMarkerView;
   private List<LatLng> locations;
+  private ProgressDialog progressDialog;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -80,6 +78,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
   public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
     int amount = Integer.valueOf(getResources().getStringArray(R.array.bulk_marker_list)[position]);
     if (locations == null) {
+      progressDialog = ProgressDialog.show(this, "Loading", "Fetching markers", false);
       new LoadLocationTask(this, amount).execute();
     } else {
       showMarkers(amount);
@@ -87,6 +86,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
   }
 
   private void onLatLngListLoaded(List<LatLng> latLngs, int amount) {
+    progressDialog.hide();
     locations = latLngs;
     showMarkers(amount);
   }
@@ -247,32 +247,39 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
 
   private static class LoadLocationTask extends AsyncTask<Void, Integer, List<LatLng>> {
 
-    private BulkMarkerActivity activity;
-    private ProgressDialog progressDialog;
+    private WeakReference<BulkMarkerActivity> activity;
     private int amount;
 
     private LoadLocationTask(BulkMarkerActivity activity, int amount) {
       this.amount = amount;
-      this.activity = activity;
-      progressDialog = ProgressDialog.show(activity, "Loading", "Fetching markers", false);
+      this.activity = new WeakReference<>(activity);
     }
 
     @Override
     protected List<LatLng> doInBackground(Void... params) {
-      try {
-        String json = GeoParseUtil.loadStringFromAssets(activity.getApplicationContext(), "points.geojson");
-        return GeoParseUtil.parseGeoJsonCoordinates(json);
-      } catch (IOException | JSONException exception) {
-        Timber.e(exception, "Could not add markers");
-        return null;
+      BulkMarkerActivity activity = this.activity.get();
+      if (activity != null) {
+        String json = null;
+        try {
+          json = GeoParseUtil.loadStringFromAssets(activity.getApplicationContext(), "points.geojson");
+        } catch (IOException exception) {
+          Timber.e(exception, "Could not add markers");
+        }
+
+        if (json != null) {
+          return GeoParseUtil.parseGeoJsonCoordinates(json);
+        }
       }
+      return null;
     }
 
     @Override
     protected void onPostExecute(List<LatLng> locations) {
       super.onPostExecute(locations);
-      activity.onLatLngListLoaded(locations, amount);
-      progressDialog.hide();
+      BulkMarkerActivity activity = this.activity.get();
+      if (activity != null) {
+        activity.onLatLngListLoaded(locations, amount);
+      }
     }
   }
 }