altosdroid: Check state.gps != null before using it

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / TabDescent.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
index b0c6539cf48a29673b36b5c68b5ec6ef75d16ce2..698e89fc83474c26caf62492be0f89ba0f5a79f7 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
@@ -27,6 +27,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.location.Location;
 
 public class TabDescent extends Fragment implements AltosDroidTab {
        AltosDroid mAltosDroid;
@@ -88,7 +89,7 @@ public class TabDescent extends Fragment implements AltosDroidTab {
                mAltosDroid = null;
        }
 
-       public void update_ui(AltosState state, AltosGreatCircle from_receiver) {
+       public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
                mSpeedView.setText(String.format("%6.0f m/s", state.speed()));
                mHeightView.setText(String.format("%6.0f m", state.height));
                if (from_receiver != null) {
@@ -104,8 +105,10 @@ public class TabDescent extends Fragment implements AltosDroidTab {
                        mCompassView.setText("<unknown>");
                        mDistanceView.setText("<unknown>");
                }
-               mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-               mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+               if (state.gps != null) {
+                       mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
+                       mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+               }
 
                mApogeeVoltageView.setText(String.format("%4.2f V", state.drogue_sense));
                mApogeeLights.set(state.drogue_sense > 3.2);