X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroidPreferences.java;h=cda35f1ddd0e6ae6f17238c61669ddbab8c36602;hp=72b8488bfbb85c395eef0b0b5e1d5528021565f5;hb=cb23b992be8ba40c97d8988c134a814a13ccd58c;hpb=0b70ea04e807c69a987d5976ab217f9f65fb1e09

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
index 72b8488b..cda35f1d 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
@@ -17,30 +17,39 @@
 package org.altusmetrum.AltosDroid;
 
 import android.content.Context;
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_7.*;
 
 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)
+			return;
+
 		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;
 		}