From 463f75e8b32f8d8dca0951af5ef29ad5ec31477e Mon Sep 17 00:00:00 2001
From: maskara <maskara@zeta.tech>
Date: Sat, 25 Nov 2017 18:32:55 +0530
Subject: [PATCH] Show location permission denied dialog in all relevant
 scenarios

---
 .../fr/free/nrw/commons/nearby/NearbyActivity.java     | 10 ++++++++--
 1 file changed, 8 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 186746196..f018d1190 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
@@ -163,7 +163,10 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
                                 Timber.d("Loaded settings page");
                                 startActivityForResult(callGPSSettingIntent, 1);
                             })
-                    .setNegativeButton(R.string.menu_cancel_upload, (dialog, id) -> dialog.cancel())
+                    .setNegativeButton(R.string.menu_cancel_upload, (dialog, id) -> {
+                        showLocationPermissionDeniedErrorDialog();
+                        dialog.cancel();
+                    })
                     .create()
                     .show();
         } else {
@@ -188,7 +191,10 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
                                 requestLocationPermissions();
                                 dialog.dismiss();
                             })
-                            .setNegativeButton("Cancel", null)
+                            .setNegativeButton("Cancel", (dialog, id) -> {
+                                showLocationPermissionDeniedErrorDialog();
+                                dialog.cancel();
+                            })
                             .create()
                             .show();