X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=924ab4c9350a4564bdcb532b04e47777ead16bef;hp=f648142f9eff0de1fdde95fa2d94963655e1f054;hb=5a174f4a2caae97b5038eb92ab85303e736b7c2e;hpb=6dbb362b2d1df4d8c2d301e90624aceef8051ef5

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