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

Added debugging screen to alpha and beta builds. Dev task #73.

Browse Source
This commit is contained in:
akwizgran
2014-02-28 23:44:35 +00:00
parent 07b4d9b5d8
commit a2d099ea17
20 changed files with 440 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@ class DroidtoothPlugin implements DuplexPlugin {
private volatile boolean running = false;
private volatile boolean wasEnabled = false, isEnabled = false;
private volatile BluetoothServerSocket socket = null;
// Non-null if running has ever been true
private volatile BluetoothAdapter adapter = null;
@@ -149,7 +150,8 @@ class DroidtoothPlugin implements DuplexPlugin {
tryToClose(ss);
return;
}
acceptContactConnections(ss);
socket = ss;
acceptContactConnections();
}
private boolean enableBluetooth() {
@@ -198,15 +200,15 @@ class DroidtoothPlugin implements DuplexPlugin {
}
}
private void acceptContactConnections(BluetoothServerSocket ss) {
private void acceptContactConnections() {
while(true) {
BluetoothSocket s;
try {
s = ss.accept();
s = socket.accept();
} catch(IOException e) {
// This is expected when the socket is closed
if(LOG.isLoggable(INFO)) LOG.log(INFO, e.toString(), e);
tryToClose(ss);
tryToClose(socket);
return;
}
callback.incomingConnectionCreated(wrapSocket(s));
@@ -220,6 +222,7 @@ class DroidtoothPlugin implements DuplexPlugin {
public void stop() {
running = false;
if(socket != null) tryToClose(socket);
// Disable Bluetooth if we enabled it at startup
if(isEnabled && !wasEnabled) disableBluetooth();
}
@@ -246,6 +249,10 @@ class DroidtoothPlugin implements DuplexPlugin {
}
}
public boolean isRunning() {
return running && socket != null;
}
public boolean shouldPoll() {
return true;
}