Merge branch 'branch-1.6' into debian

Conflicts:
	ChangeLog
	altoslib/AltosTelemetryReader.java
	configure.ac

1 files changed, 5 insertions, 2 deletions

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index f6cceac9..53963f25 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -52,7 +52,7 @@ import android.widget.Toast;
 import android.app.AlertDialog;
 import android.location.Location;
 
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_6.*;
 
 public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	// Debugging
@@ -337,7 +337,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 			}
 			if (saved_state == null || state.flight != saved_state.flight) {
 				Log.d(TAG, "update flight");
-				mFlightView.setText(String.format("%d", state.flight));
+				if (state.flight == AltosLib.MISSING)
+					mFlightView.setText("");
+				else
+					mFlightView.setText(String.format("%d", state.flight));
 			}
 			if (saved_state == null || state.state != saved_state.state) {
 				Log.d(TAG, "update state");