From 3d8bcf4c959b81e5172e9b6071641d0a2216b6b4 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 24 May 2011 16:29:04 -0700
Subject: [PATCH] Fix for more crashes encountered

---
 .../com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java     | 2 ++
 .../rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java  | 5 +----
 astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java     | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
index 4f20ed7ba..fe28c2891 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
@@ -144,6 +144,8 @@ public class GtasksTaskListUpdater {
     private void traverseTreeAndWriteValues(Node node, AtomicInteger order, int indent) {
         if(node.taskId != -1) {
             Metadata metadata = gtasksMetadataService.getTaskMetadata(node.taskId);
+            if(metadata == null)
+                metadata = GtasksMetadata.createEmptyMetadata(node.taskId);
             metadata.setValue(GtasksMetadata.ORDER, order.getAndIncrement());
             metadata.setValue(GtasksMetadata.INDENT, indent);
             metadata.setValue(GtasksMetadata.PARENT_TASK, node.parent.taskId);
diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java
index 4152155a5..e9f23a788 100644
--- a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java
+++ b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java
@@ -34,13 +34,10 @@ public class MilkDetailExposer extends BroadcastReceiver {
     @Autowired private MilkMetadataService milkMetadataService;
     @Autowired private MilkListService milkListService;
 
-    static {
-        MilkDependencyInjector.initialize();
-    }
-
     @Override
     public void onReceive(Context context, Intent intent) {
         ContextManager.setContext(context);
+        MilkDependencyInjector.initialize();
         DependencyInjectionService.getInstance().inject(this);
 
         // if we aren't logged in, don't expose features
diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
index cb17a09d0..94587a6f3 100644
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -382,6 +382,8 @@ public class FilterAdapter extends BaseExpandableListAdapter {
 
     public void populateView(ViewHolder viewHolder, boolean isChild, boolean isExpanded) {
         FilterListItem filter = viewHolder.item;
+        if(filter == null)
+            return;
 
         viewHolder.view.setBackgroundResource(0);
         viewHolder.expander.setVisibility(View.GONE);