diff options
| author | Keith Packard <keithp@keithp.com> | 2015-09-21 06:32:52 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-10-13 13:54:28 -0700 |
| commit | 431c713389dc819d2433d893c898ff82c7941722 (patch) | |
| tree | 385a6d3ec6276744752bcc3fae8310ec045d9645 /altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | |
| parent | c1dec3bec0789e8934a6e13fd117931ba468b318 (diff) | |
altoslib: Clean up remaining direct AltosState.state users
This value has been hidden to avoid having it written accidentally;
there were a few more bits of code using it though.
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 3a07212a..1a27e4eb 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -386,12 +386,12 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener { AltosGreatCircle from_receiver = null; if (saved_state != null) - prev_state = saved_state.state; + prev_state = saved_state.state(); if (state != null) { set_screen_on(state_age(state)); - if (state.state == AltosLib.ao_flight_stateless) { + if (state.state() == AltosLib.ao_flight_stateless) { boolean prev_locked = false; boolean locked = false; @@ -408,9 +408,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener { } } } else { - if (prev_state != state.state) { + if (prev_state != state.state()) { String currentTab = mTabHost.getCurrentTabTag(); - switch (state.state) { + switch (state.state()) { case AltosLib.ao_flight_boost: if (currentTab.equals(tab_pad_name)) mTabHost.setCurrentTabByTag(tab_flight_name); break; @@ -448,8 +448,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener { else mFlightView.setText(String.format("%d", state.flight)); } - if (saved_state == null || state.state != saved_state.state) { - if (state.state == AltosLib.ao_flight_stateless) { + if (saved_state == null || state.state() != saved_state.state()) { + if (state.state() == AltosLib.ao_flight_stateless) { mStateLayout.setVisibility(View.GONE); } else { mStateView.setText(state.state_name()); |