From b200a2935b46a213d3e7f6607ee80d41b36199ac Mon Sep 17 00:00:00 2001 From: misaochan Date: Wed, 18 Apr 2018 19:45:44 +1000 Subject: [PATCH] Call bundle.clear() before inserting CurLatLng --- .../java/fr/free/nrw/commons/nearby/NearbyActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java index 4f83134d1..b75d179c4 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java @@ -363,10 +363,12 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp || locationChangeType.equals(LocationServiceManager.LocationChangeType.PERMISSION_JUST_GRANTED)) { progressBar.setVisibility(View.VISIBLE); + //TODO: This hack inserts curLatLng before populatePlaces is called (see #1440). Ideally a proper fix should be found Gson gson = new GsonBuilder() .registerTypeAdapter(Uri.class, new UriSerializer()) .create(); String gsonCurLatLng = gson.toJson(curLatLang); + bundle.clear(); bundle.putString("CurLatLng", gsonCurLatLng); placesDisposable = Observable.fromCallable(() -> nearbyController @@ -397,9 +399,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp if (placeList.size() == 0) { ViewUtil.showSnackbar(findViewById(R.id.container), R.string.no_nearby); } - - //TODO: This hack inserts curLatLng before populatePlaces is called (see #1440). Ideally a proper fix should be found - //bundle.clear(); + bundle.putString("PlaceList", gsonPlaceList); //bundle.putString("CurLatLng", gsonCurLatLng); bundle.putString("BoundaryCoord", gsonBoundaryCoordinates);