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

Add permission rationale for camera and Bluetooth combined

Browse Source
This commit is contained in:
Torsten Grote
2022-09-29 10:16:38 -03:00
parent 0a906998fe
commit 52809d8f2d
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactPermissionManager.java
View File

@@ -103,6 +103,11 @@ class AddNearbyContactPermissionManager {
showRationale(ctx, R.string.permission_camera_location_title,
R.string.permission_camera_location_request_body,
this::requestPermissions);
} else if (cameraPermission == SHOW_RATIONALE &&
bluetoothPermissions == SHOW_RATIONALE) {
showRationale(ctx, R.string.permission_camera_bluetooth_title,
R.string.permission_camera_bluetooth_request_body,
this::requestPermissions);
} else if (cameraPermission == SHOW_RATIONALE) {
showRationale(ctx, R.string.permission_camera_title,
R.string.permission_camera_request_body,

4
briar-android/src/main/res/values/strings.xml
View File

@@ -314,7 +314,7 @@
<string name="different_person_button">Different Person</string>
<string name="duplicate_link_dialog_text_3">%1$s and %2$s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else.</string>
<string name="pending_contact_updated_toast">Pending contact updated</string>
<!-- Peer trust levels -->
<string name="peer_trust_level_unverified">Unverified contact</string>
@@ -778,6 +778,8 @@
<string name="permission_location_request_body">To discover Bluetooth devices, Briar needs permission to access your location.\n\nBriar does not store your location or share it with anyone.</string>
<string name="permission_camera_location_title">Camera and location</string>
<string name="permission_camera_location_request_body">To scan the QR code, Briar needs access to the camera.\n\nTo discover Bluetooth devices, Briar needs permission to access your location.\n\nBriar does not store your location or share it with anyone.</string>
<string name="permission_camera_bluetooth_title">Camera and nearby devices</string>
<string name="permission_camera_bluetooth_request_body">To scan the QR code, Briar needs access to the camera.\n\nTo discover Bluetooth devices, Briar needs permission to find and connect to nearby devices.</string>
<string name="permission_camera_denied_body">You have denied access to the camera, but adding contacts requires using the camera.\n\nPlease consider granting access.</string>
<string name="permission_location_denied_body">You have denied access to your location, but Briar needs this permission to discover Bluetooth devices.\n\nPlease consider granting access.</string>
<string name="permission_location_setting_title">Location setting</string>