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

Wait for Bluetooth to be disabled before exiting.

Browse Source 
This may have been the cause of Bluetooth not always being disabled at
shutdown on the Sony Xperia Tipo.
This commit is contained in:
akwizgran
2014-04-05 21:36:05 +01:00
parent 6745bbf9df
commit f489da1a21
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,8 +228,18 @@ class DroidtoothPlugin implements DuplexPlugin {
tryToClose(socket);
// Disable Bluetooth if we enabled it and it's still enabled
if(wasDisabled && adapter.isEnabled()) {
if(adapter.disable()) LOG.info("Disabling Bluetooth");
else LOG.info("Could not disable Bluetooth");
// Try to disable the adapter and wait for the result
LOG.info("Disabling Bluetooth");
IntentFilter filter = new IntentFilter(ACTION_STATE_CHANGED);
DisableBluetoothReceiver receiver = new DisableBluetoothReceiver();
appContext.registerReceiver(receiver, filter);
if(adapter.disable()) {
LOG.info("Disabling Bluetooth");
receiver.waitForStateChange();
} else {
LOG.info("Could not disable Bluetooth");
}
appContext.unregisterReceiver(receiver);
}
}
@@ -382,6 +392,28 @@ class DroidtoothPlugin implements DuplexPlugin {
}
}
private class DisableBluetoothReceiver extends BroadcastReceiver {
private final CountDownLatch latch = new CountDownLatch(1);
public void onReceive(Context ctx, Intent intent) {
int state = intent.getIntExtra(EXTRA_STATE, 0);
if(state == STATE_OFF) {
LOG.info("Bluetooth disabled");
latch.countDown();
}
}
private void waitForStateChange() {
try {
latch.await();
} catch(InterruptedException e) {
LOG.info("Interrupted while disabling Bluetooth");
Thread.currentThread().interrupt();
}
}
}
private class DiscoveryThread extends Thread {
private final LatchedReference<BluetoothSocket> socketLatch;