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

Bluetooth discovery was running for too long. Bug #64 and possibly #61.

Browse Source 
The variable now wasn't being updated when no devices were discovered.
This commit is contained in:
akwizgran
2014-03-22 15:20:56 +00:00
parent 86ebae04b4
commit ab2849e2f3
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
View File

@@ -1,7 +1,12 @@
package org.briarproject.plugins.droidtooth; package org.briarproject.plugins.droidtooth;
import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED; import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
import static android.bluetooth.BluetoothAdapter.EXTRA_STATE; import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
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.EXTRA_DEVICE; import static android.bluetooth.BluetoothDevice.EXTRA_DEVICE;
@@ -122,7 +127,9 @@ class DroidtoothPlugin implements DuplexPlugin {
} }
running = true; running = true;
// Listen for changes to the Bluetooth state // Listen for changes to the Bluetooth state
IntentFilter filter = new IntentFilter(ACTION_STATE_CHANGED); IntentFilter filter = new IntentFilter();
filter.addAction(ACTION_STATE_CHANGED);
filter.addAction(ACTION_SCAN_MODE_CHANGED);
receiver = new BluetoothStateReceiver(); receiver = new BluetoothStateReceiver();
appContext.registerReceiver(receiver, filter); appContext.registerReceiver(receiver, filter);
// If Bluetooth is enabled, bind a socket - otherwise enable it // If Bluetooth is enabled, bind a socket - otherwise enable it
@@ -364,6 +371,14 @@ class DroidtoothPlugin implements DuplexPlugin {
LOG.info("Bluetooth disabled"); LOG.info("Bluetooth disabled");
tryToClose(socket); tryToClose(socket);
} }
int scanMode = intent.getIntExtra(EXTRA_SCAN_MODE, 0);
if(scanMode == SCAN_MODE_NONE) {
LOG.info("Scan mode: None");
} else if(scanMode == SCAN_MODE_CONNECTABLE) {
LOG.info("Scan mode: Connectable");
} else if(scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
LOG.info("Scan mode: Discoverable");
}
} }
} }
@@ -395,6 +410,11 @@ class DroidtoothPlugin implements DuplexPlugin {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
return; return;
} }
if(addresses.isEmpty()) {
LOG.info("No devices discovered");
now = clock.currentTimeMillis();
continue;
}
// Connect to any device with the right UUID // Connect to any device with the right UUID
for(String address : addresses) { for(String address : addresses) {
now = clock.currentTimeMillis(); now = clock.currentTimeMillis();
@@ -419,6 +439,7 @@ class DroidtoothPlugin implements DuplexPlugin {
filter.addAction(DISCOVERY_FINISHED); filter.addAction(DISCOVERY_FINISHED);
DiscoveryReceiver disco = new DiscoveryReceiver(); DiscoveryReceiver disco = new DiscoveryReceiver();
appContext.registerReceiver(disco, filter); appContext.registerReceiver(disco, filter);
LOG.info("Starting discovery");
adapter.startDiscovery(); adapter.startDiscovery();
return disco.waitForAddresses(timeout); return disco.waitForAddresses(timeout);
} }
@@ -433,6 +454,7 @@ class DroidtoothPlugin implements DuplexPlugin {
public void onReceive(Context ctx, Intent intent) { public void onReceive(Context ctx, Intent intent) {
String action = intent.getAction(); String action = intent.getAction();
if(action.equals(DISCOVERY_FINISHED)) { if(action.equals(DISCOVERY_FINISHED)) {
LOG.info("Discovery finished");
ctx.unregisterReceiver(this); ctx.unregisterReceiver(this);
finished.countDown(); finished.countDown();
} else if(action.equals(FOUND)) { } else if(action.equals(FOUND)) {