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>

3 files changed, 12 insertions, 12 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());
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index 325b89d2..ce3b57af 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -186,9 +186,9 @@ public class AltosVoice {
 		if (last_tell_mode != TELL_MODE_FLIGHT)
 			last_flight_tell = TELL_FLIGHT_NONE;
 
-		if (state.state != last_state && AltosLib.ao_flight_boost <= state.state && state.state <= AltosLib.ao_flight_landed) {
+		if (state.state() != last_state && AltosLib.ao_flight_boost <= state.state() && state.state() <= AltosLib.ao_flight_landed) {
 			speak(state.state_name());
-			if (descending(state.state) && !descending(last_state)) {
+			if (descending(state.state()) && !descending(last_state)) {
 				if (state.max_height() != AltosLib.MISSING) {
 					speak("max height: %s.",
 					      AltosConvert.height.say_units(state.max_height()));
@@ -211,7 +211,7 @@ public class AltosVoice {
 		if (last_flight_tell == TELL_FLIGHT_NONE || last_flight_tell == TELL_FLIGHT_STATE || last_flight_tell == TELL_FLIGHT_TRACK) {
 			last_flight_tell = TELL_FLIGHT_SPEED;
 
-			if (state.state <= AltosLib.ao_flight_coast) {
+			if (state.state() <= AltosLib.ao_flight_coast) {
 				speed = state.speed();
 			} else {
 				speed = state.gps_speed();
@@ -312,7 +312,7 @@ public class AltosVoice {
 			last_tell_mode = tell_mode;
 			last_tell_serial = tell_serial;
 			if (state != null) {
-				last_state = state.state;
+				last_state = state.state();
 				last_height = state.height();
 				if (state.gps != null)
 					last_gps = state.gps;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 4d04316f..82e89bb0 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -191,9 +191,9 @@ public class TabPad extends AltosDroidTab {
 			}
 
 			if (state.flight != 0) {
-				if (state.state <= AltosLib.ao_flight_pad)
+				if (state.state() <= AltosLib.ao_flight_pad)
 					data_logging_view.setText("Ready to record");
-				else if (state.state < AltosLib.ao_flight_landed)
+				else if (state.state() < AltosLib.ao_flight_landed)
 					data_logging_view.setText("Recording data");
 				else
 					data_logging_view.setText("Recorded data");