Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '2448-bluetooth-permission-prompt' into 'master'

Browse Source 
Only show Bluetooth permission prompt when Bluetooth is toggled

Closes #2448

See merge request briar/briar!1812
This commit is contained in:
Torsten Grote
2023-09-28 14:09:07 +00:00
parent 6ae601e395 b559c7782d
commit ea1c58110f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java
View File

@@ -219,7 +219,8 @@ public class TransportsActivity extends BriarActivity {
} }
private void onClicked(TransportId transportId, boolean enable) { private void onClicked(TransportId transportId, boolean enable) {
if (enable && SDK_INT >= 31 && !areBluetoothPermissionsGranted(this)) { if (transportId.equals(BluetoothConstants.ID) && enable
&& SDK_INT >= 31 && !areBluetoothPermissionsGranted(this)) {
if (shouldShowRequestPermissionRationale(BLUETOOTH_CONNECT)) { if (shouldShowRequestPermissionRationale(BLUETOOTH_CONNECT)) {
showRationale(this, R.string.permission_bluetooth_title, showRationale(this, R.string.permission_bluetooth_title,
R.string.permission_bluetooth_body, R.string.permission_bluetooth_body,