From: Keith Packard <keithp@keithp.com>
Date: Wed, 17 Apr 2013 17:38:54 +0000 (-0700)
Subject: altosdroid: Fix integer formatting in tabs
X-Git-Tag: altosdroid_v1.2-1~9^2~9
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=b3000609e4010ff4d29debe72ea1866e775af539

altosdroid: Fix integer formatting in tabs

Was trying to use AltosDroid.number for integers, which didn't work as
it expected doubles.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 917d64d6..18f364fa 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -282,6 +282,12 @@ public class AltosDroid extends FragmentActivity {
 		return String.format(format, value);
 	}
 
+	static String integer(String format, int value) {
+		if (value == AltosRecord.MISSING)
+			return "";
+		return String.format(format, value);
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 8b3c4012..066c1353 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -122,15 +122,15 @@ public class TabPad extends Fragment implements AltosDroidTab {
 			} else {
 				mDataLoggingView.setText("Storage full");
 			}
-			mDataLoggingLights.set(state.data.flight != 0, state.data.flight != AltosRecord.MISSING);
+			mDataLoggingLights.set(state.data.flight != 0, state.data.flight == AltosRecord.MISSING);
 
 			if (state.gps != null) {
-				mGPSLockedView.setText(AltosDroid.number("%4d sats", state.gps.nsat));
+				mGPSLockedView.setText(AltosDroid.integer("%4d sats", state.gps.nsat));
 				mGPSLockedLights.set(state.gps.locked && state.gps.nsat >= 4, false);
 				if (state.gps_ready)
 					mGPSReadyView.setText("Ready");
 				else
-					mGPSReadyView.setText(AltosDroid.number("Waiting %d", state.gps_waiting));
+					mGPSReadyView.setText(AltosDroid.integer("Waiting %d", state.gps_waiting));
 			} else
 				mGPSLockedLights.set(false, true);
 			mGPSReadyLights.set(state.gps_ready, state.gps == null);