Fixed a bunch of crashes experienced in the field. Bumped version to 3.0.2

astrid/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="3.0.1" android:versionCode="140"
+          android:versionName="3.0.2" android:versionCode="141"
           android:installLocation="auto">
       
   <!-- ================================================== Used Permissions = -->

astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java

@@ -14,6 +14,7 @@ import android.os.IBinder;
 import android.util.Log;
 
 import com.timsu.astrid.R;
+import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.astrid.utility.Preferences;
 
 /**
@@ -44,6 +45,7 @@ public class BackupService extends Service {
     @Override
     public void onStart(Intent intent, int startId) {
         if (intent.getAction().equals(BACKUP_ACTION)) {
+            ContextManager.setContext(this);
             startBackup(this);
         }
     }

astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java

@@ -16,8 +16,8 @@ import android.widget.Toast;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property;
-import com.todoroo.andlib.data.Property.PropertyVisitor;
 import com.todoroo.andlib.data.TodorooCursor;
+import com.todoroo.andlib.data.Property.PropertyVisitor;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
@@ -271,6 +271,7 @@ public class TasksXmlExporter {
                         context.getResources().getQuantityString(R.plurals.Ntasks, exportCount,
                                 exportCount), outputFile);
                 Toast.makeText(context, text, Toast.LENGTH_LONG).show();
+                if(progressDialog.isShowing())
                     progressDialog.dismiss();
             }
         });

astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java

@@ -23,8 +23,8 @@ import com.google.ical.values.RRule;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property;
-import com.todoroo.andlib.data.Property.PropertyVisitor;
 import com.todoroo.andlib.data.TodorooCursor;
+import com.todoroo.andlib.data.Property.PropertyVisitor;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.sql.Criterion;
@@ -33,8 +33,8 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.legacy.LegacyImportance;
 import com.todoroo.astrid.legacy.LegacyRepeatInfo;
-import com.todoroo.astrid.legacy.LegacyRepeatInfo.LegacyRepeatInterval;
 import com.todoroo.astrid.legacy.LegacyTaskModel;
+import com.todoroo.astrid.legacy.LegacyRepeatInfo.LegacyRepeatInterval;
 import com.todoroo.astrid.model.Metadata;
 import com.todoroo.astrid.model.Task;
 import com.todoroo.astrid.rmilk.data.MilkTask;
@@ -146,6 +146,7 @@ public class TasksXmlImporter {
             handler.post(new Runnable() {
                 @Override
                 public void run() {
+                    if(progressDialog.isShowing())
                         progressDialog.dismiss();
                     showSummary();
                 }

astrid/plugin-src/com/todoroo/astrid/reminders/ReminderStartupReceiver.java

@@ -4,7 +4,10 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
+import com.todoroo.andlib.service.DependencyInjectionService;
+import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 
 /**
@@ -21,10 +24,18 @@ public class ReminderStartupReceiver extends BroadcastReceiver {
 
     // --- system startup
 
+    @Autowired
+    ExceptionService exceptionService;
+
     @Override
     /** Called when the system is started up */
     public void onReceive(Context context, Intent intent) {
         ContextManager.setContext(context);
+        try {
             ReminderService.getInstance().scheduleAllAlarms();
+        } catch (Exception e) {
+            DependencyInjectionService.getInstance().inject(this);
+            exceptionService.reportError("reminder-startup", e); //$NON-NLS-1$
+        }
     }
 }

astrid/res/values/strings-reminders.xml

@@ -10,7 +10,7 @@
   <string name="TEA_reminder_label">Remind me...</string>
 
   <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">... when it\'s time to start the task</string>
+  <string name="TEA_reminder_due">... when task is due</string>
 
   <!-- Task Edit: Reminder after deadline -->  
   <string name="TEA_reminder_overdue">... when task is overdue</string>

astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java

@@ -158,7 +158,11 @@ public class FilterAdapter extends BaseExpandableListAdapter {
             ViewGroup parent) {
         convertView = newView(convertView, parent);
         ViewHolder viewHolder = (ViewHolder) convertView.getTag();
-        viewHolder.item = (FilterListItem) getGroup(groupPosition);
+        Object groupItem = getGroup(groupPosition);
+        if(!(groupItem instanceof FilterListItem))
+            return convertView;
+
+        viewHolder.item = (FilterListItem) groupItem;
         populateView(viewHolder, false, isExpanded);
         return convertView;
     }

astrid/src/com/todoroo/astrid/service/UpgradeService.java

@@ -74,11 +74,12 @@ public final class UpgradeService {
                     "and easier to use. Hope you like it!",
             });
         if(from > 135 && from <= 140)
-            newVersionString(changeLog, "3.0.1 (8/4/10)", new String[] {
+            newVersionString(changeLog, "3.0.2 (8/4/10)", new String[] {
                     "Upgrade note: if you are missing old repeating tasks, " +
                     "search for them, there was a bug where they were marked " +
-                    "as completed. This update also fixes widget issues with" +
-                    "Android 1.5. Thanks for your patience!",
+                    "as completed.",
+                    "This update also fixes widget issues with Android 1.5. ",
+                    "Thanks for your patience!",
             });
 
         if(changeLog.length() == 0)

astrid/src/com/todoroo/astrid/widget/TasksWidget.java

@@ -43,10 +43,14 @@ public class TasksWidget extends AppWidgetProvider {
     public void onUpdate(Context context, AppWidgetManager appWidgetManager,
             int[] appWidgetIds) {
 
+        try {
             super.onUpdate(context, appWidgetManager, appWidgetIds);
 
             // Start in service to prevent Application Not Responding timeout
             context.startService(new Intent(context, UpdateService.class));
+        } catch (SecurityException e) {
+            // :(
+        }
     }
 
     public static class UpdateService extends Service {