Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-29 09:01:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added reply rule

Browse Source
This commit is contained in:
M66B
2019-01-18 18:40:51 +00:00
parent ac3f655637
commit 8fe8def583
7 changed files with 221 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@@ -1471,12 +1471,8 @@ public class FragmentCompose extends FragmentBase {
body = args.getString("body", "");
body = body.replaceAll("\\r?\\n", "<br />");
if (answer > 0) {
String text = db.answer().getAnswer(answer).text;
text = text.replace("$name$", "");
text = text.replace("$email$", "");
body = text + body;
}
if (answer > 0)
body = EntityAnswer.getAnswerText(db, answer, null) + body;
} else {
result.draft.thread = ref.thread;
@@ -1514,20 +1510,8 @@ public class FragmentCompose extends FragmentBase {
result.draft.subject = context.getString(R.string.title_subject_forward,
ref.subject == null ? "" : ref.subject);
if (answer > 0 && ("reply".equals(action) || "reply_all".equals(action))) {
String text = db.answer().getAnswer(answer).text;
String name = null;
String email = null;
if (result.draft.to != null && result.draft.to.length > 0) {
name = ((InternetAddress) result.draft.to[0]).getPersonal();
email = ((InternetAddress) result.draft.to[0]).getAddress();
}
text = text.replace("$name$", name == null ? "" : name);
text = text.replace("$email$", email == null ? "" : email);
body = text + body;
}
if (answer > 0 && ("reply".equals(action) || "reply_all".equals(action)))
body = EntityAnswer.getAnswerText(db, answer, result.draft.to) + body;
}
// Select identity matching from address