projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Require 'debug' hook in AltosMapInterface
[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 9cef131905abad0c1437dc1722aa155a0cbfba38..cda35f1ddd0e6ae6f17238c61669ddbab8c36602 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
@@
-17,14
+17,15
@@
package org.altusmetrum.AltosDroid;
import android.content.Context;
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 */
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)
public static void init(Context context) {
if (backend != null)
@@
-32,18
+33,23
@@
public class AltosDroidPreferences extends AltosPreferences {
AltosPreferences.init(new AltosDroidPreferencesBackend(context));
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;
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();
}
}
flush_preferences();
}
}
- public static
String
active_device() {
+ public static
DeviceAddress
active_device() {
synchronized(backend) {
return active_device_address;
}
synchronized(backend) {
return active_device_address;
}