X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosPreferences.java;h=51fc4205e6b79fa987376ee068cb5b80a30d7ac3;hb=8df6afe843e184e98e5d965cee3af562dfa30a3b;hp=b853e944bc76ffc8c4d4e186ad1e120237644748;hpb=97adfff4cfb67c17a96f3ff46606b4e439422b01;p=fw%2Faltos

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index b853e944..51fc4205 100644
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -116,7 +116,7 @@ public class AltosPreferences {
 	public final static String	frequency_count = "COUNT";
 	public final static String	frequency_format = "FREQUENCY-%d";
 	public final static String	description_format = "DESCRIPTION-%d";
-	public final static String	frequenciesPreference = "FREQUENCIES";
+	public final static String	frequenciesPreference = "FREQUENCIES-1";
 
 	/* Units preference */
 
@@ -133,24 +133,30 @@ public class AltosPreferences {
 	static int	map_type;
 
 	public static AltosFrequency[] load_common_frequencies() {
-
 		AltosFrequency[] frequencies = null;
 
-		frequencies = (AltosFrequency[]) backend.getSerializable(frequenciesPreference, null);
+		try {
+			AltosJson json = AltosJson.fromString(backend.getString(frequenciesPreference,
+										null));
+			frequencies = (AltosFrequency[]) json.make(frequencies.getClass());
+		} catch (Exception e) {
+		}
 
 		if (frequencies == null) {
 			if (backend.nodeExists(common_frequencies_node_name)) {
 				AltosPreferencesBackend	node = backend.node(common_frequencies_node_name);
 				int		count = node.getInt(frequency_count, 0);
 
-				frequencies = new AltosFrequency[count];
-				for (int i = 0; i < count; i++) {
-					double	frequency;
-					String	description;
+				if (count > 0) {
+					frequencies = new AltosFrequency[count];
+					for (int i = 0; i < count; i++) {
+						double	frequency;
+						String	description;
 
-					frequency = node.getDouble(String.format(frequency_format, i), 0.0);
-					description = node.getString(String.format(description_format, i), null);
-					frequencies[i] = new AltosFrequency(frequency, description);
+						frequency = node.getDouble(String.format(frequency_format, i), 0.0);
+						description = node.getString(String.format(description_format, i), null);
+						frequencies[i] = new AltosFrequency(frequency, description);
+					}
 				}
 			}
 		}
@@ -165,6 +171,12 @@ public class AltosPreferences {
 		return frequencies;
 	}
 
+	public static void save_common_frequencies() {
+		AltosJson	json = new AltosJson(common_frequencies);
+		backend.putString(frequenciesPreference, json.toString());
+		flush_preferences();
+	}
+
 	public static int launcher_serial;
 
 	public static int launcher_channel;
@@ -353,7 +365,7 @@ public class AltosPreferences {
 	public static void set_state(AltosState state) {
 
 		synchronized(backend) {
-			backend.putSerializable(String.format(statePreferenceFormat, state.serial), state);
+			backend.putJson(String.format(statePreferenceFormat, state.serial), state.json());
 			backend.putInt(statePreferenceLatest, state.serial);
 			flush_preferences();
 		}
@@ -378,6 +390,7 @@ public class AltosPreferences {
 	public static void remove_state(int serial) {
 		synchronized(backend) {
 			backend.remove(String.format(statePreferenceFormat, serial));
+			flush_preferences();
 		}
 	}
 
@@ -392,7 +405,7 @@ public class AltosPreferences {
 	public static AltosState state(int serial) {
 		synchronized(backend) {
 			try {
-				return (AltosState) backend.getSerializable(String.format(statePreferenceFormat, serial), null);
+				return AltosState.fromJson(backend.getJson(String.format(statePreferenceFormat, serial)));
 			} catch (Exception e) {
 				return null;
 			}
@@ -512,8 +525,8 @@ public class AltosPreferences {
 	public static void set_common_frequencies(AltosFrequency[] frequencies) {
 		synchronized(backend) {
 			common_frequencies = frequencies;
-			backend.putSerializable(frequenciesPreference, frequencies);
-			flush_preferences();
+
+			save_common_frequencies();
 		}
 	}