From 872ae3edf1476ef470252ca95d6c707327bb8611 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 9 Apr 2012 14:48:23 -0700
Subject: [PATCH] Fixed bug where rotation would lose subtasks setting

---
 .../astrid/activity/AstridActivity.java        | 18 ++++++++++++------
 .../astrid/activity/TaskListActivity.java      |  9 ---------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
index 7ac64277b..ba06de60b 100644
--- a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
@@ -201,12 +201,8 @@ public class AstridActivity extends FragmentActivity
     public void setupTasklistFragmentWithFilter(Filter filter, Bundle extras) {
         Class<?> customTaskList = TaskListFragment.class;
 
-        if(filter == null || CoreFilterExposer.isInbox(filter)) {
-            SharedPreferences publicPrefs = AstridPreferences.getPublicPrefs(this);
-            int sortFlags = publicPrefs.getInt(SortHelper.PREF_SORT_FLAGS, 0);
-            if(SortHelper.isManualSort(sortFlags))
-                customTaskList = SubtasksListFragment.class;
-        }
+        if (shouldUseSubtasksFragmentForFilter(filter))
+            customTaskList = SubtasksListFragment.class;
 
         setupTasklistFragmentWithFilterAndCustomTaskList(filter, extras, customTaskList);
     }
@@ -232,6 +228,16 @@ public class AstridActivity extends FragmentActivity
         }
     }
 
+    public boolean shouldUseSubtasksFragmentForFilter(Filter filter) {
+        if(filter == null || CoreFilterExposer.isInbox(filter)) {
+            SharedPreferences publicPrefs = AstridPreferences.getPublicPrefs(this);
+            int sortFlags = publicPrefs.getInt(SortHelper.PREF_SORT_FLAGS, 0);
+            if(SortHelper.isManualSort(sortFlags))
+                return true;
+        }
+        return false;
+    }
+
     @Override
     public void onTaskListItemClicked(long taskId) {
         Intent intent = new Intent(this, TaskEditActivity.class);
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index b71375aee..6d74c8cb2 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -195,15 +195,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         }
     }
 
-    @Override
-    public void setupTasklistFragmentWithFilter(Filter filter, Bundle extras) {
-        if (fragmentLayout == LAYOUT_SINGLE) {
-            tlfPager.showFilter(filter);
-        } else {
-            super.setupTasklistFragmentWithFilter(filter, extras);
-        }
-    }
-
     @Override
     public void setupTasklistFragmentWithFilterAndCustomTaskList(Filter filter, Bundle extras, Class<?> customTaskList) {
         if (fragmentLayout == LAYOUT_SINGLE) {