Only show attachments UI for downloadable attachments
Bug: 3286678 Change-Id: Ied64674cbfaef95228d5d3d8c99e5f5989b8a3c0
This commit is contained in:
parent
ef2261fa00
commit
05340736da
|
@ -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) {
|
||||||
|
|
Loading…
Reference in New Issue