From a6ebce21f303b60b21db7b5e79462b3ebe60e852 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Wed, 22 Jul 2009 03:09:13 -0700
Subject: [PATCH]   Merge 2.8.8.1
 ------------------------------------------------------------ Use
 --include-merges or -n0 to see merged revisions.

---
 AndroidManifest.xml                                   | 2 +-
 src/com/timsu/astrid/sync/SynchronizationService.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9cea654fb..d8b255bf7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.timsu.astrid"
-      android:versionName="2.8.8" android:versionCode="115">
+      android:versionName="2.8.8.1" android:versionCode="116">
       
     <!-- ============================ Metadata ============================ -->   
       
diff --git a/src/com/timsu/astrid/sync/SynchronizationService.java b/src/com/timsu/astrid/sync/SynchronizationService.java
index cdf3fe30f..188f5b54a 100644
--- a/src/com/timsu/astrid/sync/SynchronizationService.java
+++ b/src/com/timsu/astrid/sync/SynchronizationService.java
@@ -95,7 +95,8 @@ public class SynchronizationService extends BroadcastReceiver {
         am.cancel(pendingIntent);
 
         // schedule new
-        am.setInexactRepeating(AlarmManager.RTC, offset, interval, pendingIntent);
+        am.setInexactRepeating(AlarmManager.RTC, System.currentTimeMillis() + offset,
+                interval, pendingIntent);
     }
 
 
@@ -133,6 +134,7 @@ public class SynchronizationService extends BroadcastReceiver {
         long offset = 0;
         if(latestSyncMillis != 0)
             offset = Math.max(0, latestSyncMillis + interval - System.currentTimeMillis());
+
         return offset;
     }