From a8d302bdf34a6b2faaa53ffe7e4d43ae8c60c904 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Fri, 2 Jun 2017 18:17:23 +1000
Subject: [PATCH] Remove progress bar and add null check for locationManager

---
 .../java/fr/free/nrw/commons/nearby/NearbyActivity.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 ce47409e1..667aa19d2 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
@@ -130,6 +130,9 @@ public class NearbyActivity extends NavigationBaseActivity {
                     if (nearbyAsyncTask != null) {
                         nearbyAsyncTask.cancel(true);
                     }
+                    if (progressBar != null) {
+                        progressBar.setVisibility(View.GONE);
+                    }
                     FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
                     Fragment noPermissionsFragment = new NoPermissionsFragment();
                     fragmentTransaction.replace(R.id.container, noPermissionsFragment);
@@ -219,7 +222,9 @@ public class NearbyActivity extends NavigationBaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        locationManager.unregisterLocationManager();
+        if (locationManager != null) {
+            locationManager.unregisterLocationManager();
+        }
     }
 
     private class NearbyAsyncTask extends AsyncTask<Void, Integer, List<Place>> {