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

Check if Bluetooth is supported before requesting discoverability

Browse Source
This commit is contained in:
Torsten Grote
2021-04-01 15:34:21 -03:00
parent 4f3e4b019a
commit 5b52417d20
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactActivity.java
View File

@@ -143,9 +143,6 @@ public class AddNearbyContactActivity extends BriarActivity
} }
private void requestBluetoothDiscoverable() { private void requestBluetoothDiscoverable() {
if (!viewModel.isBluetoothSupported()) {
viewModel.setBluetoothDecision(BluetoothDecision.NO_ADAPTER);
} else {
Intent i = new Intent(ACTION_REQUEST_DISCOVERABLE); Intent i = new Intent(ACTION_REQUEST_DISCOVERABLE);
if (i.resolveActivity(getPackageManager()) != null) { if (i.resolveActivity(getPackageManager()) != null) {
LOG.info("Asking for Bluetooth discoverability"); LOG.info("Asking for Bluetooth discoverability");
@@ -155,7 +152,6 @@ public class AddNearbyContactActivity extends BriarActivity
viewModel.setBluetoothDecision(BluetoothDecision.NO_ADAPTER); viewModel.setBluetoothDecision(BluetoothDecision.NO_ADAPTER);
} }
} }
}
private void showQrCodeFragment() { private void showQrCodeFragment() {
// FIXME #824 // FIXME #824

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

@@ -84,6 +84,7 @@ import static org.briarproject.bramble.api.plugin.Plugin.State.STARTING_STOPPING
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactPermissionManager.areEssentialPermissionsGranted; import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactPermissionManager.areEssentialPermissionsGranted;
import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactPermissionManager.isLocationEnabled; import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactPermissionManager.isLocationEnabled;
import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactViewModel.BluetoothDecision.NO_ADAPTER;
import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactViewModel.BluetoothDecision.REFUSED; import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactViewModel.BluetoothDecision.REFUSED;
import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactViewModel.BluetoothDecision.UNKNOWN; import static org.briarproject.briar.android.contact.add.nearby.AddNearbyContactViewModel.BluetoothDecision.UNKNOWN;
@@ -375,7 +376,11 @@ class AddNearbyContactViewModel extends AndroidViewModel
} else { } else {
enableWifiIfWeShould(); enableWifiIfWeShould();
if (bluetoothDecision == UNKNOWN) { if (bluetoothDecision == UNKNOWN) {
if (isBluetoothSupported()) {
requestBluetoothDiscoverable.setEvent(true); requestBluetoothDiscoverable.setEvent(true);
} else {
bluetoothDecision = NO_ADAPTER;
}
} else if (bluetoothDecision == REFUSED) { } else if (bluetoothDecision == REFUSED) {
// Ask again when the user clicks "continue" // Ask again when the user clicks "continue"
} else { } else {