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

Commit c0153a16 authored by cketti's avatar cketti
Browse files

Display decrypted/verified messages like text/plain messages 

Nicely format the text instead of wrapping it in <pre> tags.
parent 76f741f1

src/com/fsck/k9/view/SingleMessageView.java

+6 −4
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.fsck.k9.crypto.CryptoProvider; 
import com.fsck.k9.crypto.PgpData;

import com.fsck.k9.helper.ClipboardManager;

import com.fsck.k9.helper.Contacts;

import com.fsck.k9.helper.HtmlConverter;

import com.fsck.k9.helper.Utility;

import com.fsck.k9.mail.*;

import com.fsck.k9.mail.internet.MimeUtility;
@@ -533,11 +534,12 @@ public class SingleMessageView extends LinearLayout implements OnClickListener, 
        String text = null;

        if (pgpData != null) {

            text = pgpData.getDecryptedData();

        }

            if (text != null) {

            text = "<html><body><pre>" + text + "</pre></body></html>";

        } else {

            // getTextForDisplay() always returns HTML-ified content.

                text = HtmlConverter.textToHtml(text, true);

            }

        }



        if (text == null) {

            text = message.getTextForDisplay();

        }