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

We only need Bluetooth discoverabilty when accepting an invitation.

Browse Source
This commit is contained in:
akwizgran
2012-10-31 00:18:48 +00:00
parent 7562c2cee8
commit 3fa433f7fe
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
View File

@@ -236,7 +236,7 @@ class BluetoothPlugin implements DuplexPlugin {
synchronized(this) { synchronized(this) {
if(!running) return null; if(!running) return null;
} }
// Use the invitation code to generate the UUID // Use the same pseudo-random UUID as the contact
String uuid = generateUuid(r.nextBytes(16)); String uuid = generateUuid(r.nextBytes(16));
// Discover nearby devices and connect to any with the right UUID // Discover nearby devices and connect to any with the right UUID
DiscoveryAgent discoveryAgent = localDevice.getDiscoveryAgent(); DiscoveryAgent discoveryAgent = localDevice.getDiscoveryAgent();
@@ -279,7 +279,7 @@ class BluetoothPlugin implements DuplexPlugin {
synchronized(this) { synchronized(this) {
if(!running) return null; if(!running) return null;
} }
// Use the invitation code to generate the UUID // Use the same pseudo-random UUID as the contact
String uuid = generateUuid(r.nextBytes(16)); String uuid = generateUuid(r.nextBytes(16));
String url = makeUrl("localhost", uuid); String url = makeUrl("localhost", uuid);
// Make the device discoverable if possible // Make the device discoverable if possible

28
src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
View File

@@ -43,7 +43,6 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.os.Build;
class DroidtoothPlugin implements DuplexPlugin { class DroidtoothPlugin implements DuplexPlugin {
@@ -122,7 +121,6 @@ class DroidtoothPlugin implements DuplexPlugin {
LOG.info("Could not enable Bluetooth"); LOG.info("Could not enable Bluetooth");
return; return;
} }
makeDeviceDiscoverable();
if(LOG.isLoggable(Level.INFO)) if(LOG.isLoggable(Level.INFO))
LOG.info("Local address " + adapter.getAddress()); LOG.info("Local address " + adapter.getAddress());
// Advertise the Bluetooth address to contacts // Advertise the Bluetooth address to contacts
@@ -167,19 +165,6 @@ class DroidtoothPlugin implements DuplexPlugin {
} }
} }
private void makeDeviceDiscoverable() {
synchronized(this) {
if(!running) return;
}
if(adapter.getScanMode() == SCAN_MODE_CONNECTABLE_DISCOVERABLE) return;
// Indefinite discoverability can only be set on API Level 8 or higher
if(Build.VERSION.SDK_INT < 8) return;
Intent intent = new Intent(ACTION_REQUEST_DISCOVERABLE);
intent.putExtra(EXTRA_DISCOVERABLE_DURATION, 0);
intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
appContext.startActivity(intent);
}
// FIXME: Get the UUID from the local transport properties // FIXME: Get the UUID from the local transport properties
private UUID getUuid() { private UUID getUuid() {
return UUID.nameUUIDFromBytes(new byte[0]); return UUID.nameUUIDFromBytes(new byte[0]);
@@ -333,6 +318,8 @@ class DroidtoothPlugin implements DuplexPlugin {
} }
// Use the same pseudo-random UUID as the contact // Use the same pseudo-random UUID as the contact
UUID uuid = UUID.nameUUIDFromBytes(r.nextBytes(16)); UUID uuid = UUID.nameUUIDFromBytes(r.nextBytes(16));
// Make the device discoverable if the user allows it
makeDeviceDiscoverable();
// Bind a new server socket to accept the invitation connection // Bind a new server socket to accept the invitation connection
final BluetoothServerSocket ss; final BluetoothServerSocket ss;
try { try {
@@ -355,6 +342,17 @@ class DroidtoothPlugin implements DuplexPlugin {
} }
} }
private void makeDeviceDiscoverable() {
synchronized(this) {
if(!running) return;
}
if(adapter.getScanMode() == SCAN_MODE_CONNECTABLE_DISCOVERABLE) return;
Intent intent = new Intent(ACTION_REQUEST_DISCOVERABLE);
intent.putExtra(EXTRA_DISCOVERABLE_DURATION, 60);
intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
appContext.startActivity(intent);
}
private static class BluetoothStateReceiver extends BroadcastReceiver { private static class BluetoothStateReceiver extends BroadcastReceiver {
private final CountDownLatch finished = new CountDownLatch(1); private final CountDownLatch finished = new CountDownLatch(1);