mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-19 19:52:14 +02:00
Code

Merge pull request #8014 from thunderbird/encrypted_subject

Browse Source 
Use `[...]` for outer subject when encrypting the subject
This commit is contained in:
cketti 2024-07-18 14:06:25 +02:00 committed by GitHub
commit b67649dd42
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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")
}

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

@ -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)

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

@ -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

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

@ -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);
}
}

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

@ -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:"

1
legacy/ui/legacy/src/main/res/values/strings.xml
View File

@ -1025,7 +1025,6 @@
<string name="dialog_openkeychain_info_install">Install</string>
<string name="dialog_openkeychain_info_text">The app OpenKeychain is required to enable support for end-to-end encryption.</string>
<string name="encrypted_subject">"Encrypted Message"</string>
<string name="account_settings_crypto_encrypt_subject">Encrypt message subjects</string>
<string name="account_settings_crypto_encrypt_subject_subtitle">May not be supported by some recipients</string>

1
legacy/ui/legacy/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt
View File

@ -21,7 +21,6 @@ class TestCoreResourceProvider : CoreResourceProvider {
override fun noSubject() = throw UnsupportedOperationException("not implemented")
override fun userAgent(): String = "K-9 Mail for Android"
override fun encryptedSubject(): String = "Encrypted message"
override fun replyHeader(sender: String) = throw UnsupportedOperationException("not implemented")
override fun replyHeader(sender: String, sentDate: String) = throw UnsupportedOperationException("not implemented")