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

Check self/cc using all identities

Browse Source
This commit is contained in:
M66B
2019-09-23 13:04:34 +02:00
parent cc15eda190
commit 1790a15fdf
3 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2096,17 +2096,13 @@ public class FragmentCompose extends FragmentBase {
data.draft.inreplyto = ref.msgid;
data.draft.thread = ref.thread;
EntityIdentity ridentity = null;
if (ref.identity != null)
ridentity = db.identity().getIdentity(ref.identity);
if ("list".equals(action) && ref.list_post != null)
data.draft.to = ref.list_post;
else if ("receipt".equals(action) && ref.receipt_to != null)
data.draft.to = ref.receipt_to;
else {
// Prevent replying to self
if (ref.replySelf(ridentity)) {
if (ref.replySelf(data.identities)) {
data.draft.from = ref.from;
data.draft.to = ref.to;
} else {
@@ -2116,7 +2112,7 @@ public class FragmentCompose extends FragmentBase {
}
if ("reply_all".equals(action))
data.draft.cc = ref.getAllRecipients(ridentity);
data.draft.cc = ref.getAllRecipients(data.identities);
else if ("receipt".equals(action))
data.draft.receipt_request = true;