From b57fb9c8425019819deef02f0ecf4f22dc12b55b Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 12 Aug 2020 17:29:47 +0100
Subject: [PATCH] Request fine location permission for Bluetooth discovery.

---
 briar-android/src/main/AndroidManifest.xml                | 4 ++--
 .../briar/android/keyagreement/KeyAgreementActivity.java  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index 0a609048a..5055324bf 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
 	<uses-permission android:name="android.permission.WAKE_LOCK"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
-	<uses-permission-sdk-23 android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+	<uses-permission-sdk-23 android:name="android.permission.ACCESS_FINE_LOCATION"/>
 	<uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
 	<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
 	<uses-permission-sdk-23 android:name="android.permission.FOREGROUND_SERVICE"/>
@@ -43,7 +43,7 @@
 		android:banner="@mipmap/tv_banner"
 		android:supportsRtl="true"
 		android:theme="@style/BriarTheme"
-		tools:ignore="GoogleAppIndexingWarning"
+		tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
 		tools:targetApi="16">
 
 		<receiver
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java
index f55d89a49..154326ae5 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java
@@ -41,7 +41,7 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.FragmentManager;
 
-import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
+import static android.Manifest.permission.ACCESS_FINE_LOCATION;
 import static android.Manifest.permission.CAMERA;
 import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE;
 import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
@@ -396,7 +396,7 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
 
 	private void requestPermissions() {
 		ActivityCompat.requestPermissions(this,
-				new String[] {CAMERA, ACCESS_COARSE_LOCATION},
+				new String[] {CAMERA, ACCESS_FINE_LOCATION},
 				REQUEST_PERMISSION_CAMERA_LOCATION);
 	}
 
@@ -413,9 +413,9 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
 		} else {
 			cameraPermission = Permission.PERMANENTLY_DENIED;
 		}
-		if (gotPermission(ACCESS_COARSE_LOCATION, permissions, grantResults)) {
+		if (gotPermission(ACCESS_FINE_LOCATION, permissions, grantResults)) {
 			locationPermission = Permission.GRANTED;
-		} else if (shouldShowRationale(ACCESS_COARSE_LOCATION)) {
+		} else if (shouldShowRationale(ACCESS_FINE_LOCATION)) {
 			locationPermission = Permission.SHOW_RATIONALE;
 		} else {
 			locationPermission = Permission.PERMANENTLY_DENIED;