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

Reply to sender, not to self

This commit is contained in:
M66B 2018-08-14 17:41:21 +00:00
parent f25ca38376
commit 57ceca54d7
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/DaoIdentity.java
View File

@ -36,6 +36,9 @@ public interface DaoIdentity {
@Query("SELECT * FROM identity WHERE synchronize = :synchronize")
LiveData<List<EntityIdentity>> liveIdentities(boolean synchronize);
@Query("SELECT * FROM identity")
List<EntityIdentity> getIdentities();
@Query("SELECT * FROM identity WHERE id = :id")
EntityIdentity getIdentity(long id);

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

@ -540,13 +540,18 @@ public class FragmentCompose extends FragmentEx {
if (ref != null) {
account = ref.account;
// Reply to sender
EntityFolder rfolder = db.folder().getFolder(ref.folder);
if (EntityFolder.SENT.equals(rfolder.type)) {
Address[] tmp = ref.to;
ref.to = ref.from;
ref.reply = null;
ref.from = tmp;
// 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;
}
}
}