Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-01 18:41:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent replying to self

Browse Source
This commit is contained in:
M66B
2019-03-31 08:35:31 +02:00
parent 3eea0c09c4
commit 03c3934aa5
4 changed files with 32 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1717,28 +1717,19 @@ public class FragmentCompose extends FragmentBase {
draft.inreplyto = ref.msgid;
draft.thread = ref.thread;
// Special case
if (BuildConfig.DEBUG) {
String from = null;
String to = null;
String delivered = Helper.canonicalAddress(ref.deliveredto);
String me = Helper.canonicalAddress(Helper.myAddress().getAddress());
// Prevent replying to self
String from = null;
String via = null;
if (ref.from != null && ref.from.length > 0)
from = Helper.canonicalAddress(((InternetAddress) ref.from[0]).getAddress());
if (ref.identity != null) {
EntityIdentity v = db.identity().getIdentity(ref.identity);
via = Helper.canonicalAddress(v.email);
}
if (ref.from != null && ref.from.length > 0)
from = Helper.canonicalAddress(((InternetAddress) ref.from[0]).getAddress());
if (ref.to != null && ref.to.length > 0)
to = Helper.canonicalAddress(((InternetAddress) ref.to[0]).getAddress());
if (delivered.equals(me) && from != null && from.equals(me)) {
if (to != null && to.equals(me))
draft.to = ref.reply;
else
draft.to = ref.to;
draft.from = ref.from;
} else {
draft.to = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply);
draft.from = ref.to;
}
if (from != null && from.equals(via)) {
draft.to = ref.to;
draft.from = ref.from;
} else {
draft.to = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply);
draft.from = ref.to;