From 63cc38df24526d5776626351f4bc50df69306ea9 Mon Sep 17 00:00:00 2001
From: Arne Jans <arne.jans@gmail.com>
Date: Tue, 10 Jan 2012 12:07:27 +0100
Subject: [PATCH] Fixed Phone: Pressing a filter-item sometimes crashes with
 NPE

---
 .../activity/FilterListWrapperActivity.java     | 15 ++++++++++++---
 .../activity/TaskEditWrapperActivity.java       | 17 +++++++++++++----
 .../activity/TaskListWrapperActivity.java       | 15 ++++++++++++---
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java
index a3c90ee40..0c494c7d6 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java
@@ -17,14 +17,23 @@ public class FilterListWrapperActivity extends AstridWrapperActivity {
         ThemeService.applyTheme(this);
 		super.onCreate(savedInstanceState);
         setContentView(R.layout.filter_list_wrapper_activity);
+	}
+
+    /* (non-Javadoc)
+     * @see android.support.v4.app.FragmentActivity#onResume()
+     */
+    @Override
+    protected void onResume() {
+        super.onResume();
 
         Fragment frag = (Fragment) getSupportFragmentManager()
                 .findFragmentById(R.id.tasklist_fragment);
-        if (frag != null)
-        {
+        if (frag != null && frag.isInLayout()) {
             mMultipleFragments = true;
+        } else {
+            mMultipleFragments = false;
         }
-	}
+    }
 
     @Override
     public void setTitle(CharSequence title) {
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java
index 52862a082..5deafd83d 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java
@@ -16,14 +16,23 @@ public class TaskEditWrapperActivity extends AstridWrapperActivity {
         ThemeService.applyTheme(this);
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.task_edit_wrapper_activity);
+	}
+
+    /* (non-Javadoc)
+     * @see android.support.v4.app.FragmentActivity#onResume()
+     */
+    @Override
+    protected void onResume() {
+        super.onResume();
 
         Fragment frag = (Fragment) getSupportFragmentManager()
-                .findFragmentById(R.id.taskedit_fragment);
-        if (frag != null)
-        {
+                .findFragmentById(R.id.tasklist_fragment);
+        if (frag != null) {
             mMultipleFragments = true;
+        } else {
+            mMultipleFragments = false;
         }
-	}
+    }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
index 5000125f0..9c31a8b09 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
@@ -16,14 +16,23 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
         ThemeService.applyTheme(this);
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.task_list_wrapper_activity);
+	}
+
+    /* (non-Javadoc)
+     * @see android.support.v4.app.FragmentActivity#onResume()
+     */
+    @Override
+    protected void onResume() {
+        super.onResume();
 
         Fragment frag = (Fragment) getSupportFragmentManager()
                 .findFragmentById(R.id.filterlist_fragment);
-        if (frag != null && frag.isInLayout())
-        {
+        if (frag != null && frag.isInLayout()) {
             mMultipleFragments = true;
+        } else {
+            mMultipleFragments = false;
         }
-	}
+    }
 
     @Override
     public void setTitle(CharSequence title) {