Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[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 7ab701472bca37208d7bdb177b41266e46346548..372500c18e8b7d04a9fc3977481cd557fc432ba4 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
@@ -22,9 +22,10 @@ import org.altusmetrum.altoslib_6.*;
 public class AltosDroidPreferences extends AltosPreferences {
 
        /* Active device preference name */
-       final static String activeDevicePreference = "ACTIVE-DEVICE";
+       final static String activeDeviceAddressPreference = "ACTIVE-DEVICE-ADDRESS";
+       final static String activeDeviceNamePreference = "ACTIVE-DEVICE-NAME";
 
-       static String active_device_address;
+       static DeviceAddress    active_device_address;
 
        public static void init(Context context) {
                if (backend != null)
@@ -32,18 +33,23 @@ public class AltosDroidPreferences extends AltosPreferences {
 
                AltosPreferences.init(new AltosDroidPreferencesBackend(context));
 
-               active_device_address = backend.getString(activeDevicePreference, null);
+               String address = backend.getString(activeDeviceAddressPreference, null);
+               String name = backend.getString(activeDeviceNamePreference, null);
+
+               if (address != null && name != null)
+                       active_device_address = new DeviceAddress (address, name);
        }
 
-       public static void set_active_device(String address) {
+       public static void set_active_device(DeviceAddress address) {
                synchronized(backend) {
                        active_device_address = address;
-                       backend.putString(activeDevicePreference, active_device_address);
+                       backend.putString(activeDeviceAddressPreference, active_device_address.address);
+                       backend.putString(activeDeviceNamePreference, active_device_address.name);
                        flush_preferences();
                }
        }
 
-       public static String active_device() {
+       public static DeviceAddress active_device() {
                synchronized(backend) {
                        return active_device_address;
                }