mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed replying to self

This commit is contained in:
M66B 2018-09-01 06:11:36 +00:00
parent 8cbcc864e3
commit 4e222ec6d1
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -746,18 +746,23 @@ public class FragmentCompose extends FragmentEx {
account = ref.account;
// Reply to sender, not to known self
if (ref.from != null && ref.from.length == 1) {
// All identities, synchronized or not
List<EntityIdentity> identities = db.identity().getIdentities();
for (EntityIdentity identity : identities)
if (((InternetAddress) ref.from[0]).getAddress().equals(identity.email)) {
Address[] tmp = ref.to;
ref.to = ref.from;
ref.reply = null;
ref.from = tmp;
break;
}
}
String from = (ref.from == null || ref.from.length == 0 ? null : ((InternetAddress) ref.from[0]).getAddress());
String replyto = (ref.reply == null || ref.reply.length == 0 ? null : ((InternetAddress) ref.reply[0]).getAddress());
List<EntityIdentity> identities = db.identity().getIdentities();
for (EntityIdentity identity : identities)
if (from != null && from.equals(identity.email)) {
Address[] tmp = ref.to;
ref.to = ref.from;
ref.reply = null;
ref.from = tmp;
break;
} else if (replyto != null && replyto.equals(identity.email)) {
Address[] tmp = ref.reply;
ref.to = ref.from;
ref.reply = null;
ref.from = tmp;
break;
}
}
EntityFolder drafts;