Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d344a689 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #2014 from philipwhiuk/rework2004 

Rework where we wrap message content
parents 3490a7f3 fe6f6caa

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

+4 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import android.widget.ImageButton; 
import com.fsck.k9.FontSizes;

import com.fsck.k9.R;

import com.fsck.k9.activity.MessageCompose;

import com.fsck.k9.helper.HtmlConverter;

import com.fsck.k9.mailstore.AttachmentResolver;

import com.fsck.k9.message.QuotedTextMode;

import com.fsck.k9.message.SimpleMessageFormat;
@@ -119,7 +120,9 @@ public class QuotedMessageMvpView { 
    }



    public void setQuotedHtml(String quotedContent, AttachmentResolver attachmentResolver) {

        mQuotedHTML.displayHtmlContentWithInlineAttachments(quotedContent, attachmentResolver, null);

        mQuotedHTML.displayHtmlContentWithInlineAttachments(

                HtmlConverter.wrapMessageContent(quotedContent),

                attachmentResolver, null);

    }



    public void setQuotedText(String quotedText) {

k9mail/src/main/java/com/fsck/k9/view/MessageWebView.java

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class MessageWebView extends RigidWebView { 
    public void displayHtmlContentWithInlineAttachments(@NonNull String htmlText,

            @Nullable AttachmentResolver attachmentResolver, @Nullable OnPageFinishedListener onPageFinishedListener) {

        setWebViewClient(attachmentResolver, onPageFinishedListener);

        setHtmlContent(HtmlConverter.wrapMessageContent(htmlText));

        setHtmlContent(htmlText);

    }



    private void setWebViewClient(@Nullable AttachmentResolver attachmentResolver,