From 53a748409d289eab9fd91902b7b2687738f737ad Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 19 Nov 2019 16:06:38 +0100
Subject: [PATCH] Added logs & fixed some issues in contact removal

---
 .../org/linphone/contacts/AndroidContact.java |  1 +
 .../contacts/AsyncContactsLoader.java         |  7 +++---
 .../linphone/contacts/ContactsManager.java    |  1 +
 .../linphone/contacts/LinphoneContact.java    | 22 +++++++++++++++----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/contacts/AndroidContact.java b/app/src/main/java/org/linphone/contacts/AndroidContact.java
index 4953d8f95..69239d0ce 100644
--- a/app/src/main/java/org/linphone/contacts/AndroidContact.java
+++ b/app/src/main/java/org/linphone/contacts/AndroidContact.java
@@ -146,6 +146,7 @@ class AndroidContact implements Serializable {
     }
 
     void deleteAndroidContact() {
+        Log.i("[Contact] Deleting Android contact ", this);
         ContactsManager.getInstance().delete(mAndroidId);
     }
 
diff --git a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
index 8ad05b069..d8614fabd 100644
--- a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
+++ b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
@@ -95,14 +95,13 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
                     }
 
                     LinphoneContact contact = (LinphoneContact) friend.getUserData();
-                    // A previously fetched friend from rc file will have a user data,
-                    // so the next fetches won't add it in data.contacts
-                    // and thus the "new friends" count in log will be different /!\
                     if (contact != null) {
                         if (contact.getAndroidId() != null) {
                             contact.clearAddresses();
                             androidContactsCache.put(contact.getAndroidId(), contact);
                             nativeIds.add(contact.getAndroidId());
+                        } else {
+                            data.contacts.add(contact);
                         }
                     } else {
                         if (friend.getRefKey() != null) {
@@ -198,7 +197,7 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
                         + contacts.size()
                         + " native contacts plus "
                         + data.contacts.size()
-                        + " new friends in the configuration file");
+                        + " friends in the configuration file");
         for (LinphoneContact contact : contacts) {
             if (isCancelled()) {
                 Log.w("[Contacts Manager] Task cancelled");
diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.java b/app/src/main/java/org/linphone/contacts/ContactsManager.java
index b3e18269a..9b202ac69 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.java
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.java
@@ -495,6 +495,7 @@ public class ContactsManager extends ContentObserver
         ArrayList<ContentProviderOperation> ops = new ArrayList<>();
 
         for (String id : ids) {
+            Log.i("[Contacts Manager] Adding Android contact id ", id, " to batch removal");
             String[] args = new String[] {id};
             ops.add(
                     ContentProviderOperation.newDelete(ContactsContract.RawContacts.CONTENT_URI)
diff --git a/app/src/main/java/org/linphone/contacts/LinphoneContact.java b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
index b8d9ce427..6c24b0594 100644
--- a/app/src/main/java/org/linphone/contacts/LinphoneContact.java
+++ b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
@@ -401,12 +401,23 @@ public class LinphoneContact extends AndroidContact
     }
 
     public void deleteFriend() {
+        if (mFriend == null) return;
         Core core = LinphoneManager.getCore();
-        if (mFriend != null && core != null) {
-            for (FriendList list : core.getFriendsLists()) {
-                list.removeFriend(mFriend);
+        if (core == null) return;
+
+        boolean found = false;
+        Log.i("[Contact] Deleting friend ", mFriend.getName(), " for contact ", this);
+        for (FriendList list : core.getFriendsLists()) {
+            FriendList.Status status = list.removeFriend(mFriend);
+            if (status == FriendList.Status.OK) {
+                Log.w("[Contact] Friend found in list " + list.getDisplayName());
+                found = true;
             }
         }
+
+        if (!found) {
+            Log.w("[Contact] Friend removal failed, friend doesn't belong to any friend list");
+        }
     }
 
     public void createOrUpdateFriendFromNativeContact() {
@@ -645,7 +656,10 @@ public class LinphoneContact extends AndroidContact
     }
 
     public void delete() {
-        deleteAndroidContact();
+        Log.i("[Contact] Deleting contact ", this);
+        if (isAndroidContact()) {
+            deleteAndroidContact();
+        }
         if (isFriend()) {
             deleteFriend();
         }