From a6e6b9969ac247908f4f87be464452fe2aed790b Mon Sep 17 00:00:00 2001 From: Ben Komalo Date: Fri, 22 Apr 2011 15:42:37 -0400 Subject: [PATCH] Don't rely on Activity to set the context for ops The Fragment can get detached from the activity prior to performing an operation, so for now, use the context reference that the fragment has instead. In the long run, we should avoid referencing the application context, but a restructuring of ActivityHelper may help instead. Bug: 4332451 Change-Id: Ieabff8ec0cc363f7d2eebd3ed47c230df9959886 --- src/com/android/email/activity/MessageViewFragment.java | 2 +- src/com/android/email/activity/MessageViewFragmentBase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/email/activity/MessageViewFragment.java b/src/com/android/email/activity/MessageViewFragment.java index 83f2ef4fc..fbfe735d2 100644 --- a/src/com/android/email/activity/MessageViewFragment.java +++ b/src/com/android/email/activity/MessageViewFragment.java @@ -415,7 +415,7 @@ public class MessageViewFragment extends MessageViewFragmentBase private void onDelete() { mCallback.onBeforeMessageDelete(); - ActivityHelper.deleteMessage(getActivity(), mCurrentMessageId); + ActivityHelper.deleteMessage(mContext, mCurrentMessageId); } private void onMarkAsUnread() { diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java index 9d4c7b98d..95766e415 100644 --- a/src/com/android/email/activity/MessageViewFragmentBase.java +++ b/src/com/android/email/activity/MessageViewFragmentBase.java @@ -100,7 +100,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O private static final String BUNDLE_KEY_CURRENT_TAB = "MessageViewFragmentBase.currentTab"; private static final String BUNDLE_KEY_PICTURE_LOADED = "MessageViewFragmentBase.pictureLoaded"; private static final int PHOTO_LOADER_ID = 1; - private Context mContext; + protected Context mContext; // Regex that matches start of img tag. '<(?i)img\s+'. private static final Pattern IMG_TAG_START_REGEX = Pattern.compile("<(?i)img\\s+");