From a6e8b1d68a4fa1fee04ff2d5a39c324fc4a77d37 Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 14 Apr 2018 21:51:02 +1000 Subject: [PATCH] Not a good hack - put curLatLang into the bundle separately --- .../fr/free/nrw/commons/nearby/NearbyActivity.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 d8adbc508..bd604a94b 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 @@ -365,6 +365,13 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp if (locationChangeType.equals(LocationServiceManager.LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED) || locationChangeType.equals(LocationServiceManager.LocationChangeType.PERMISSION_JUST_GRANTED)) { progressBar.setVisibility(View.VISIBLE); + + Gson gson = new GsonBuilder() + .registerTypeAdapter(Uri.class, new UriSerializer()) + .create(); + String gsonCurLatLng = gson.toJson(curLatLang); + bundle.putString("CurLatLng", gsonCurLatLng); + placesDisposable = Observable.fromCallable(() -> nearbyController .loadAttractionsFromLocation(curLatLang)) .subscribeOn(Schedulers.io()) @@ -396,9 +403,9 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp ViewUtil.showSnackbar(findViewById(R.id.container), R.string.no_nearby); } - bundle.clear(); + //bundle.clear(); bundle.putString("PlaceList", gsonPlaceList); - bundle.putString("CurLatLng", gsonCurLatLng); + //bundle.putString("CurLatLng", gsonCurLatLng); bundle.putString("BoundaryCoord", gsonBoundaryCoordinates); // First time to init fragments