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

Prefer send identity for auto select

This commit is contained in:
M66B 2022-12-18 12:01:10 +01:00
parent d5f50a0ab5
commit 148c39fe03
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/DaoContact.java
View File

@ -59,9 +59,9 @@ public interface DaoContact {
@Query("SELECT DISTINCT identity FROM contact" +
" WHERE email = :email" +
" AND type IN (:types)" +
" AND type = :type" +
" AND NOT identity IS NULL")
List<Long> getIdentities(String email, List<Integer> types);
List<Long> getIdentities(String email, int type);
@Query("SELECT *" +
" FROM contact" +

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

@ -1280,17 +1280,12 @@ public class FragmentCompose extends FragmentBase {
EntityLog.log(context, "Select identity email=" + email +
" sent=" + suggest_sent + " received=" + suggest_received);
List<Integer> types = new ArrayList<>();
if (suggest_sent)
types.add(EntityContact.TYPE_TO);
if (suggest_received)
types.add(EntityContact.TYPE_FROM);
if (types.size() == 0)
return null;
DB db = DB.getInstance(context);
List<Long> identities = db.contact().getIdentities(email, types);
List<Long> identities = null;
if (suggest_sent)
identities = db.contact().getIdentities(email, EntityContact.TYPE_TO);
if (suggest_received && (identities == null || identities.size() == 0))
identities = db.contact().getIdentities(email, EntityContact.TYPE_FROM);
EntityLog.log(context, "Selected identity email=" + email +
" identities=" + (identities == null ? null : identities.size()));
if (identities != null && identities.size() == 1)
@ -4735,12 +4730,11 @@ public class FragmentCompose extends FragmentBase {
Address[] tos = MessageHelper.parseAddresses(context, to);
if (tos != null && tos.length > 0) {
String email = ((InternetAddress) tos[0]).getAddress();
List<Integer> types = new ArrayList<>();
List<Long> identities = null;
if (suggest_sent)
types.add(EntityContact.TYPE_TO);
if (suggest_received)
types.add(EntityContact.TYPE_FROM);
List<Long> identities = db.contact().getIdentities(email, types);
identities = db.contact().getIdentities(email, EntityContact.TYPE_TO);
if (suggest_received && (identities == null || identities.size() == 0))
identities = db.contact().getIdentities(email, EntityContact.TYPE_FROM);
if (identities != null && identities.size() == 1) {
EntityIdentity identity = db.identity().getIdentity(identities.get(0));
if (identity != null)