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

Unverified Commit b67649dd authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #8014 from thunderbird/encrypted_subject 

Use `[...]` for outer subject when encrypting the subject
parents 7234f9ab bb1d1291

feature/widget/unread/src/test/kotlin/app/k9mail/feature/widget/unread/FakeCoreResourceProvider.kt

+0 −4
Original line number Diff line number Diff line
@@ -60,10 +60,6 @@ class FakeCoreResourceProvider : CoreResourceProvider { 
        throw UnsupportedOperationException("not implemented")

    }



    override fun encryptedSubject(): String {

        throw UnsupportedOperationException("not implemented")

    }



    override fun replyHeader(sender: String): String {

        throw UnsupportedOperationException("not implemented")

    }

legacy/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ class K9CoreResourceProvider( 
    override fun noSubject(): String = context.getString(R.string.general_no_subject)



    override fun userAgent(): String = context.getString(R.string.message_header_mua)

    override fun encryptedSubject(): String = context.getString(R.string.encrypted_subject)



    override fun replyHeader(sender: String): String =

        context.getString(R.string.message_compose_reply_header_fmt, sender)

legacy/core/src/main/java/com/fsck/k9/CoreResourceProvider.kt

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ interface CoreResourceProvider { 
    fun noSubject(): String

    fun userAgent(): String



    fun encryptedSubject(): String

    fun replyHeader(sender: String): String

    fun replyHeader(sender: String, sentDate: String): String

legacy/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java

+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import timber.log.Timber; 


public class PgpMessageBuilder extends MessageBuilder {

    private static final int REQUEST_USER_INTERACTION = 1;

    private static final String REPLACEMENT_SUBJECT = "[...]";





    private final AutocryptOperations autocryptOperations;
@@ -220,7 +221,7 @@ public class PgpMessageBuilder extends MessageBuilder { 
            messageContentBodyPart.setHeader(MimeHeader.HEADER_CONTENT_TYPE,

                    messageContentBodyPart.getContentType() + "; protected-headers=\"v1\"");

            messageContentBodyPart.setHeader(MimeHeader.SUBJECT, subjects[0]);

            currentProcessedMimeMessage.setSubject(resourceProvider.encryptedSubject());

            currentProcessedMimeMessage.setSubject(REPLACEMENT_SUBJECT);

        }

    }

legacy/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ class TestCoreResourceProvider : CoreResourceProvider { 
    override fun noSubject() = "(No subject)"



    override fun userAgent(): String = "K-9 Mail for Android"

    override fun encryptedSubject(): String = "Encrypted message"



    override fun replyHeader(sender: String) = "$sender wrote:"

    override fun replyHeader(sender: String, sentDate: String) = "On $sentDate, $sender wrote:"