wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework where we wrap message content

Browse source
This commit is contained in:
Philip Whitehouse 2017-01-08 13:19:14 +00:00
parent 1af2f23f50
commit fe6f6caa5f
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
k9mail/src/main/java/com/fsck/k9/ui/compose/QuotedMessageMvpView.java
View file

@ -12,6 +12,7 @@ import android.widget.ImageButton;
import com.fsck.k9.FontSizes; import com.fsck.k9.FontSizes;
import com.fsck.k9.R; import com.fsck.k9.R;
import com.fsck.k9.activity.MessageCompose; import com.fsck.k9.activity.MessageCompose;
import com.fsck.k9.helper.HtmlConverter;
import com.fsck.k9.mailstore.AttachmentResolver; import com.fsck.k9.mailstore.AttachmentResolver;
import com.fsck.k9.message.QuotedTextMode; import com.fsck.k9.message.QuotedTextMode;
import com.fsck.k9.message.SimpleMessageFormat; import com.fsck.k9.message.SimpleMessageFormat;
@ -119,7 +120,9 @@ public class QuotedMessageMvpView {
} }
public void setQuotedHtml(String quotedContent, AttachmentResolver attachmentResolver) { public void setQuotedHtml(String quotedContent, AttachmentResolver attachmentResolver) {
mQuotedHTML.displayHtmlContentWithInlineAttachments(quotedContent, attachmentResolver, null); mQuotedHTML.displayHtmlContentWithInlineAttachments(
HtmlConverter.wrapMessageContent(quotedContent),
attachmentResolver, null);
} }
public void setQuotedText(String quotedText) { public void setQuotedText(String quotedText) {

2
k9mail/src/main/java/com/fsck/k9/view/MessageWebView.java
View file

@ -118,7 +118,7 @@ public class MessageWebView extends RigidWebView {
public void displayHtmlContentWithInlineAttachments(@NonNull String htmlText, public void displayHtmlContentWithInlineAttachments(@NonNull String htmlText,
@Nullable AttachmentResolver attachmentResolver, @Nullable OnPageFinishedListener onPageFinishedListener) { @Nullable AttachmentResolver attachmentResolver, @Nullable OnPageFinishedListener onPageFinishedListener) {
setWebViewClient(attachmentResolver, onPageFinishedListener); setWebViewClient(attachmentResolver, onPageFinishedListener);
setHtmlContent(HtmlConverter.wrapMessageContent(htmlText)); setHtmlContent(htmlText);
} }
private void setWebViewClient(@Nullable AttachmentResolver attachmentResolver, private void setWebViewClient(@Nullable AttachmentResolver attachmentResolver,