altosdroid: make disconnect stick past pause/restart

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosDroidPreferences.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
index dd86c818b06b5822af48335ca465e23ec69c7fdf..16ee4429097536ffe58829d92a6a446850757573 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
@@ -57,8 +57,13 @@ public class AltosDroidPreferences extends AltosPreferences {
        public static void set_active_device(DeviceAddress address) {
                synchronized(backend) {
                        active_device_address = address;
-                       backend.putString(activeDeviceAddressPreference, active_device_address.address);
-                       backend.putString(activeDeviceNamePreference, active_device_address.name);
+                       if (active_device_address != null) {
+                               backend.putString(activeDeviceAddressPreference, active_device_address.address);
+                               backend.putString(activeDeviceNamePreference, active_device_address.name);
+                       } else {
+                               backend.remove(activeDeviceAddressPreference);
+                               backend.remove(activeDeviceNamePreference);
+                       }
                        flush_preferences();
                }
        }