From: Keith Packard <keithp@keithp.com>
Date: Mon, 28 Aug 2017 07:10:04 +0000 (-0700)
Subject: altoslib: Fix freq preference loading
X-Git-Tag: 1.8.1~4
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=dacd4c70700041a018b1f8ba47f22071b9600eaf

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>
---

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) {
 		}