From 1d1b827adba1e2422e2a9d69f00b8691b39dcab4 Mon Sep 17 00:00:00 2001
From: Danny Wood <danwood76@gmail.com>
Date: Thu, 9 Jan 2020 16:10:45 +0000
Subject: [PATCH] scanner: we need to request ACCESS_FINE_LOCATION in Android
 10 to scan for BT devices

---
 app/src/main/AndroidManifest.xml                          | 2 +-
 .../android/nrftoolbox/scanner/ScannerFragment.java       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index aef5c37b..62ddac46 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.BLUETOOTH" />
 	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 	<uses-permission android:name="android.permission.NFC" />
 	<uses-permission android:name="no.nordicsemi.android.LOG" />
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/scanner/ScannerFragment.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/scanner/ScannerFragment.java
index 65727d20..a4bc0313 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/scanner/ScannerFragment.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/scanner/ScannerFragment.java
@@ -198,7 +198,7 @@ public class ScannerFragment extends DialogFragment {
 		switch (requestCode) {
 			case REQUEST_PERMISSION_REQ_CODE: {
 				if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-					// We have been granted the Manifest.permission.ACCESS_COARSE_LOCATION permission. Now we may proceed with scanning.
+					// We have been granted the Manifest.permission.ACCESS_FINE_LOCATION permission. Now we may proceed with scanning.
 					startScan();
 				} else {
 					mPermissionRationale.setVisibility(View.VISIBLE);
@@ -218,14 +218,14 @@ public class ScannerFragment extends DialogFragment {
 		// Since Android 6.0 we need to obtain either Manifest.permission.ACCESS_COARSE_LOCATION or Manifest.permission.ACCESS_FINE_LOCATION to be able to scan for
 		// Bluetooth LE devices. This is related to beacons as proximity devices.
 		// On API older than Marshmallow the following code does nothing.
-		if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+		if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
 			// When user pressed Deny and still wants to use this functionality, show the rationale
-			if (ActivityCompat.shouldShowRequestPermissionRationale(requireActivity(), Manifest.permission.ACCESS_COARSE_LOCATION) && mPermissionRationale.getVisibility() == View.GONE) {
+			if (ActivityCompat.shouldShowRequestPermissionRationale(requireActivity(), Manifest.permission.ACCESS_FINE_LOCATION) && mPermissionRationale.getVisibility() == View.GONE) {
 				mPermissionRationale.setVisibility(View.VISIBLE);
 				return;
 			}
 
-			requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, REQUEST_PERMISSION_REQ_CODE);
+			requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, REQUEST_PERMISSION_REQ_CODE);
 			return;
 		}