From 0ccb93ec95755d152511f7dde35e68d1108f5f99 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 3 Apr 2013 16:27:59 -0700 Subject: [PATCH] Null pointer checks --- .../astrid/notes/EditNoteActivity.java | 2 -- .../astrid/activity/TaskListFragment.java | 25 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java index 7a8242eee..6e4084617 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java @@ -211,8 +211,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene // --- UI preparation private void setUpInterface() { - - timerView = commentsBar.findViewById(R.id.timer_container); commentButton = commentsBar.findViewById(R.id.commentButton); commentField = (EditText) commentsBar.findViewById(R.id.commentField); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java index 5df2e062d..609b185b2 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java @@ -1296,15 +1296,17 @@ public class TaskListFragment extends SherlockListFragment implements OnScrollLi } public boolean handleOptionsMenuItemSelected(int id, Intent intent) { + Activity activity = getActivity(); switch(id) { case MENU_ADDONS_ID: - StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_ADDONS); - intent = new Intent(getActivity(), AddOnActivity.class); - startActivityForResult(intent, ACTIVITY_ADDONS); - return true; + if (activity != null) { + StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_ADDONS); + intent = new Intent(activity, AddOnActivity.class); + startActivityForResult(intent, ACTIVITY_ADDONS); + return true; + } case MENU_SORT_ID: StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SORT); - Activity activity = getActivity(); if (activity != null) { AlertDialog dialog = SortSelectionActivity.createDialog( getActivity(), hasDraggableOption(), this, sortFlags, sortSort); @@ -1316,13 +1318,16 @@ public class TaskListFragment extends SherlockListFragment implements OnScrollLi syncActionHelper.performSyncAction(); return true; case MENU_ADDON_INTENT_ID: - AndroidUtilities.startExternalIntent(getActivity(), intent, - ACTIVITY_MENU_EXTERNAL); + if (activity != null) + AndroidUtilities.startExternalIntent(activity, intent, + ACTIVITY_MENU_EXTERNAL); return true; case MENU_NEW_FILTER_ID: - intent = new Intent(getActivity(), CustomFilterActivity.class); - getActivity().startActivityForResult(intent, ACTIVITY_REQUEST_NEW_FILTER); - return true; + if (activity != null) { + intent = new Intent(activity, CustomFilterActivity.class); + activity.startActivityForResult(intent, ACTIVITY_REQUEST_NEW_FILTER); + return true; + } } return false; }