From 4c394c9f1bb8e213ab308cf050f2ec73ca50d148 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 30 Jan 2019 16:42:47 +0100
Subject: [PATCH] Fixes & improvements for contacts, most of them for tablets

---
 .../org/linphone/contacts/AndroidContact.java | 13 --------
 .../contacts/AsyncContactsLoader.java         | 11 +++----
 .../contacts/ContactDetailsFragment.java      | 31 +++++++++++++------
 .../linphone/contacts/ContactsFragment.java   |  5 +--
 .../linphone/contacts/ContactsManager.java    | 17 ++++++++--
 5 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/org/linphone/contacts/AndroidContact.java b/app/src/main/java/org/linphone/contacts/AndroidContact.java
index 8bd07ab5c..c307f8729 100644
--- a/app/src/main/java/org/linphone/contacts/AndroidContact.java
+++ b/app/src/main/java/org/linphone/contacts/AndroidContact.java
@@ -113,19 +113,6 @@ class AndroidContact implements Serializable {
                             mAndroidRawId = rawId;
                             isAndroidRawIdLinphone = true;
                         }
-                        /*if (rawId.equals(mAndroidRawId)) {
-                            Log.i("[Contact] Contact with RAW ID " + rawId + " updated");
-                        } else {
-                            if (mAndroidRawId != null && isAndroidRawIdLinphone) {
-                                Log.w(
-                                        "[Contact] Linphone RAW ID "
-                                                + rawId
-                                                + " doesn't match existing RAW ID "
-                                                + mAndroidRawId);
-                            } else {
-
-                            }
-                        }*/
                     }
                 }
             } catch (Exception e) {
diff --git a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
index cd5cb7ad8..9aaaef8f0 100644
--- a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
+++ b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
@@ -235,12 +235,6 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
 
     @Override
     protected void onPostExecute(AsyncContactsData data) {
-
-        for (ContactsUpdatedListener listener :
-                ContactsManager.getInstance().getContactsListeners()) {
-            listener.onContactsUpdated();
-        }
-
         for (LinphoneContact contact : data.contacts) {
             contact.createOrUpdateFriendFromNativeContact();
         }
@@ -255,6 +249,11 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
 
         ContactsManager.getInstance().setContacts(data.contacts);
         ContactsManager.getInstance().setSipContacts(data.sipContacts);
+
+        for (ContactsUpdatedListener listener :
+                ContactsManager.getInstance().getContactsListeners()) {
+            listener.onContactsUpdated();
+        }
         Log.i("[Contacts Manager] Synchronization finished");
     }
 
diff --git a/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java b/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
index 7071053a8..f19ab8bd1 100644
--- a/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
+++ b/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
@@ -52,7 +52,8 @@ import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.ImageUtils;
 import org.linphone.utils.LinphoneUtils;
 
-public class ContactDetailsFragment extends Fragment implements OnClickListener {
+public class ContactDetailsFragment extends Fragment
+        implements OnClickListener, ContactsUpdatedListener {
     private LinphoneContact mContact;
     private ImageView mEditContact, mDeleteContact, mBack;
     private TextView mOrganization;
@@ -180,14 +181,6 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
         return mView;
     }
 
-    @Override
-    public void onPause() {
-        if (mChatRoom != null) {
-            mChatRoom.removeListener(mChatRoomCreationListener);
-        }
-        super.onPause();
-    }
-
     public void changeDisplayedContact(LinphoneContact newContact) {
         mContact = newContact;
         displayContact(mInflater, mView);
@@ -317,17 +310,35 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
         }
     }
 
+    @Override
+    public void onContactsUpdated() {
+        LinphoneContact contact =
+                ContactsManager.getInstance().findContactFromAndroidId(mContact.getAndroidId());
+        if (contact != null) {
+            changeDisplayedContact(contact);
+        }
+    }
+
     @Override
     public void onResume() {
         super.onResume();
 
+        ContactsManager.getInstance().addContactsListener(this);
         if (LinphoneActivity.isInstanciated()) {
             LinphoneActivity.instance().selectMenu(FragmentsAvailable.CONTACT_DETAIL);
         }
-        // mContact.refresh();
         displayContact(mInflater, mView);
     }
 
+    @Override
+    public void onPause() {
+        if (mChatRoom != null) {
+            mChatRoom.removeListener(mChatRoomCreationListener);
+        }
+        ContactsManager.getInstance().removeContactsListener(this);
+        super.onPause();
+    }
+
     @Override
     public void onClick(View v) {
         int id = v.getId();
diff --git a/app/src/main/java/org/linphone/contacts/ContactsFragment.java b/app/src/main/java/org/linphone/contacts/ContactsFragment.java
index 4e9228b60..27750bf02 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsFragment.java
+++ b/app/src/main/java/org/linphone/contacts/ContactsFragment.java
@@ -360,8 +360,9 @@ public class ContactsFragment extends Fragment
     @Override
     public void onContactsUpdated() {
         if (!LinphoneActivity.isInstanciated()
-                || LinphoneActivity.instance().getCurrentFragment()
-                        != FragmentsAvailable.CONTACTS_LIST) return;
+                || (LinphoneActivity.instance().getCurrentFragment()
+                                != FragmentsAvailable.CONTACTS_LIST
+                        && !LinphoneActivity.instance().isTablet())) return;
         if (mContactAdapter != null) {
             mContactAdapter.updateDataSet(
                     mOnlyDisplayLinphoneContacts
diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.java b/app/src/main/java/org/linphone/contacts/ContactsManager.java
index 36fd1905f..e26d803a6 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.java
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.java
@@ -335,6 +335,17 @@ public class ContactsManager extends ContentObserver implements FriendListListen
         }
     }
 
+    public synchronized LinphoneContact findContactFromAndroidId(String androidId) {
+        if (androidId == null) return null;
+
+        for (LinphoneContact c : getContacts()) {
+            if (c.getAndroidId() != null && c.getAndroidId().equals(androidId)) {
+                return c;
+            }
+        }
+        return null;
+    }
+
     public synchronized LinphoneContact findContactFromAddress(Address address) {
         if (address == null) return null;
         Core lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
@@ -480,10 +491,10 @@ public class ContactsManager extends ContentObserver implements FriendListListen
             Collections.sort(mSipContacts);
             Collections.sort(mGroupChatContacts);
             Collections.sort(mLimeX3dhContacts);
+        }
 
-            for (ContactsUpdatedListener listener : mContactsUpdatedListeners) {
-                listener.onContactsUpdated();
-            }
+        for (ContactsUpdatedListener listener : mContactsUpdatedListeners) {
+            listener.onContactsUpdated();
         }
     }
 }