Fixed #283, #279, Crash when geofence was entered and no location ava…

…ilable
gadgethome · Jan 20, 2014 · 0a9448b · 0a9448b
1 parent ecc54f8
commit 0a9448b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/apps/android/AndroidManifest.xml b/apps/android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="st.alr.mqttitude"
-    android:versionCode="0409"
-    android:versionName="0.4.09	" >
+    android:versionCode="0410"
+    android:versionName="0.4.10	" >
 
     <uses-feature
         android:glEsVersion="0x00020000"

diff --git a/apps/android/apk/mqttitude.apk b/apps/android/apk/mqttitude.apk
diff --git a/apps/android/src/st/alr/mqttitude/services/ServiceLocator.java b/apps/android/src/st/alr/mqttitude/services/ServiceLocator.java
@@ -273,7 +273,8 @@ private void publishGeofenceTransitionEvent(Waypoint w, int transition) {
         l.setLatitude(w.getLatitude());
         l.setLongitude(w.getLongitude());
         l.setAccuracy(w.getRadius());
-        l.setTime(new Date().getTime());
+        l.getLocation().setTime(new Date().getTime()/1000);
+     //   l.setTime(new Date().getTime());
 
         LocationMessage r = new LocationMessage(l);
 

diff --git a/apps/android/src/st/alr/mqttitude/services/ServiceProxy.java b/apps/android/src/st/alr/mqttitude/services/ServiceProxy.java
@@ -118,7 +118,7 @@ public static PendingIntent getPendingIntentForService(Context c, String targetS
             i.putExtras(extras); 
         i.putExtra("srvID", targetServiceId);
 
-        return PendingIntent.getService(c, ++intentCounter, i, flags);                
+        return PendingIntent.getService(c, 0, i, flags);                
 
     }
 }