From 1a01d41db437876b8f3216f6aef63050a575fb6d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 13 Sep 2018 12:08:41 +0200
Subject: [PATCH] Fixed contacts list empty after device rotation

---
 .../org/linphone/contacts/ContactsListAdapter.java        | 1 -
 src/android/org/linphone/contacts/ContactsManager.java    | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/android/org/linphone/contacts/ContactsListAdapter.java b/src/android/org/linphone/contacts/ContactsListAdapter.java
index 225cb9e36..6d6cb624f 100644
--- a/src/android/org/linphone/contacts/ContactsListAdapter.java
+++ b/src/android/org/linphone/contacts/ContactsListAdapter.java
@@ -113,7 +113,6 @@ public class ContactsListAdapter extends SelectableAdapter<ContactsListAdapter.V
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.contact_cell, parent, false);
         return new ViewHolder(v, mClickListener);
-
     }
 
     @Override
diff --git a/src/android/org/linphone/contacts/ContactsManager.java b/src/android/org/linphone/contacts/ContactsManager.java
index ca60591cf..dcd1adb7c 100644
--- a/src/android/org/linphone/contacts/ContactsManager.java
+++ b/src/android/org/linphone/contacts/ContactsManager.java
@@ -206,8 +206,12 @@ public class ContactsManager extends ContentObserver implements FriendListListen
     }
 
     public void initializeContactManager(Activity activity) {
-        mActivity = activity;
-        mActivity.getLoaderManager().initLoader(CONTACTS_LOADER, null, this);
+        if (mActivity == null) {
+            mActivity = activity;
+            mActivity.getLoaderManager().initLoader(CONTACTS_LOADER, null, this);
+        } else if (mActivity != activity){
+            mActivity = activity;
+        }
     }
 
     public void initializeSyncAccount(Activity activity) {