From ee3cc8f3cfcc8acf07294c8b3c02edec8762d55d Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 4 May 2012 14:26:07 -0700 Subject: [PATCH] Fixed a potential null pointer in disposable task list fragment --- .../astrid/activity/DisposableTaskListFragment.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/astrid/src/com/todoroo/astrid/activity/DisposableTaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/DisposableTaskListFragment.java index dc78623e7..a134361cb 100644 --- a/astrid/src/com/todoroo/astrid/activity/DisposableTaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/DisposableTaskListFragment.java @@ -4,6 +4,7 @@ import android.app.Activity; import com.timsu.astrid.R; import com.todoroo.andlib.utility.Preferences; +import com.todoroo.astrid.adapter.TaskListFragmentPagerAdapter; /** * Task list fragment that will remove itself from the filterlist/fragment pager when it is detached @@ -16,10 +17,13 @@ public class DisposableTaskListFragment extends TaskListFragment { public void onDetach() { Activity activity = getActivity(); if (activity instanceof TaskListActivity && - Preferences.getIntegerFromString(R.string.p_swipe_lists_performance_key, 0)> 0) { + Preferences.getIntegerFromString(R.string.p_swipe_lists_performance_key, 0) > 0) { TaskListActivity tla = (TaskListActivity) activity; - if (tla.getFragmentLayout() == AstridActivity.LAYOUT_SINGLE) - tla.getFragmentPagerAdapter().remove(filter); + if (tla.getFragmentLayout() == AstridActivity.LAYOUT_SINGLE) { + TaskListFragmentPagerAdapter adapter = tla.getFragmentPagerAdapter(); + if (adapter != null) + adapter.remove(filter); + } } super.onDetach(); }