altoslib: Switch preserved state format to JSON

[fw/altos] / altoslib / AltosPreferences.java

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index f8101ce607e43024283ccc90dc9c04c8ac6f8064..8e625674840c964ecf6335b1918d58a2e3347807 100644 (file)
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -133,19 +133,25 @@ public class AltosPreferences {
        static int      map_type;
 
        public static AltosFrequency[] load_common_frequencies() {
-
                AltosFrequency[] frequencies = null;
 
+               AltosJson sets;
+
                try {
-                       AltosHashSet[]  sets = AltosHashSet.array(backend.getString(frequenciesPreference,null));
+                       sets = AltosJson.fromString(backend.getString(frequenciesPreference,null));
+
                        if (sets != null) {
-                               frequencies = new AltosFrequency[sets.length];
-                               for (int i = 0; i < frequencies.length; i++)
-                                       frequencies[i] = new AltosFrequency(sets[i]);
-                       }
+                               ArrayList<AltosFrequency>       freqs = new ArrayList<AltosFrequency>();
 
-               } catch (IOException ie) {
-                       frequencies = null;
+                               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) {
@@ -153,14 +159,16 @@ public class AltosPreferences {
                                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);
+                                       }
                                }
                        }
                }
@@ -176,13 +184,8 @@ public class AltosPreferences {
        }
 
        public static void save_common_frequencies() {
-               try {
-                       AltosHashSet[]  sets = new AltosHashSet[common_frequencies.length];
-                       for (int i = 0; i < sets.length; i++)
-                               sets[i] = common_frequencies[i].hashSet();
-                       backend.putString(frequenciesPreference, AltosHashSet.toString(sets));
-               } catch (IOException ie) {
-               }
+               AltosJson       json = new AltosJson(common_frequencies);
+               backend.putString(frequenciesPreference, json.toString());
                flush_preferences();
        }
 
@@ -374,7 +377,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();
                }
@@ -399,6 +402,7 @@ public class AltosPreferences {
        public static void remove_state(int serial) {
                synchronized(backend) {
                        backend.remove(String.format(statePreferenceFormat, serial));
+                       flush_preferences();
                }
        }
 
@@ -413,7 +417,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;
                        }