summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2017-08-28 00:10:04 -0700
committerKeith Packard <keithp@keithp.com>2017-08-28 00:22:43 -0700
commitdacd4c70700041a018b1f8ba47f22071b9600eaf (patch)
tree5a39729751153b2f79931996b2774a0b12a45431
parent7f5f37ac7fb71d3059f639b39315712f90e9bfd6 (diff)
altoslib: Fix freq preference loading
Allocate throw-away freq array to get the class pointer. Add null-ary AltosFrequency constructor for JSON code. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--altoslib/AltosFrequency.java3
-rw-r--r--altoslib/AltosPreferences.java2
2 files changed, 4 insertions, 1 deletions
diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index 6838be8a..dfe33789 100644
--- a/altoslib/AltosFrequency.java
+++ b/altoslib/AltosFrequency.java
@@ -62,4 +62,7 @@ public class AltosFrequency {
frequency = f;
description = d;
}
+ public AltosFrequency() {
+ this(0, null);
+ }
}
diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index 0c388f1b..c511332b 100644
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -139,7 +139,7 @@ public class AltosPreferences {
try {
AltosJson json = AltosJson.fromString(backend.getString(frequenciesPreference,
null));
- frequencies = (AltosFrequency[]) json.make(frequencies.getClass());
+ frequencies = (AltosFrequency[]) json.make((new AltosFrequency[1]).getClass());
} catch (Exception e) {
}