From aba375e64eee66ce0454ce791506718c4f6d62a0 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 4 Aug 2018 22:33:17 +0200
Subject: add some more permission checks for locations

---
 src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java')

diff --git a/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java b/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java
index 2ac05fffc..568370dff 100644
--- a/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java
@@ -105,11 +105,15 @@ public class ShareLocationActivity extends LocationActivity implements LocationL
             this.snackBar = Snackbar.make(snackBarCoordinator, R.string.location_sharing_disabled, Snackbar.LENGTH_INDEFINITE);
             snackBar.setAction(R.string.enable, view -> {
                 if (isLocationEnabled()) {
-                    requestLocationUpdates();
+                    if (hasLocationPermission(LocationActivity.REQUEST_LOCATION_PERMISSION)) {
+                        requestLocationUpdates();
+                    }
                 } else {
                     showLocation(null, null);
                     setShareButtonEnabled(false);
-                    requestLocationUpdates();
+                    if (hasLocationPermission(LocationActivity.REQUEST_LOCATION_PERMISSION)) {
+                        requestLocationUpdates();
+                    }
                     startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
                     overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
                 }
-- 
cgit v1.2.3