From 80e1bc65057d59c5a1a07167080f38c0c11df1c3 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Fri, 11 Jun 2021 10:50:54 +0200
Subject: [PATCH] add ACCESS_COARSE_LOCATION for LocationPickerController

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/src/main/AndroidManifest.xml              |  1 +
 .../controllers/LocationPickerController.kt   | 40 ++++++++++---------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c5b1af412..acca95c7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -71,6 +71,7 @@
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
     <application
         android:name=".application.NextcloudTalkApplication"
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt b/app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt
index fd68dd88e..f3f53faad 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt
@@ -212,8 +212,8 @@ class LocationPickerController(args: Bundle) :
     }
 
     private fun initMap() {
-        if (!isFineLocationPermissionGranted()) {
-            requestFineLocationPermission()
+        if (!isLocationPermissionsGranted()) {
+            requestLocationPermissions()
         }
 
         binding.map.setTileSource(TileSourceFactory.MAPNIK)
@@ -370,29 +370,31 @@ class LocationPickerController(args: Bundle) :
             })
     }
 
-    private fun isFineLocationPermissionGranted(): Boolean {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            return if (PermissionChecker.checkSelfPermission(
-                    context!!,
-                    Manifest.permission.ACCESS_FINE_LOCATION
-                ) == PermissionChecker.PERMISSION_GRANTED
-            ) {
-                Log.d(TAG, "Permission is granted")
-                true
-            } else {
-                Log.d(TAG, "Permission is revoked")
-                false
-            }
+    private fun isLocationPermissionsGranted(): Boolean {
+        fun isCoarseLocationGranted(): Boolean {
+            return PermissionChecker.checkSelfPermission(
+                context!!,
+                Manifest.permission.ACCESS_COARSE_LOCATION) == PermissionChecker.PERMISSION_GRANTED
+        }
+
+        fun isFineLocationGranted() : Boolean {
+            return PermissionChecker.checkSelfPermission(
+                context!!,
+                Manifest.permission.ACCESS_FINE_LOCATION) == PermissionChecker.PERMISSION_GRANTED
+        }
+
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+             isCoarseLocationGranted() && isFineLocationGranted()
         } else {
-            Log.d(TAG, "Permission is granted")
-            return true
+            true
         }
     }
 
-    private fun requestFineLocationPermission() {
+    private fun requestLocationPermissions() {
         requestPermissions(
             arrayOf(
-                Manifest.permission.ACCESS_FINE_LOCATION
+                Manifest.permission.ACCESS_FINE_LOCATION,
+                Manifest.permission.ACCESS_COARSE_LOCATION
             ),
             REQUEST_PERMISSIONS_REQUEST_CODE
         )