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

Merge "Only show attachments UI for downloadable attachments"

Browse Source
This commit is contained in:
Andy Stadler 2010-12-14 20:27:15 -08:00 committed by Android (Google) Code Review
commit 884589fddb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/email/activity/MessageViewFragmentBase.java
View File

@ -1041,7 +1041,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
return; return;
} }
boolean htmlChanged = false; boolean htmlChanged = false;
setAttachmentCount(attachments.length); int numDisplayedAttachments = 0;
for (Attachment attachment : attachments) { for (Attachment attachment : attachments) {
if (mHtmlTextRaw != null && attachment.mContentId != null if (mHtmlTextRaw != null && attachment.mContentId != null
&& attachment.mContentUri != null) { && attachment.mContentUri != null) {
@ -1054,8 +1054,10 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
htmlChanged = true; htmlChanged = true;
} else { } else {
addAttachment(attachment); addAttachment(attachment);
numDisplayedAttachments++;
} }
} }
setAttachmentCount(numDisplayedAttachments);
mHtmlTextWebView = mHtmlTextRaw; mHtmlTextWebView = mHtmlTextRaw;
mHtmlTextRaw = null; mHtmlTextRaw = null;
if (htmlChanged && mMessageContentView != null) { if (htmlChanged && mMessageContentView != null) {