From 236dfc6ccb252f09d7292950c83c14978c347855 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 24 May 2019 10:33:16 +0200
Subject: [PATCH] Minor fix for contacts

---
 .../java/org/linphone/contacts/LinphoneContact.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/linphone/contacts/LinphoneContact.java b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
index 6de11e1f6..7dd4cdc66 100644
--- a/app/src/main/java/org/linphone/contacts/LinphoneContact.java
+++ b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
@@ -52,9 +52,13 @@ public class LinphoneContact extends AndroidContact
 
     public LinphoneContact() {
         super();
-        mAddresses = new ArrayList<>();
+        mFullName = null;
+        mFirstName = null;
+        mLastName = null;
+        mOrganization = null;
         mAndroidId = null;
         mThumbnailUri = null;
+        mAddresses = new ArrayList<>();
         mPhotoUri = null;
         mHasSipAddress = false;
         mIsStarred = false;
@@ -488,7 +492,7 @@ public class LinphoneContact extends AndroidContact
                         .query(
                                 ContactsContract.Data.CONTENT_URI,
                                 AsyncContactsLoader.PROJECTION,
-                                ContactsContract.Data.IN_VISIBLE_GROUP
+                                ContactsContract.Data.IN_DEFAULT_DIRECTORY
                                         + " == 1 AND "
                                         + ContactsContract.Data.CONTACT_ID
                                         + " == "
@@ -513,7 +517,9 @@ public class LinphoneContact extends AndroidContact
         String data3 = c.getString(c.getColumnIndex("data3"));
         String data4 = c.getString(c.getColumnIndex("data4"));
 
-        setFullName(displayName);
+        if (getFullName() == null) {
+            setFullName(displayName);
+        }
 
         if (ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE.equals(mime)) {
             addNumberOrAddress(new LinphoneNumberOrAddress(data1, data4));