From 70c5d7ce750e02296407eda8a85e16227d8a2e0a Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 28 Oct 2011 13:16:00 +0100
Subject: [PATCH] Don't store the local address unless the device is
discoverable.
---
.../sf/briar/plugins/bluetooth/BluetoothPlugin.java | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java b/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
index 8a2cf684c0..978f536da3 100644
--- a/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
+++ b/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
@@ -120,7 +120,6 @@ class BluetoothPlugin extends AbstractPlugin implements StreamPlugin {
return;
}
socket = scn;
- setLocalBluetoothAddress(localDevice.getBluetoothAddress());
}
startContactAccepterThread();
}
@@ -145,18 +144,14 @@ class BluetoothPlugin extends AbstractPlugin implements StreamPlugin {
// Try to make the device discoverable (requires root on Linux)
try {
localDevice.setDiscoverable(DiscoveryAgent.GIAC);
+ TransportProperties p = callback.getLocalProperties();
+ p.put("address", localDevice.getBluetoothAddress());
+ callback.setLocalProperties(p);
} catch(BluetoothStateException e) {
if(LOG.isLoggable(Level.WARNING)) LOG.warning(e.getMessage());
}
}
- private synchronized void setLocalBluetoothAddress(String address) {
- assert started;
- TransportProperties p = callback.getLocalProperties();
- p.put("address", address);
- callback.setLocalProperties(p);
- }
-
private void startContactAccepterThread() {
new Thread() {
@Override
--
GitLab