ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix NPE when trying to open attachments" into honeycomb-mr1

Browse Source
This commit is contained in:
Todd Kennedy 2011-03-10 14:23:05 -08:00 committed by Android (Google) Code Review
commit 19829ef7ed
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/email/Controller.java
View File

@ -868,8 +868,11 @@ public class Controller {
*/ */
public void loadAttachment(final long attachmentId, final long messageId, public void loadAttachment(final long attachmentId, final long messageId,
final long accountId) { final long accountId) {
Attachment attachInfo = Attachment.restoreAttachmentWithId(mProviderContext, attachmentId); Attachment attachInfo = Attachment.restoreAttachmentWithId(mProviderContext, attachmentId);
if (attachInfo == null) {
return;
}
if (Utility.attachmentExists(mProviderContext, attachInfo)) { if (Utility.attachmentExists(mProviderContext, attachInfo)) {
// The attachment has already been downloaded, so we will just "pretend" to download it // The attachment has already been downloaded, so we will just "pretend" to download it
// This presumably is for POP3 messages // This presumably is for POP3 messages