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

Use encrypted subject in replies and forwarded mail

Browse source
This commit is contained in:
Vincent Breitmoser 2018-04-06 15:00:27 +02:00
parent 2d76e0172f
commit b9ce92fc94
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java
View file

@ -1229,8 +1229,8 @@ public class MessageCompose extends K9Activity implements OnClickListener,
private void processMessageToReplyTo(MessageViewInfo messageViewInfo) throws MessagingException {
Message message = messageViewInfo.message;
if (message.getSubject() != null) {
final String subject = PREFIX.matcher(message.getSubject()).replaceFirst("");
if (messageViewInfo.subject != null) {
final String subject = PREFIX.matcher(messageViewInfo.subject).replaceFirst("");
if (!subject.toLowerCase(Locale.US).startsWith("re:")) {
subjectView.setText("Re: " + subject);
@ -1278,7 +1278,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
private void processMessageToForward(MessageViewInfo messageViewInfo, boolean asAttachment) throws MessagingException {
Message message = messageViewInfo.message;
String subject = message.getSubject();
String subject = messageViewInfo.subject;
if (subject != null && !subject.toLowerCase(Locale.US).startsWith("fwd:")) {
subjectView.setText("Fwd: " + subject);
} else {
@ -1308,7 +1308,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
private void processDraftMessage(MessageViewInfo messageViewInfo) {
Message message = messageViewInfo.message;
draftId = MessagingController.getInstance(getApplication()).getId(message);
subjectView.setText(message.getSubject());
subjectView.setText(messageViewInfo.subject);
recipientPresenter.initFromDraftMessage(message);