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

Fixed selecting identity with multiple recipients

This commit is contained in:
M66B 2019-02-04 17:32:07 +00:00
parent 0f8e958935
commit 1ebf77edd1
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1625,26 +1625,29 @@ public class FragmentCompose extends FragmentBase {
// Select identity matching from address // Select identity matching from address
int icount = 0; int icount = 0;
String from = null;
EntityIdentity first = null; EntityIdentity first = null;
EntityIdentity primary = null; EntityIdentity primary = null;
if (result.draft.from != null && result.draft.from.length > 0) if (result.draft.from != null)
from = Helper.canonicalAddress(((InternetAddress) result.draft.from[0]).getAddress()); for (Address afrom : result.draft.from) {
for (EntityIdentity identity : identities) { String from = Helper.canonicalAddress(((InternetAddress) afrom).getAddress());
String email = Helper.canonicalAddress(identity.email); for (EntityIdentity identity : identities) {
if (email.equals(from)) { String email = Helper.canonicalAddress(identity.email);
result.draft.identity = identity.id; if (email.equals(from)) {
result.draft.from = new InternetAddress[]{new InternetAddress(identity.email, identity.name)}; result.draft.identity = identity.id;
break; result.draft.from = new InternetAddress[]{new InternetAddress(identity.email, identity.name)};
break;
}
if (identity.account.equals(result.draft.account)) {
icount++;
if (identity.primary)
primary = identity;
if (first == null)
first = identity;
}
}
if (result.draft.identity != null)
break;
} }
if (identity.account.equals(result.draft.account)) {
icount++;
if (identity.primary)
primary = identity;
if (first == null)
first = identity;
}
}
// Select primary identity // Select primary identity
if (result.draft.identity == null) { if (result.draft.identity == null) {