From 000936b7a23034043f9d18ea54b1c6a8f9529702 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Wed, 24 Feb 2016 20:03:04 +0000
Subject: [PATCH] Return the empty string instead of the fake address.
---
.../android/util/AndroidUtils.java | 23 +++++++++----------
.../plugins/droidtooth/DroidtoothPlugin.java | 10 ++++----
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/util/AndroidUtils.java b/briar-android/src/org/briarproject/android/util/AndroidUtils.java
index 678c682c2d..41599dd4ed 100644
--- a/briar-android/src/org/briarproject/android/util/AndroidUtils.java
+++ b/briar-android/src/org/briarproject/android/util/AndroidUtils.java
@@ -57,19 +57,18 @@ public class AndroidUtils {
BluetoothAdapter adapter) {
// Return the adapter's address if it's valid and not fake
String address = adapter.getAddress();
- if (!StringUtils.isNullOrEmpty(address)
- && BluetoothAdapter.checkBluetoothAddress(address)
- && !address.equals(FAKE_BLUETOOTH_ADDRESS)) {
- return address;
- }
- // Return the address from settings if it's valid
+ if (isValidBluetoothAddress(address)) return address;
+ // Return the address from settings if it's valid and not fake
address = Settings.Secure.getString(ctx.getContentResolver(),
"bluetooth_address");
- if (!StringUtils.isNullOrEmpty(address)
- && BluetoothAdapter.checkBluetoothAddress(address)) {
- return address;
- }
- // As a last resort, return a fake but valid address
- return FAKE_BLUETOOTH_ADDRESS;
+ if (isValidBluetoothAddress(address)) return address;
+ // Let the caller know we can't find the address
+ return "";
+ }
+
+ private static boolean isValidBluetoothAddress(String address) {
+ return !StringUtils.isNullOrEmpty(address)
+ && BluetoothAdapter.checkBluetoothAddress(address)
+ && !address.equals(FAKE_BLUETOOTH_ADDRESS);
}
}
diff --git a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
index 9c67f9e98e..2bd6d3d37c 100644
--- a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
+++ b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
@@ -157,10 +157,12 @@ class DroidtoothPlugin implements DuplexPlugin {
adapter);
if (LOG.isLoggable(INFO))
LOG.info("Local address " + address);
- // Advertise the Bluetooth address to contacts
- TransportProperties p = new TransportProperties();
- p.put("address", address);
- callback.mergeLocalProperties(p);
+ if (!StringUtils.isNullOrEmpty(address)) {
+ // Advertise the Bluetooth address to contacts
+ TransportProperties p = new TransportProperties();
+ p.put("address", address);
+ callback.mergeLocalProperties(p);
+ }
// Bind a server socket to accept connections from contacts
BluetoothServerSocket ss;
try {
--
GitLab