X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=b26a9bc8d5f56e9d455f459fa74c0a857564ce9b;hp=3a07212a226312995d2d939a4f5ca039b1428a86;hb=7041c386cdf37716f8daf0bc1a9204db620e3de9;hpb=d6445b3739ac2c5dd040efdb97317a6b2a48044a

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 3a07212a..b26a9bc8 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -49,7 +49,7 @@ import android.hardware.usb.*;
 import android.graphics.*;
 import android.graphics.drawable.*;
 
-import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altoslib_9.*;
 
 public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
@@ -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());