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

Fixed fallback identity

This commit is contained in:
M66B 2020-02-11 10:47:03 +01:00
parent e8d2d08f9a
commit c91adfa068
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2774,9 +2774,11 @@ public class FragmentCompose extends FragmentBase {
break;
}
if (data.draft.from != null && data.draft.from.length > 0) {
Address[] refto = (ref == null ? null
: ref.replySelf(data.identities, ref.account) ? ref.from : ref.to);
if (refto != null && refto.length > 0) {
if (selected == null)
for (Address sender : data.draft.from)
for (Address sender : refto)
for (EntityIdentity identity : data.identities)
if (identity.account.equals(aid) &&
identity.sameAddress(sender)) {
@ -2786,7 +2788,7 @@ public class FragmentCompose extends FragmentBase {
}
if (selected == null)
for (Address sender : data.draft.from)
for (Address sender : refto)
for (EntityIdentity identity : data.identities)
if (identity.account.equals(aid) &&
identity.similarAddress(sender)) {
@ -2796,7 +2798,7 @@ public class FragmentCompose extends FragmentBase {
}
if (selected == null)
for (Address sender : data.draft.from)
for (Address sender : refto)
for (EntityIdentity identity : data.identities)
if (identity.sameAddress(sender)) {
selected = identity;
@ -2805,7 +2807,7 @@ public class FragmentCompose extends FragmentBase {
}
if (selected == null)
for (Address sender : data.draft.from)
for (Address sender : refto)
for (EntityIdentity identity : data.identities)
if (identity.similarAddress(sender)) {
selected = identity;