fixed when service crashed during/after a detection and no choice was taken

5d40ba74 · Florian · 22e7b7d8 · 5d40ba74
Commit 5d40ba74 authored May 29, 2018 by Florian
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java ...l/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java +6 -1

No files found.
--- a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java
+++ b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java
@@ -139,7 +139,12 @@ public class Location {

    public double[] getDetectedDBEntry(){
        if(positionLatest[0]==detectedSignalPosition[0]&&positionLatest[1]==detectedSignalPosition[1]){
-            detectedSignalPosition = locationData.getDetectedLocation();
+            if(locationData!=null) {
+                detectedSignalPosition = locationData.getDetectedLocation();
+            }else{
+                detectedSignalPosition[0] = 0;
+                detectedSignalPosition[1] = 0;
+            }
        }
        return detectedSignalPosition;
    }