Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1721-fine-location' into 'master'

Browse Source 
Request fine location permission for Bluetooth discovery

Closes #1721

See merge request briar/briar!1272
This commit is contained in:
Torsten Grote
2020-08-12 19:40:48 +00:00
parent 452c3afbb3 b57fb9c842
commit 4e18115d88
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/AndroidManifest.xml
View File

@@ -29,7 +29,7 @@
<uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <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.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/> <uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
<uses-permission-sdk-23 android:name="android.permission.FOREGROUND_SERVICE"/> <uses-permission-sdk-23 android:name="android.permission.FOREGROUND_SERVICE"/>
@@ -43,7 +43,7 @@
android:banner="@mipmap/tv_banner" android:banner="@mipmap/tv_banner"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/BriarTheme" android:theme="@style/BriarTheme"
tools:ignore="GoogleAppIndexingWarning" tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
tools:targetApi="16"> tools:targetApi="16">
<receiver <receiver

8
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java
View File

@@ -41,7 +41,7 @@ import androidx.appcompat.widget.Toolbar;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import androidx.fragment.app.FragmentManager; 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.Manifest.permission.CAMERA;
import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE; import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE;
import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED; import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
@@ -396,7 +396,7 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
private void requestPermissions() { private void requestPermissions() {
ActivityCompat.requestPermissions(this, ActivityCompat.requestPermissions(this,
new String[] {CAMERA, ACCESS_COARSE_LOCATION}, new String[] {CAMERA, ACCESS_FINE_LOCATION},
REQUEST_PERMISSION_CAMERA_LOCATION); REQUEST_PERMISSION_CAMERA_LOCATION);
} }
@@ -413,9 +413,9 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
} else { } else {
cameraPermission = Permission.PERMANENTLY_DENIED; cameraPermission = Permission.PERMANENTLY_DENIED;
} }
if (gotPermission(ACCESS_COARSE_LOCATION, permissions, grantResults)) { if (gotPermission(ACCESS_FINE_LOCATION, permissions, grantResults)) {
locationPermission = Permission.GRANTED; locationPermission = Permission.GRANTED;
} else if (shouldShowRationale(ACCESS_COARSE_LOCATION)) { } else if (shouldShowRationale(ACCESS_FINE_LOCATION)) {
locationPermission = Permission.SHOW_RATIONALE; locationPermission = Permission.SHOW_RATIONALE;
} else { } else {
locationPermission = Permission.PERMANENTLY_DENIED; locationPermission = Permission.PERMANENTLY_DENIED;