From 9b13d2a5da58d18cbf0773c294fb34f3b6e2f76d Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Tue, 3 Oct 2017 13:47:46 +0200
Subject: [PATCH] Fixing freeze on contact update

---
 src/android/org/linphone/ChatFragment.java         | 7 +++++--
 src/android/org/linphone/ChatListFragment.java     | 5 +++++
 src/android/org/linphone/ContactsListFragment.java | 4 ++++
 src/android/org/linphone/HistoryListFragment.java  | 4 ++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/android/org/linphone/ChatFragment.java b/src/android/org/linphone/ChatFragment.java
index 3c74ea0f0..89e145baf 100644
--- a/src/android/org/linphone/ChatFragment.java
+++ b/src/android/org/linphone/ChatFragment.java
@@ -102,6 +102,7 @@ import java.util.List;
 import java.util.Locale;
 
 import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
+import static org.linphone.FragmentsAvailable.CHAT;
 
 
 public class ChatFragment extends Fragment implements OnClickListener, LinphoneChatMessage.LinphoneChatMessageListener, ContactsUpdatedListener{
@@ -544,7 +545,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 		}
 
 		if (LinphoneActivity.isInstanciated()) {
-			LinphoneActivity.instance().selectMenu(FragmentsAvailable.CHAT);
+			LinphoneActivity.instance().selectMenu(CHAT);
 		}
 
 		LinphoneManager.addListener(this);
@@ -973,7 +974,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 
 	@Override
 	public void onContactsUpdated() {
-		if(fileSharedUri != null || message.getText() != null){
+		if(LinphoneActivity.isInstanciated()
+				&& LinphoneActivity.instance().getCurrentFragment() == CHAT
+				&& fileSharedUri != null || message.getText() != null){
 			initNewChatConversation();
 		}
 	}
diff --git a/src/android/org/linphone/ChatListFragment.java b/src/android/org/linphone/ChatListFragment.java
index bd3162ab1..516d8482e 100644
--- a/src/android/org/linphone/ChatListFragment.java
+++ b/src/android/org/linphone/ChatListFragment.java
@@ -52,6 +52,8 @@ import org.linphone.mediastream.Log;
 
 import java.util.List;
 
+import static org.linphone.FragmentsAvailable.CHAT_LIST;
+
 /**
  * @author Sylvain Berfini
  */
@@ -231,6 +233,9 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 
 	@Override
 	public void onContactsUpdated() {
+		if (!LinphoneActivity.isInstanciated() || LinphoneActivity.instance().getCurrentFragment() != CHAT_LIST)
+			return;
+
 		ChatListAdapter adapter = (ChatListAdapter)chatList.getAdapter();
 		if (adapter != null) {
 			adapter.notifyDataSetChanged();
diff --git a/src/android/org/linphone/ContactsListFragment.java b/src/android/org/linphone/ContactsListFragment.java
index 59b400167..d7fc36d05 100644
--- a/src/android/org/linphone/ContactsListFragment.java
+++ b/src/android/org/linphone/ContactsListFragment.java
@@ -49,6 +49,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import static org.linphone.FragmentsAvailable.CONTACTS_LIST;
+
 /**
  * @author Sylvain Berfini
  */
@@ -418,6 +420,8 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 
 	@Override
 	public void onContactsUpdated() {
+		if (!LinphoneActivity.isInstanciated() || LinphoneActivity.instance().getCurrentFragment() != CONTACTS_LIST)
+			return;
 		ContactsListAdapter adapter = (ContactsListAdapter)contactsList.getAdapter();
 		if (adapter != null) {
 			contactsList.setFastScrollEnabled(false);
diff --git a/src/android/org/linphone/HistoryListFragment.java b/src/android/org/linphone/HistoryListFragment.java
index a58709000..a78e1f786 100644
--- a/src/android/org/linphone/HistoryListFragment.java
+++ b/src/android/org/linphone/HistoryListFragment.java
@@ -50,6 +50,8 @@ import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import static org.linphone.FragmentsAvailable.HISTORY_LIST;
+
 /**
  * @author Sylvain Berfini
  */
@@ -222,6 +224,8 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 
 	@Override
 	public void onContactsUpdated() {
+		if (!LinphoneActivity.isInstanciated() || LinphoneActivity.instance().getCurrentFragment() != HISTORY_LIST)
+			return;
 		CallHistoryAdapter adapter = (CallHistoryAdapter)historyList.getAdapter();
 		if (adapter != null) {
 			adapter.notifyDataSetChanged();