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:
commit
f4816c02b8
1 changed files with 4 additions and 2 deletions
|
@ -197,6 +197,7 @@ public class EntityContact implements Serializable {
|
||||||
if (contact == null) {
|
if (contact == null) {
|
||||||
contact = new EntityContact();
|
contact = new EntityContact();
|
||||||
contact.account = account;
|
contact.account = account;
|
||||||
|
if (type == TYPE_TO)
|
||||||
contact.identity = identity;
|
contact.identity = identity;
|
||||||
contact.type = type;
|
contact.type = type;
|
||||||
contact.email = email;
|
contact.email = email;
|
||||||
|
@ -209,6 +210,7 @@ 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 {
|
||||||
|
if (type == TYPE_TO)
|
||||||
contact.identity = identity;
|
contact.identity = identity;
|
||||||
if (contact.name == null && name != null)
|
if (contact.name == null && name != null)
|
||||||
contact.name = name;
|
contact.name = name;
|
||||||
|
|
Loading…
Reference in a new issue