From 3931e3a62402ff6c94d779e0ff0479d1a1b5fe74 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 11 Jan 2012 15:28:40 -0800 Subject: [PATCH] Fixed bugs related to rotating while in FilterListWrapperActivity --- .../todoroo/astrid/actfm/TagViewActivity.java | 2 +- .../filter_list_wrapper_activity.xml | 7 ------- .../astrid/activity/FilterListActivity.java | 17 ++++++++++------- .../activity/FilterListWrapperActivity.java | 3 +++ .../astrid/activity/TaskListActivity.java | 5 +++-- .../activity/TaskListWrapperActivity.java | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java index d8c2ecc8c..13a8073c8 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java @@ -361,7 +361,7 @@ public class TagViewActivity extends TaskListActivity { } catch (JSONException e) { e.printStackTrace(); } - getActivity().findViewById(R.id.filter_assigned).setOnClickListener(new OnClickListener() { + getView().findViewById(R.id.filter_assigned).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { resetAssignedFilter(); diff --git a/astrid/res/layout-large-land/filter_list_wrapper_activity.xml b/astrid/res/layout-large-land/filter_list_wrapper_activity.xml index ed22c143e..4a211729d 100644 --- a/astrid/res/layout-large-land/filter_list_wrapper_activity.xml +++ b/astrid/res/layout-large-land/filter_list_wrapper_activity.xml @@ -26,12 +26,5 @@ android:layout_height="match_parent" android:id="@+id/tasklist_fragment_container" android:layout_weight="33"> - - - \ No newline at end of file diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java index c88569e36..2f9fd7dd0 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java @@ -515,13 +515,16 @@ public class FilterListActivity extends ExpandableListFragment { Preferences.setLong(LAST_TAG_REFRESH_KEY, DateUtilities.now()); actFmSyncService.fetchTags(0); - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - adapter.clear(); - adapter.getLists(); - } - }); + Activity activity = getActivity(); + if (activity != null) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + adapter.clear(); + adapter.getLists(); + } + }); + } } catch (IOException e) { if (manual) diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java index 2d68c8dda..330cca6fb 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java @@ -6,6 +6,7 @@ import android.widget.TextView; import com.timsu.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; +import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.service.ThemeService; public class FilterListWrapperActivity extends AstridWrapperActivity { @@ -18,6 +19,8 @@ public class FilterListWrapperActivity extends AstridWrapperActivity { ThemeService.applyTheme(this); super.onCreate(savedInstanceState); setContentView(R.layout.filter_list_wrapper_activity); + if (findViewById(R.id.tasklist_fragment_container) != null) + setupTasklistFragmentWithFilter((Filter)getIntent().getParcelableExtra(TaskListActivity.TOKEN_FILTER)); } /* (non-Javadoc) diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 81167d733..4902c4dd6 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -16,6 +16,7 @@ import android.app.AlertDialog; import android.app.PendingIntent.CanceledException; import android.app.SearchManager; import android.content.BroadcastReceiver; +import android.content.ComponentName; import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; @@ -1424,8 +1425,8 @@ public class TaskListActivity extends ListFragment implements OnScrollListener, @SuppressWarnings("nls") private void showFilterListActivity() { - Intent intent = new Intent(getActivity(), - FilterListWrapperActivity.class); + Intent intent = (Intent) getActivity().getIntent().clone(); + intent.setComponent(new ComponentName(getActivity(), FilterListWrapperActivity.class)); startActivity(intent); AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_right_in, R.anim.slide_right_out); } diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java index 0130e54d4..e4d3455ff 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java @@ -15,7 +15,7 @@ public class TaskListWrapperActivity extends AstridWrapperActivity { */ @Override protected void onCreate(Bundle savedInstanceState) { - ThemeService.applyTheme(this); + ThemeService.applyTheme(this); super.onCreate(savedInstanceState); setContentView(R.layout.task_list_wrapper_activity);