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

Apply auto-identity first

Browse Source
This commit is contained in:
M66B
2025-07-15 13:58:04 +02:00
parent 7ff54ffdff
commit 315d6be788
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7004,6 +7004,20 @@ public class FragmentCompose extends FragmentBase {
DB db = DB.getInstance(context);
if (auto_identity && to != null && to.length > 0) {
String email = ((InternetAddress) to[0]).getAddress();
List<Long> ids = null;
if (suggest_sent)
ids = db.contact().getIdentities(email, EntityContact.TYPE_TO);
if (suggest_received && (ids == null || ids.size() == 0))
ids = db.contact().getIdentities(email, EntityContact.TYPE_FROM);
if (ids != null && ids.size() == 1) {
EntityIdentity identity = db.identity().getIdentity(ids.get(0));
if (identity != null)
return identity;
}
}
if (from != null && from.length > 0) {
for (Address sender : from)
for (EntityIdentity identity : identities)
@@ -7036,20 +7050,6 @@ public class FragmentCompose extends FragmentBase {
}
}
if (auto_identity && to != null && to.length > 0) {
String email = ((InternetAddress) to[0]).getAddress();
List<Long> ids = null;
if (suggest_sent)
ids = db.contact().getIdentities(email, EntityContact.TYPE_TO);
if (suggest_received && (ids == null || ids.size() == 0))
ids = db.contact().getIdentities(email, EntityContact.TYPE_FROM);
if (ids != null && ids.size() == 1) {
EntityIdentity identity = db.identity().getIdentity(ids.get(0));
if (identity != null)
return identity;
}
}
for (EntityIdentity identity : identities)
if (identity.account.equals(aid) && identity.primary) {
EntityLog.log(context, "Selected primary account/identity");