Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-10 11:03:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Match delivered-to as last

Browse Source
This commit is contained in:
M66B
2020-12-13 15:57:12 +01:00
parent 47c070d543
commit 4c20128715
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3113,14 +3113,16 @@ class Core {
addresses.addAll(Arrays.asList(message.bcc));
if (message.from != null)
addresses.addAll(Arrays.asList(message.from));
if (message.deliveredto != null)
try {
addresses.add(new InternetAddress(message.deliveredto));
} catch (AddressException ex) {
Log.w(ex);
}
}
InternetAddress deliveredto = null;
if (message.deliveredto != null)
try {
deliveredto = new InternetAddress(message.deliveredto);
} catch (AddressException ex) {
Log.w(ex);
}
// Search for matching identity
List<EntityIdentity> identities = db.identity().getSynchronizingIdentities(folder.account);
if (identities != null) {
@@ -3133,6 +3135,11 @@ class Core {
for (EntityIdentity identity : identities)
if (identity.similarAddress(address))
return identity;
if (deliveredto != null)
for (EntityIdentity identity : identities)
if (identity.sameAddress(deliveredto) || identity.similarAddress(deliveredto))
return identity;
}
return null;