From 61f014358bfc3b89f665f87945e77fd1cbc691f8 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Sat, 14 Aug 2010 13:19:32 -0700
Subject: [PATCH] Fix for AST-240 - random force closes while using other
 applications (background sync NPE)

---
 .../astrid/producteev/ProducteevBackgroundService.java      | 6 +++++-
 .../com/todoroo/astrid/rmilk/MilkBackgroundService.java     | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevBackgroundService.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevBackgroundService.java
index 05bea95cd..dffa47776 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevBackgroundService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevBackgroundService.java
@@ -11,6 +11,7 @@ import android.util.Log;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.DateUtilities;
+import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.producteev.sync.ProducteevSyncProvider;
 import com.todoroo.astrid.utility.Preferences;
 
@@ -35,8 +36,11 @@ public class ProducteevBackgroundService extends Service {
     /** Receive the alarm - start the synchronize service! */
     @Override
     public void onStart(Intent intent, int startId) {
-        if(intent != null && SYNC_ACTION.equals(intent.getAction()))
+        try {
             startSynchronization(this);
+        } catch (Exception e) {
+            PluginServices.getExceptionService().reportError("pdv-bg-sync", e); //$NON-NLS-1$
+        }
     }
 
     /** Start the actual synchronization */
diff --git a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkBackgroundService.java b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkBackgroundService.java
index 50144084a..f1a6844a0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkBackgroundService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkBackgroundService.java
@@ -11,6 +11,7 @@ import android.util.Log;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.DateUtilities;
+import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.rmilk.sync.RTMSyncProvider;
 import com.todoroo.astrid.utility.Preferences;
 
@@ -35,8 +36,11 @@ public class MilkBackgroundService extends Service {
     /** Receive the alarm - start the synchronize service! */
     @Override
     public void onStart(Intent intent, int startId) {
-        if(SYNC_ACTION.equals(intent.getAction()))
+        try {
             startSynchronization(this);
+        } catch (Exception e) {
+            PluginServices.getExceptionService().reportError("rtm-bg-sync", e); //$NON-NLS-1$
+        }
     }
 
     /** Start the actual synchronization */