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

Ignore missing location permission on API < 23 where it's not needed.

Browse Source
This commit is contained in:
akwizgran
2020-10-29 14:34:10 +00:00
parent e0f381a973
commit 12a8907c8b
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/keyagreement/KeyAgreementActivity.java
View File

@@ -45,6 +45,7 @@ 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;
import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE; import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.os.Build.VERSION.SDK_INT;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static java.util.logging.Logger.getLogger; import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
@@ -219,7 +220,7 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
private boolean areEssentialPermissionsGranted() { private boolean areEssentialPermissionsGranted() {
return cameraPermission == Permission.GRANTED && return cameraPermission == Permission.GRANTED &&
(locationPermission == Permission.GRANTED || (SDK_INT < 23 || locationPermission == Permission.GRANTED ||
!isBluetoothSupported()); !isBluetoothSupported());
} }