altosdroid: cal_data is no longer public from AltosState

Use cal_data() method instead.

Signed-off-by: Keith Packard <keithp@keithp.com>

5 files changed, 19 insertions, 19 deletions

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index f648142f..924ab4c9 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -70,9 +70,9 @@ class SavedState {
 			locked = state.gps.locked;
 		else
 			locked = false;
-		callsign = state.cal_data.callsign;
-		serial = state.cal_data.serial;
-		flight = state.cal_data.flight;
+		callsign = state.cal_data().callsign;
+		serial = state.cal_data().serial;
+		flight = state.cal_data().flight;
 		rssi = state.rssi;
 	}
 }
@@ -484,20 +484,20 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 								     state.gps.alt);
 			}
 
-			if (saved_state == null || !same_string(saved_state.callsign, state.cal_data.callsign)) {
-				mCallsignView.setText(state.cal_data.callsign);
+			if (saved_state == null || !same_string(saved_state.callsign, state.cal_data().callsign)) {
+				mCallsignView.setText(state.cal_data().callsign);
 			}
-			if (saved_state == null || state.cal_data.serial != saved_state.serial) {
-				if (state.cal_data.serial == AltosLib.MISSING)
+			if (saved_state == null || state.cal_data().serial != saved_state.serial) {
+				if (state.cal_data().serial == AltosLib.MISSING)
 					mSerialView.setText("");
 				else
-					mSerialView.setText(String.format("%d", state.cal_data.serial));
+					mSerialView.setText(String.format("%d", state.cal_data().serial));
 			}
-			if (saved_state == null || state.cal_data.flight != saved_state.flight) {
-				if (state.cal_data.flight == AltosLib.MISSING)
+			if (saved_state == null || state.cal_data().flight != saved_state.flight) {
+				if (state.cal_data().flight == AltosLib.MISSING)
 					mFlightView.setText("");
 				else
-					mFlightView.setText(String.format("%d", state.cal_data.flight));
+					mFlightView.setText(String.format("%d", state.cal_data().flight));
 			}
 			if (saved_state == null || state.state() != saved_state.state) {
 				if (state.state() == AltosLib.ao_flight_stateless) {
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index 9909ba7f..2a728cf7 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -477,11 +477,11 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 				if (t_state.gps != null) {
 					AltosLatLon	latlon = new AltosLatLon(t_state.gps.lat, t_state.gps.lon);
 					rocket.set_position(latlon, t_state.received_time);
-					if (state.cal_data.serial == serial)
+					if (state.cal_data().serial == serial)
 						there = latlon;
 				}
 				if (state != null)
-					rocket.set_active(state.cal_data.serial == serial);
+					rocket.set_active(state.cal_data().serial == serial);
 			}
 		}
 		if (receiver != null) {
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index b85f0274..fedfdb52 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -294,7 +294,7 @@ public class AltosVoice {
 		int	tell_serial = last_tell_serial;
 
 		if (state != null)
-			tell_serial = state.cal_data.serial;
+			tell_serial = state.cal_data().serial;
 
 		if (tell_serial != last_tell_serial)
 			reset_last();
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 6fdd39dc..ba5afba5 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -191,7 +191,7 @@ public class TabPad extends AltosDroidTab {
 				ignite_lights[i].set(voltage >= AltosLib.ao_igniter_good, voltage == AltosLib.MISSING);
 			}
 
-			if (state.cal_data.flight != 0) {
+			if (state.cal_data().flight != 0) {
 				if (state.state() <= AltosLib.ao_flight_pad)
 					data_logging_view.setText("Ready to record");
 				else if (state.state() < AltosLib.ao_flight_landed)
@@ -201,7 +201,7 @@ public class TabPad extends AltosDroidTab {
 			} else {
 				data_logging_view.setText("Storage full");
 			}
-			data_logging_lights.set(state.cal_data.flight != 0, state.cal_data.flight == AltosLib.MISSING);
+			data_logging_lights.set(state.cal_data().flight != 0, state.cal_data().flight == AltosLib.MISSING);
 
 			if (state.gps != null) {
 				int soln = state.gps.nsat;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index f976e05c..caf288a0 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -263,7 +263,7 @@ public class TelemetryService extends Service implements AltosIdleMonitorListene
 			state = telemetry_state.states.get(telem.serial());
 		else
 			state = new AltosState(new AltosCalData());
-		telem.provide_data(state, state.cal_data);
+		telem.provide_data(state);
 		telemetry_state.states.put(telem.serial(), state);
 		telemetry_state.quiet = false;
 		if (state != null) {
@@ -628,7 +628,7 @@ public class TelemetryService extends Service implements AltosIdleMonitorListene
 
 				AltosDebug.debug("recovered old state serial %d flight %d",
 						 serial,
-						 saved_state.cal_data.flight);
+						 saved_state.cal_data().flight);
 				if (saved_state.gps != null)
 					AltosDebug.debug("\tposition %f,%f",
 							 saved_state.gps.lat,
@@ -702,7 +702,7 @@ public class TelemetryService extends Service implements AltosIdleMonitorListene
 
 	/* AltosIdleMonitorListener */
 	public void update(AltosState state, AltosListenerState listener_state)	{
-		telemetry_state.states.put(state.cal_data.serial, state);
+		telemetry_state.states.put(state.cal_data().serial, state);
 		telemetry_state.receiver_battery = listener_state.battery;
 		send_to_clients();
 	}