moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-19 20:21:45 -05:00
Code Issues Releases Wiki Activity

Issue 321

Browse Source 
Add null checks around more uses of mMessage
This commit is contained in:
Daniel Applebaum 2009-02-25 02:32:20 +00:00
parent 99553cbcab
commit 2615d70a1d
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/email/activity/MessageView.java
View File

@ -619,12 +619,15 @@ public class MessageView extends Activity
}
private void onMarkAsUnread() {
if (mMessage != null)
{
MessagingController.getInstance(getApplication()).markMessageRead(
mAccount,
mFolder,
mMessage.getUid(),
false);
}
}
/**
* Creates a unique file in the given directory by appending a hyphen
@ -669,6 +672,8 @@ public class MessageView extends Activity
Toast.LENGTH_SHORT).show();
return;
}
if (mMessage != null)
{
MessagingController.getInstance(getApplication()).loadAttachment(
mAccount,
mMessage,
@ -676,8 +681,11 @@ public class MessageView extends Activity
new Object[] { true, attachment },
mListener);
}
}
private void onViewAttachment(Attachment attachment) {
if (mMessage != null)
{
MessagingController.getInstance(getApplication()).loadAttachment(
mAccount,
mMessage,
@ -685,6 +693,7 @@ public class MessageView extends Activity
new Object[] { false, attachment },
mListener);
}
}
private void onShowPictures() {
mMessageContentView.getSettings().setBlockNetworkImage(false);
@ -771,7 +780,7 @@ public class MessageView extends Activity
if (menu != null)
{
MenuItem flagItem = menu.findItem(R.id.flag);
if (flagItem != null)
if (flagItem != null && mMessage != null)
{
flagItem.setTitle((mMessage.isSet(Flag.FLAGGED) ? R.string.unflag_action : R.string.flag_action));
}
@ -780,7 +789,7 @@ public class MessageView extends Activity
public CacheResult service(String url, Map<String, String> headers) {
String prefix = "http://cid/";
if (url.startsWith(prefix)) {
if (url.startsWith(prefix) && mMessage != null) {
try {
String contentId = url.substring(prefix.length());
final Part part = MimeUtility.findPartByContentId(mMessage, "<" + contentId + ">");