mirror of
https://github.com/M66B/FairEmail.git
synced 2024-12-29 11:15:51 +00:00
Merge branch 'master' into dev
This commit is contained in:
commit
f4816c02b8
1 changed files with 4 additions and 2 deletions
|
@ -197,7 +197,8 @@ public class EntityContact implements Serializable {
|
|||
if (contact == null) {
|
||||
contact = new EntityContact();
|
||||
contact.account = account;
|
||||
contact.identity = identity;
|
||||
if (type == TYPE_TO)
|
||||
contact.identity = identity;
|
||||
contact.type = type;
|
||||
contact.email = email;
|
||||
contact.name = name;
|
||||
|
@ -209,7 +210,8 @@ public class EntityContact implements Serializable {
|
|||
contact.id = db.contact().insertContact(contact);
|
||||
Log.i("Inserted contact=" + contact + " type=" + type);
|
||||
} else {
|
||||
contact.identity = identity;
|
||||
if (type == TYPE_TO)
|
||||
contact.identity = identity;
|
||||
if (contact.name == null && name != null)
|
||||
contact.name = name;
|
||||
if (contact.group == null && group != null)
|
||||
|
|
Loading…
Reference in a new issue