From 1420ff0d2fb0fab3fd13424c7271b2fed23445a4 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 10 Dec 2018 11:37:40 +0100
Subject: [PATCH] Updated timespan for grouping messages to 5 min

---
 .../main/java/org/linphone/chat/ChatMessagesAdapter.java    | 2 +-
 .../java/org/linphone/contacts/ContactDetailsFragment.java  | 2 +-
 .../main/java/org/linphone/contacts/LinphoneContact.java    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java b/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
index f6b12f56b..2e87fb613 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
@@ -41,7 +41,7 @@ import org.linphone.utils.SelectableHelper;
 
 public class ChatMessagesAdapter extends SelectableAdapter<ChatMessageViewHolder>
         implements ChatMessagesGenericAdapter {
-    private static final int MAX_TIME_TO_GROUP_MESSAGES = 60;
+    private static final int MAX_TIME_TO_GROUP_MESSAGES = 300; // 5 minutes
 
     private final Context mContext;
     private List<EventLog> mHistory;
diff --git a/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java b/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
index 4c46b5987..a8d5f8109 100644
--- a/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
+++ b/app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
@@ -323,7 +323,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
         if (LinphoneActivity.isInstanciated()) {
             LinphoneActivity.instance().selectMenu(FragmentsAvailable.CONTACT_DETAIL);
         }
-        mContact.refresh();
+        // mContact.refresh();
         displayContact(mInflater, mView);
     }
 
diff --git a/app/src/main/java/org/linphone/contacts/LinphoneContact.java b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
index efe4c35e3..4cdeabc52 100644
--- a/app/src/main/java/org/linphone/contacts/LinphoneContact.java
+++ b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
@@ -20,7 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import android.net.Uri;
-import androidx.core.util.Pair;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -430,7 +429,7 @@ public class LinphoneContact extends AndroidContact
 
     public void refresh() {
         mAddresses = new ArrayList<>();
-        if (isAndroidContact()) {
+        /*if (isAndroidContact()) {
             Pair<String, String> names = getContactNames();
             if (names != null) {
                 mFirstName = names.first;
@@ -444,7 +443,8 @@ public class LinphoneContact extends AndroidContact
             for (LinphoneNumberOrAddress noa : getAddressesAndNumbersForAndroidContact()) {
                 addNumberOrAddress(noa);
             }
-        } else if (isFriend()) {
+        }*/
+        if (isFriend()) {
             mFullName = mFriend.getName();
             mLastName = mFriend.getVcard().getFamilyName();
             mFirstName = mFriend.getVcard().getGivenName();