1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 04:35:57 +00:00

Merge branch 'master' into dev

This commit is contained in:
M66B 2024-01-04 09:49:02 +01:00
commit f4816c02b8

View file

@ -197,7 +197,8 @@ public class EntityContact implements Serializable {
if (contact == null) { if (contact == null) {
contact = new EntityContact(); contact = new EntityContact();
contact.account = account; contact.account = account;
contact.identity = identity; if (type == TYPE_TO)
contact.identity = identity;
contact.type = type; contact.type = type;
contact.email = email; contact.email = email;
contact.name = name; contact.name = name;
@ -209,7 +210,8 @@ public class EntityContact implements Serializable {
contact.id = db.contact().insertContact(contact); contact.id = db.contact().insertContact(contact);
Log.i("Inserted contact=" + contact + " type=" + type); Log.i("Inserted contact=" + contact + " type=" + type);
} else { } else {
contact.identity = identity; if (type == TYPE_TO)
contact.identity = identity;
if (contact.name == null && name != null) if (contact.name == null && name != null)
contact.name = name; contact.name = name;
if (contact.group == null && group != null) if (contact.group == null && group != null)