From 066df7b695372200ec4b79e0de8714b846ab6292 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Thu, 22 Feb 2018 20:20:47 +0300
Subject: [PATCH] Pass curLatLng on location update to fragment, in a bundle

---
 .../nrw/commons/nearby/NearbyActivity.java     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 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 759892bcb..faa0d9cb0 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
@@ -260,6 +260,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
     protected void onStart() {
         super.onStart();
         locationManager.addLocationListener(this);
+        locationManager.registerLocationManager();
     }
 
     @Override
@@ -335,6 +336,11 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
                     .subscribe(this::populatePlaces);
         } else if (locationChangeType
                 .equals(LocationServiceManager.LocationChangeType.LOCATION_SLIGHTLY_CHANGED)) {
+            Gson gson = new GsonBuilder()
+                    .registerTypeAdapter(Uri.class, new UriSerializer())
+                    .create();
+            String gsonCurLatLng = gson.toJson(curLatLang);
+            bundle.putString("CurLatLng", gsonCurLatLng);
             updateMapFragment();
         }
 
@@ -362,10 +368,11 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
         setListFragment();
 
         hideProgressBar();
+        lockNearbyView(false);
     }
 
     private void lockNearbyView(boolean lock) {
-        if (lock) {
+        /*if (lock) {
             lockNearbyView = true;
             locationManager.unregisterLocationManager();
             locationManager.removeLocationListener(this);
@@ -373,7 +380,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
             lockNearbyView = false;
             locationManager.registerLocationManager();
             locationManager.addLocationListener(this);
-        }
+        }*/
     }
 
     private void hideProgressBar() {
@@ -387,8 +394,11 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
     }
 
     private void updateMapFragment() {
-        getMapFragment().setArguments(bundle);
-        getMapFragment().updateMapWithLocationChanges();
+        NearbyMapFragment nearbyMapFragment = getMapFragment();
+        if (nearbyMapFragment != null) {
+            nearbyMapFragment.setArguments(bundle);
+            nearbyMapFragment.updateMapWithLocationChanges();
+        }
     }
 
     /**