X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosPreferences.java;h=8e625674840c964ecf6335b1918d58a2e3347807;hb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b;hp=cc340d0342ae8d1e9d8fd910a779dcc7f2876784;hpb=ec20e2f72460010c4f59e6d59775671260e01026;p=fw%2Faltos

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index cc340d03..8e625674 100644
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_10;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -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,42 @@ public class AltosPreferences {
 	static int	map_type;
 
 	public static AltosFrequency[] load_common_frequencies() {
-
 		AltosFrequency[] frequencies = null;
 
-		frequencies = (AltosFrequency[]) backend.getSerializable(frequenciesPreference, null);
+		AltosJson sets;
+
+		try {
+			sets = AltosJson.fromString(backend.getString(frequenciesPreference,null));
+
+			if (sets != null) {
+				ArrayList<AltosFrequency>	freqs = new ArrayList<AltosFrequency>();
+
+				for (int i = 0; i < sets.size(); i++) {
+					AltosFrequency f = AltosFrequency.fromJson(sets.get(i), null);
+					if (f != null)
+						freqs.add(f);
+				}
+				frequencies = freqs.toArray(new AltosFrequency[0]);
+			}
+		} catch (Exception e) {
+			sets = null;
+		}
 
 		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 +183,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;
@@ -350,12 +374,12 @@ public class AltosPreferences {
 		}
 	}
 
-	public static void set_state(int serial, AltosState state, AltosListenerState listener_state) {
+	public static void set_state(AltosState state) {
 
 		synchronized(backend) {
-			backend.putSerializable(String.format(statePreferenceFormat, serial),
-						new AltosSavedState(state, listener_state));
-			backend.putInt(statePreferenceLatest, serial);
+			backend.putJson(String.format(statePreferenceFormat, state.serial), state.json());
+			backend.putInt(statePreferenceLatest, state.serial);
+			flush_preferences();
 		}
 	}
 
@@ -378,6 +402,7 @@ public class AltosPreferences {
 	public static void remove_state(int serial) {
 		synchronized(backend) {
 			backend.remove(String.format(statePreferenceFormat, serial));
+			flush_preferences();
 		}
 	}
 
@@ -389,9 +414,13 @@ public class AltosPreferences {
 		return latest;
 	}
 
-	public static AltosSavedState state(int serial) {
+	public static AltosState state(int serial) {
 		synchronized(backend) {
-			return (AltosSavedState) backend.getSerializable(String.format(statePreferenceFormat, serial), null);
+			try {
+				return AltosState.fromJson(backend.getJson(String.format(statePreferenceFormat, serial)));
+			} catch (Exception e) {
+				return null;
+			}
 		}
 	}
 
@@ -508,8 +537,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();
 		}
 	}