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 917d64d603a6663816f2cc6894b80a53fe76df9b..18f364fa5239725df6a5057c2a38715e1527cdfc 100644 (file)
--- 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 8b3c401290055006cd7332652265b3d7e09d470e..066c1353ef792a87896a18a3522d9623725a0e2d 100644 (file)
--- 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);