From cd7d7cb3dd1b5d48fb7b849b35b95b097dd05f6d Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Wed, 28 Apr 2010 21:53:17 -0700
Subject: [PATCH]   Better error message when we get a null error. Yup.

---
 res/values/strings.xml                            |  3 +++
 src/com/timsu/astrid/utilities/BackupService.java | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ca4df33d2..31d2b540c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -472,6 +472,9 @@ Skipped %d tasks.\n
         <!--  backup failure message (%s -> error message) -->
         <string name="prefs_backup_desc_failure">Last backup failed: %s</string>
         
+        <!--  backup failure error when error message is null -->
+        <string name="prefs_backup_desc_failure_null">Last backup failed, could not read SD card</string>
+        
         <!--  backup success message (%s -> date) -->
         <string name="prefs_backup_desc_success">Latest backup was on %s</string>
         
diff --git a/src/com/timsu/astrid/utilities/BackupService.java b/src/com/timsu/astrid/utilities/BackupService.java
index a212c25e4..4ab989f83 100644
--- a/src/com/timsu/astrid/utilities/BackupService.java
+++ b/src/com/timsu/astrid/utilities/BackupService.java
@@ -57,9 +57,14 @@ public class BackupService extends Service {
                             DateUtilities.getFormattedDate(ctx.getResources(), new Date())));
         } catch (Exception e) {
             // unable to backup.
-            Preferences.setBackupSummary(ctx,
+            if(e == null || e.getMessage() == null) {
+                Preferences.setBackupSummary(ctx,
+                        ctx.getString(R.string.prefs_backup_desc_failure_null));
+            } else {
+                Preferences.setBackupSummary(ctx,
                     ctx.getString(R.string.prefs_backup_desc_failure,
-                            e.getMessage()));
+                            e.toString()));
+            }
         }
     }
 
@@ -71,7 +76,7 @@ public class BackupService extends Service {
         if (!Preferences.isBackupEnabled(ctx)) {
             return;
         }
-        am.setInexactRepeating(AlarmManager.RTC, System.currentTimeMillis() + BACKUP_OFFSET,
+        am.setRepeating(AlarmManager.RTC, System.currentTimeMillis() + 10000,
                 BACKUP_INTERVAL, pendingIntent);
     }