From e2842d5fb1b9a9713f9e6602804dfc99c2b4fa1c Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Thu, 3 May 2012 12:03:10 -0700 Subject: [PATCH] Fixed a search bug when swipe between lists disabled --- .../com/todoroo/astrid/activity/TaskListActivity.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 98d141b21..d4e5ce609 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -172,6 +172,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener mainMenu.setOnClickListener(mainMenuClickListener); commentsButton.setOnClickListener(commentsButtonClickListener); + Bundle extras = getIntent().getExtras(); + if (extras != null) + extras = (Bundle) extras.clone(); + Filter savedFilter = getIntent().getParcelableExtra(TaskListFragment.TOKEN_FILTER); if (Intent.ACTION_SEARCH.equals(getIntent().getAction())) { String query = getIntent().getStringExtra(SearchManager.QUERY).trim(); @@ -181,13 +185,14 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener "%" + //$NON-NLS-1$ query.toUpperCase() + "%")), //$NON-NLS-1$ null); + if (extras == null) + extras = new Bundle(); + extras.putParcelable(TaskListFragment.TOKEN_FILTER, savedFilter); } + if (savedFilter == null) savedFilter = CoreFilterExposer.buildInboxFilter(getResources()); - Bundle extras = getIntent().getExtras(); - if (extras != null) - extras = (Bundle) extras.clone(); if (swipeIsEnabled()) { FilterListFragment flf = getFilterListFragment();