From c7b7522edd1c453b9254331694f805320cdda99c Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Thu, 6 Dec 2018 14:17:27 +0300
Subject: [PATCH] Add a boolean to enable refresh after orientation changed

---
 .../java/fr/free/nrw/commons/nearby/NearbyFragment.java  | 3 +--
 .../fr/free/nrw/commons/nearby/NearbyMapFragment.java    | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFragment.java
index 58943b0b5..f3e201140 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFragment.java
@@ -428,8 +428,7 @@ public class NearbyFragment extends CommonsDaggerSupportFragment
     }
 
     private void updateMapFragment(boolean updateViaButton, boolean isSlightUpdate, @Nullable LatLng customLatLng, @Nullable NearbyController.NearbyPlacesInfo nearbyPlacesInfo) {
-
-        if (nearbyMapFragment.searchThisAreaModeOn) {
+        if (nearbyMapFragment.checkingAround) {
             return;
         }
         /*
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
index 6e92c9da2..98dfcf870 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
@@ -130,6 +130,7 @@ public class NearbyMapFragment extends DaggerFragment {
 
     private boolean isMapReady;
     public boolean searchThisAreaModeOn = false;
+    public boolean checkingAround = false;
 
     private Bundle bundleForUpdtes;// Carry information from activity about changed nearby places and current location
     private boolean searchedAroundCurrentLocation = true;
@@ -556,6 +557,7 @@ public class NearbyMapFragment extends DaggerFragment {
                                     , NearbyController.currentLocation.getLongitude()));
 
                     if (distance > NearbyController.searchedRadius*1000*3/4) { //Convert to meter, and compare if our distance is bigger than 3/4 or our searched area
+                        checkingAround = true;
                         if (!searchThisAreaModeOn) { // If we are changing mode, then change click action
                             searchThisAreaModeOn = true;
                             searchThisAreaButton.setOnClickListener(new View.OnClickListener() {
@@ -575,6 +577,7 @@ public class NearbyMapFragment extends DaggerFragment {
                         }
 
                     } else {
+                        checkingAround = false;
                         if (searchThisAreaModeOn) {
                             searchThisAreaModeOn = false; // This flag will help us to understand should we folor users location or not
                             searchThisAreaButton.setOnClickListener(new View.OnClickListener() {
@@ -1002,6 +1005,12 @@ public class NearbyMapFragment extends DaggerFragment {
         if (mapView != null) {
             mapView.onResume();
         }
+        if (mapboxMap != null) {
+            mapboxMap.getUiSettings().setAllGesturesEnabled(true);
+        }
+        searchThisAreaModeOn = false;
+        checkingAround = false;
+        searchedAroundCurrentLocation = true;
         initViews();
         setListeners();
         transparentView.setClickable(false);