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

Log Bluetooth bonding changes.

Browse Source
This commit is contained in:
akwizgran
2018-02-26 14:03:45 +00:00
parent c00bf2b2cd
commit 5b177c9901
1 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
View File

@@ -21,6 +21,8 @@ import org.briarproject.bramble.util.AndroidUtils;
import java.io.Closeable; import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@@ -37,7 +39,16 @@ import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERA
import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE; import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE;
import static android.bluetooth.BluetoothAdapter.STATE_OFF; import static android.bluetooth.BluetoothAdapter.STATE_OFF;
import static android.bluetooth.BluetoothAdapter.STATE_ON; import static android.bluetooth.BluetoothAdapter.STATE_ON;
import static android.bluetooth.BluetoothDevice.ACTION_BOND_STATE_CHANGED;
import static android.bluetooth.BluetoothDevice.BOND_BONDED;
import static android.bluetooth.BluetoothDevice.BOND_BONDING;
import static android.bluetooth.BluetoothDevice.BOND_NONE;
import static android.bluetooth.BluetoothDevice.EXTRA_BOND_STATE;
import static android.bluetooth.BluetoothDevice.EXTRA_DEVICE;
import static android.bluetooth.BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
@MethodsNotNullByDefault @MethodsNotNullByDefault
@ParametersNotNullByDefault @ParametersNotNullByDefault
@@ -72,6 +83,7 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(ACTION_STATE_CHANGED); filter.addAction(ACTION_STATE_CHANGED);
filter.addAction(ACTION_SCAN_MODE_CHANGED); filter.addAction(ACTION_SCAN_MODE_CHANGED);
filter.addAction(ACTION_BOND_STATE_CHANGED);
receiver = new BluetoothStateReceiver(); receiver = new BluetoothStateReceiver();
appContext.registerReceiver(receiver, filter); appContext.registerReceiver(receiver, filter);
} }
@@ -168,6 +180,17 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
@Override @Override
DuplexTransportConnection connectTo(String address, String uuid) DuplexTransportConnection connectTo(String address, String uuid)
throws IOException { throws IOException {
if (LOG.isLoggable(INFO)) {
boolean found = false;
List<String> addresses = new ArrayList<>();
for (BluetoothDevice d : adapter.getBondedDevices()) {
addresses.add(scrubMacAddress(d.getAddress()));
if (d.getAddress().equals(address)) found = true;
}
LOG.info("Bonded devices: " + addresses);
if (found) LOG.info("Connecting to bonded device");
else LOG.info("Connecting to unbonded device");
}
BluetoothDevice d = adapter.getRemoteDevice(address); BluetoothDevice d = adapter.getRemoteDevice(address);
UUID u = UUID.fromString(uuid); UUID u = UUID.fromString(uuid);
BluetoothSocket s = null; BluetoothSocket s = null;
@@ -193,9 +216,12 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
@Override @Override
public void onReceive(Context ctx, Intent intent) { public void onReceive(Context ctx, Intent intent) {
String action = intent.getAction();
if (ACTION_STATE_CHANGED.equals(action)) {
int state = intent.getIntExtra(EXTRA_STATE, 0); int state = intent.getIntExtra(EXTRA_STATE, 0);
if (state == STATE_ON) onAdapterEnabled(); if (state == STATE_ON) onAdapterEnabled();
else if (state == STATE_OFF) onAdapterDisabled(); else if (state == STATE_OFF) onAdapterDisabled();
} else if (ACTION_SCAN_MODE_CHANGED.equals(action)) {
int scanMode = intent.getIntExtra(EXTRA_SCAN_MODE, 0); int scanMode = intent.getIntExtra(EXTRA_SCAN_MODE, 0);
if (scanMode == SCAN_MODE_NONE) { if (scanMode == SCAN_MODE_NONE) {
LOG.info("Scan mode: None"); LOG.info("Scan mode: None");
@@ -204,6 +230,29 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
} else if (scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE) { } else if (scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
LOG.info("Scan mode: Discoverable"); LOG.info("Scan mode: Discoverable");
} }
} else if (ACTION_BOND_STATE_CHANGED.equals(action)) {
BluetoothDevice d = intent.getParcelableExtra(EXTRA_DEVICE);
if (LOG.isLoggable(INFO)) {
LOG.info("Bond state changed for "
+ scrubMacAddress(d.getAddress()));
}
int oldState = intent.getIntExtra(EXTRA_PREVIOUS_BOND_STATE, 0);
if (oldState == BOND_NONE) {
LOG.info("Old state: none");
} else if (oldState == BOND_BONDING) {
LOG.info("Old state: bonding");
} else if (oldState == BOND_BONDED) {
LOG.info("Old state: bonded");
}
int state = intent.getIntExtra(EXTRA_BOND_STATE, 0);
if (state == BOND_NONE) {
LOG.info("New state: none");
} else if (state == BOND_BONDING) {
LOG.info("New state: bonding");
} else if (state == BOND_BONDED) {
LOG.info("New state: bonded");
}
}
} }
} }
} }