From 174e678304ab090fa19aeb1d0773abb23a64a821 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 21 Feb 2020 16:36:59 +0000
Subject: [PATCH] Don't try to add extra UUIDs to emptyList().

---
 .../plugin/bluetooth/AndroidBluetoothPlugin.java     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
index 9dd76a19d..e79b8c04f 100644
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
@@ -342,20 +342,18 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 				BluetoothDevice d = requireNonNull(
 						i.getParcelableExtra(EXTRA_DEVICE));
 				List<String> uuids = getUuids(d);
-				if (LOG.isLoggable(INFO)) {
-					LOG.info("Fetched " + uuids.size() + " UUIDs for "
-							+ scrubMacAddress(d.getAddress()));
-				}
-				// TODO: Test whether EXTRA_UUID is redundant on all devices
 				Parcelable[] extra = i.getParcelableArrayExtra(EXTRA_UUID);
 				if (extra != null) {
 					for (Parcelable p : extra) {
 						if (!uuids.contains(p.toString())) {
-							LOG.info("Extra UUID: " + p);
 							uuids.add(p.toString());
 						}
 					}
 				}
+				if (LOG.isLoggable(INFO)) {
+					LOG.info("Fetched " + uuids.size() + " UUIDs for "
+							+ scrubMacAddress(d.getAddress()));
+				}
 				for (String uuid : uuids) {
 					Pair<TransportProperties, DiscoveryHandler> pair =
 							byUuid.remove(uuid);
@@ -400,7 +398,7 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 
 	private List<String> getUuids(BluetoothDevice d) {
 		ParcelUuid[] uuids = d.getUuids();
-		if (uuids == null) return emptyList();
+		if (uuids == null) return new ArrayList<>();
 		List<String> strings = new ArrayList<>(uuids.length);
 		for (ParcelUuid u : uuids) strings.add(u.toString());
 		return strings;