X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroidPreferences.java;h=8bb78c00dce6fd915551aca270bcbe99e062b648;hp=372500c18e8b7d04a9fc3977481cd557fc432ba4;hb=297eb795b24ec31f6599f48bc8c3769557a7ec6f;hpb=4af4e36cda96d053458eeb040e35886890917385

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
index 372500c1..8bb78c00 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +17,12 @@
  */
 package org.altusmetrum.AltosDroid;
 
+import java.io.*;
+import java.util.*;
+import java.text.*;
+
 import android.content.Context;
-import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altoslib_13.*;
 
 public class AltosDroidPreferences extends AltosPreferences {
 
@@ -27,6 +32,14 @@ public class AltosDroidPreferences extends AltosPreferences {
 
 	static DeviceAddress	active_device_address;
 
+	/* Map source preference name */
+	final static String mapSourcePreference = "MAP-SOURCE";
+
+	static final int	MAP_SOURCE_OFFLINE = 0;
+	static final int	MAP_SOURCE_ONLINE = 1;
+
+	static int	map_source;
+
 	public static void init(Context context) {
 		if (backend != null)
 			return;
@@ -38,13 +51,20 @@ public class AltosDroidPreferences extends AltosPreferences {
 
 		if (address != null && name != null)
 			active_device_address = new DeviceAddress (address, name);
+
+		map_source = backend.getInt(mapSourcePreference, MAP_SOURCE_ONLINE);
 	}
 
 	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();
 		}
 	}
@@ -54,4 +74,39 @@ public class AltosDroidPreferences extends AltosPreferences {
 			return active_device_address;
 		}
 	}
+
+	static LinkedList<AltosDroidMapSourceListener> map_source_listeners;
+
+	public static void set_map_source(int map_source) {
+		synchronized(backend) {
+			AltosDroidPreferences.map_source = map_source;
+			backend.putInt(mapSourcePreference, map_source);
+			flush_preferences();
+		}
+		if (map_source_listeners != null) {
+			for (AltosDroidMapSourceListener l : map_source_listeners) {
+				l.map_source_changed(map_source);
+			}
+		}
+	}
+
+	public static int map_source() {
+		synchronized(backend) {
+			return map_source;
+		}
+	}
+
+	public static void register_map_source_listener(AltosDroidMapSourceListener l) {
+		synchronized(backend) {
+			if (map_source_listeners == null)
+				map_source_listeners = new LinkedList<AltosDroidMapSourceListener>();
+			map_source_listeners.add(l);
+		}
+	}
+
+	public static void unregister_map_source_listener(AltosDroidMapSourceListener l) {
+		synchronized(backend) {
+			map_source_listeners.remove(l);
+		}
+	}
 }