Check for null gps before adding

schollz · May 3, 2018 · 9678b21 · 9678b21
1 parent 761c009
commit 9678b21
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/app/src/main/java/com/internalpositioning/find3/find3app/ScanService.java b/app/src/main/java/com/internalpositioning/find3/find3app/ScanService.java
@@ -302,10 +302,12 @@ public void sendData() {
             if (allowGPS) {
                 JSONObject gps = new JSONObject();
                 Location loc = getLastBestLocation();
-                gps.put("lat",loc.getLatitude());
-                gps.put("lon",loc.getLongitude());
-                gps.put("alt",loc.getAltitude());
-                jsonBody.put("gps",gps);
+                if (loc != null) {
+                    gps.put("lat",loc.getLatitude());
+                    gps.put("lon",loc.getLongitude());
+                    gps.put("alt",loc.getAltitude());
+                    jsonBody.put("gps",gps);
+                }
             }
 
             final String mRequestBody = jsonBody.toString();
@@ -359,9 +361,11 @@ protected Response<String> parseNetworkResponse(NetworkResponse response) {
     private Location getLastBestLocation() {
         LocationManager mLocationManager = (LocationManager)
                 getSystemService(Context.LOCATION_SERVICE);
+
         Location locationGPS = mLocationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
         Location locationNet = mLocationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
 
+
         long GPSLocationTime = 0;
         if (null != locationGPS) {
             GPSLocationTime = locationGPS.getTime();
@@ -374,8 +378,10 @@ private Location getLastBestLocation() {
         }
 
         if (0 < GPSLocationTime - NetLocationTime) {
+            Log.d("GPS",locationGPS.toString());
             return locationGPS;
         } else {
+            Log.d("GPS",locationNet.toString());
             return locationNet;
         }
     }