From e9f78bc4861987bbd40fb48fbcf3f42720dd0f64 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 21 Jul 2020 10:38:30 +0100
Subject: [PATCH] Avoid redundantly storing unchanged properties and settings.

---
 .idea/codeStyles/Project.xml                  |  3 ---
 .../plugin/bluetooth/BluetoothPlugin.java     | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 78dfd234a..011a1a146 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,8 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
       <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
       <option name="IMPORT_LAYOUT_TABLE">
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
index 9a5ff6b74..956dc293b 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
@@ -224,14 +224,17 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 			if (LOG.isLoggable(INFO)) {
 				LOG.info("Local address " + scrubMacAddress(address));
 			}
-			if (address == null && everConnected.get()) {
-				address = getReflectedAddress();
-				if (LOG.isLoggable(INFO)) {
-					LOG.info("Reflected address " + scrubMacAddress(address));
-				}
-				if (address != null) {
-					changed = true;
-					isReflected = true;
+			if (address == null) {
+				if (everConnected.get()) {
+					address = getReflectedAddress();
+					if (LOG.isLoggable(INFO)) {
+						LOG.info("Reflected address " +
+								scrubMacAddress(address));
+					}
+					if (address != null) {
+						changed = true;
+						isReflected = true;
+					}
 				}
 			} else {
 				changed = true;