X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=92287476b7dbf56fc654c408e5ddeb8c5ba41fd4;hb=93e66b4911b7285f9095712ef746571153c3f088;hp=ebbe9330867ae515aa8b91022f6ebd945da284bb;hpb=7701e142f9e3a81c536c546c9a0abfb3ba709abc;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index ebbe9330..92287476 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -49,7 +49,7 @@ import android.widget.Toast;
 import android.app.AlertDialog;
 import android.location.Location;
 
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 
 public class AltosDroid extends FragmentActivity {
 	// Debugging
@@ -147,7 +147,7 @@ public class AltosDroid extends FragmentActivity {
 			case MSG_CRC_ERROR:
 			case MSG_UPDATE_AGE:
 				if (ad.saved_state != null) {
-					ad.mAgeView.setText(String.format("%d", (System.currentTimeMillis() - ad.saved_state.report_time + 500) / 1000));
+					ad.mAgeView.setText(String.format("%d", (System.currentTimeMillis() - ad.saved_state.received_time + 500) / 1000));
 				}
 				break;
 			}
@@ -243,11 +243,11 @@ public class AltosDroid extends FragmentActivity {
 		}
 
 		if (state != null) {
-			mCallsignView.setText(state.data.callsign);
-			mSerialView.setText(String.format("%d", state.data.serial));
-			mFlightView.setText(String.format("%d", state.data.flight));
-			mStateView.setText(state.data.state());
-			mRSSIView.setText(String.format("%d", state.data.rssi));
+			mCallsignView.setText(state.callsign);
+			mSerialView.setText(String.format("%d", state.serial));
+			mFlightView.setText(String.format("%d", state.flight));
+			mStateView.setText(state.state_name());
+			mRSSIView.setText(String.format("%d", state.rssi));
 		}
 
 		for (AltosDroidTab mTab : mTabs)
@@ -266,7 +266,7 @@ public class AltosDroid extends FragmentActivity {
 
 	static String pos(double p, String pos, String neg) {
 		String	h = pos;
-		if (p == AltosRecord.MISSING)
+		if (p == AltosLib.MISSING)
 			return "";
 		if (p < 0) {
 			h = neg;
@@ -278,13 +278,13 @@ public class AltosDroid extends FragmentActivity {
 	}
 
 	static String number(String format, double value) {
-		if (value == AltosRecord.MISSING)
+		if (value == AltosLib.MISSING)
 			return "";
 		return String.format(format, value);
 	}
 
 	static String integer(String format, int value) {
-		if (value == AltosRecord.MISSING)
+		if (value == AltosLib.MISSING)
 			return "";
 		return String.format(format, value);
 	}
@@ -414,7 +414,7 @@ public class AltosDroid extends FragmentActivity {
 		super.onDestroy();
 		if(D) Log.e(TAG, "--- ON DESTROY ---");
 
-		mAltosVoice.stop();
+		if (mAltosVoice != null) mAltosVoice.stop();
 	}
 
 	public void onActivityResult(int requestCode, int resultCode, Intent data) {