diff options
| author | Keith Packard <keithp@keithp.com> | 2017-06-27 21:33:36 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2017-06-27 21:33:36 -0700 |
| commit | 5a174f4a2caae97b5038eb92ab85303e736b7c2e (patch) | |
| tree | 72d4f1b3ca77245a1879c5c5dae3b95b70978e6b /altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | |
| parent | 6dbb362b2d1df4d8c2d301e90624aceef8051ef5 (diff) | |
altosdroid: cal_data is no longer public from AltosState
Use cal_data() method instead.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java')
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 22 |
1 files changed, 11 insertions, 11 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) { |