From 2fd331adc5aa3c5dcff9e82396360f345eb93fb4 Mon Sep 17 00:00:00 2001
From: oliexdev <olie.xdev@googlemail.com>
Date: Sat, 23 Feb 2019 12:28:54 +0100
Subject: [PATCH] grand access to fine location which includes coarse location
 access

---
 android_app/app/src/main/AndroidManifest.xml                | 2 +-
 .../openscale/core/bluetooth/BluetoothCommunication.java    | 4 ++--
 .../health/openscale/gui/activities/SettingsActivity.java   | 3 +--
 .../openscale/gui/preferences/BluetoothPreferences.java     | 2 +-
 .../com/health/openscale/gui/utils/PermissionHelper.java    | 6 +++---
 android_app/app/src/main/res/values/strings.xml             | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml
index 72e3db23..ec446aff 100644
--- a/android_app/app/src/main/AndroidManifest.xml
+++ b/android_app/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
     <!-- Permission to allow read of data from the database through a ContentProvider.
          Marked "dangerous" so that explicit user approval is required to read this data, not
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
index 9aa6e818..12063d1f 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
@@ -454,7 +454,7 @@ public abstract class BluetoothCommunication {
         // Otherwise the connection almost never succeeds.
         LocationManager locationManager = (LocationManager)context.getSystemService(LOCATION_SERVICE);
 
-        if (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
+        if (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION)
                 == PackageManager.PERMISSION_GRANTED && (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)
                 || locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER))
         ) {
@@ -474,7 +474,7 @@ public abstract class BluetoothCommunication {
                     }}, throwable -> setBluetoothStatus(BT_STATUS.NO_DEVICE_FOUND));
         }
         else {
-            Timber.d("No coarse location permission, connecting without LE scan");
+            Timber.d("No location permission, connecting without LE scan");
             connectToDevice(macAddress);
         }
     }
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/SettingsActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/SettingsActivity.java
index b5f83341..39340003 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/activities/SettingsActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/SettingsActivity.java
@@ -23,7 +23,6 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
-import android.widget.EditText;
 
 import com.health.openscale.R;
 import com.health.openscale.gui.preferences.BackupPreferences;
@@ -106,7 +105,7 @@ public class SettingsActivity extends PreferenceActivity
     public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
         // TODO HACK to call RequestPermissionResult(...) in PreferenceFragment otherwise API level > 23 is required
         switch(requestCode) {
-            case PermissionHelper.PERMISSIONS_REQUEST_ACCESS_COARSE_LOCATION:
+            case PermissionHelper.PERMISSIONS_REQUEST_ACCESS_FINE_LOCATION:
                 BluetoothPreferences bluetoothPreferences = (BluetoothPreferences)currentFragment;
                 bluetoothPreferences.onMyOwnRequestPermissionsResult(requestCode, permissions, grantResults);
                 break;
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
index be491e64..e790a888 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
@@ -325,7 +325,7 @@ public class BluetoothPreferences extends PreferenceFragment {
 
     public void onMyOwnRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
         switch (requestCode) {
-            case PermissionHelper.PERMISSIONS_REQUEST_ACCESS_COARSE_LOCATION: {
+            case PermissionHelper.PERMISSIONS_REQUEST_ACCESS_FINE_LOCATION: {
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                     if (PermissionHelper.requestLocationServicePermission(getActivity())) {
                         startBluetoothDiscovery();
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java b/android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java
index e236e3eb..c40ae959 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java
@@ -37,7 +37,7 @@ import androidx.core.app.ActivityCompat;
 import static android.content.Context.LOCATION_SERVICE;
 
 public class PermissionHelper {
-    public final static int PERMISSIONS_REQUEST_ACCESS_COARSE_LOCATION = 1;
+    public final static int PERMISSIONS_REQUEST_ACCESS_FINE_LOCATION = 1;
     public final static int PERMISSIONS_REQUEST_ACCESS_READ_STORAGE = 2;
     public final static int PERMISSIONS_REQUEST_ACCESS_WRITE_STORAGE = 3;
 
@@ -63,7 +63,7 @@ public class PermissionHelper {
             return false;
          }
 
-        if (ActivityCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+        if (ActivityCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
             AlertDialog.Builder builder = new AlertDialog.Builder(activity);
 
             builder.setMessage(R.string.permission_bluetooth_info)
@@ -72,7 +72,7 @@ public class PermissionHelper {
                     .setPositiveButton(R.string.label_ok, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
                             dialog.dismiss();
-                            ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, PERMISSIONS_REQUEST_ACCESS_COARSE_LOCATION);
+                            ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSIONS_REQUEST_ACCESS_FINE_LOCATION);
                         }
                     });
 
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 17f9a3ca..7c37a48a 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -198,7 +198,7 @@
     <string name="label_measurement_bar">Measurement bar</string>
 
     <string name="permission_not_granted">Permission not granted</string>
-    <string name="permission_bluetooth_info">Coarse location permission needed to search for Bluetooth devices. It can be revoked after the device is found.</string>
+    <string name="permission_bluetooth_info">Location permission needed to search for Bluetooth devices. It can be revoked after the device is found.</string>
     <string name="permission_location_service_info">Grant location access in the Android settings to search for Bluetooth devices. Optionally revoke it afterwards.</string>
     <string name="permission_bluetooth_info_title">Info</string>
     <string name="permission_read_write_data_description">read/write openScale data, including user information and all saved measurements</string>