From 2c8e5bfbe11e48206e58f145269e9e4731834a05 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 30 Apr 2018 10:01:11 +0200
Subject: [PATCH] Updated linphone submodule + improved IMDN view

---
 res/layout/chat_imdn.xml                      | 30 +++++++++++++++-
 .../org/linphone/chat/ImdnFragment.java       | 34 ++++++++++++++++---
 submodules/linphone                           |  2 +-
 3 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/res/layout/chat_imdn.xml b/res/layout/chat_imdn.xml
index 3936d40d8..4b94d2c59 100644
--- a/res/layout/chat_imdn.xml
+++ b/res/layout/chat_imdn.xml
@@ -125,6 +125,34 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical"/>
 
+                <LinearLayout
+                    android:id="@+id/sent_layout_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="center"
+                    android:background="@color/colorG">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/font28"
+                        android:text="@string/sent"/>
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="5dp"
+                        android:src="@drawable/message_delivered"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/sent_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"/>
+
                 <LinearLayout
                     android:id="@+id/undelivered_layout_header"
                     android:layout_width="match_parent"
@@ -137,7 +165,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/font29"
-                        android:text="@string/undelivered"/>
+                        android:text="@string/error"/>
 
                     <ImageView
                         android:layout_width="wrap_content"
diff --git a/src/android/org/linphone/chat/ImdnFragment.java b/src/android/org/linphone/chat/ImdnFragment.java
index 55374c510..88bcafad7 100644
--- a/src/android/org/linphone/chat/ImdnFragment.java
+++ b/src/android/org/linphone/chat/ImdnFragment.java
@@ -49,7 +49,7 @@ import org.linphone.core.ParticipantImdnState;
 
 public class ImdnFragment extends Fragment {
 	private LayoutInflater mInflater;
-	private LinearLayout mRead, mReadHeader, mDelivered, mDeliveredHeader, mUndelivered, mUndeliveredHeader;
+	private LinearLayout mRead, mReadHeader, mDelivered, mDeliveredHeader, mSent, mSentHeader, mUndelivered, mUndeliveredHeader;
 	private ImageView mBackButton;
 	private ChatBubbleViewHolder mBubble;
 	private ViewGroup mContainer;
@@ -97,9 +97,11 @@ public class ImdnFragment extends Fragment {
 
 		mRead = view.findViewById(R.id.read_layout);
 		mDelivered = view.findViewById(R.id.delivered_layout);
+		mSent = view.findViewById(R.id.sent_layout);
 		mUndelivered = view.findViewById(R.id.undelivered_layout);
 		mReadHeader = view.findViewById(R.id.read_layout_header);
 		mDeliveredHeader = view.findViewById(R.id.delivered_layout_header);
+		mSentHeader = view.findViewById(R.id.sent_layout_header);
 		mUndeliveredHeader = view.findViewById(R.id.undelivered_layout_header);
 
 		mBubble = new ChatBubbleViewHolder(view.findViewById(R.id.bubble));
@@ -191,9 +193,10 @@ public class ImdnFragment extends Fragment {
 
 		mRead.removeAllViews();
 		mDelivered.removeAllViews();
+		mSent.removeAllViews();
 		mUndelivered.removeAllViews();
 
-		ParticipantImdnState[] participants = mMessage.getParticipantsThatHaveDisplayed();
+		ParticipantImdnState[] participants = mMessage.getParticipantsByImdnState(ChatMessage.State.Displayed);
 		mReadHeader.setVisibility(participants.length == 0 ? View.GONE : View.VISIBLE);
 		boolean first = true;
 		for (ParticipantImdnState participant : participants) {
@@ -216,7 +219,7 @@ public class ImdnFragment extends Fragment {
 			first = false;
 		}
 
-		participants = mMessage.getParticipantsThatHaveReceived();
+		participants = mMessage.getParticipantsByImdnState(ChatMessage.State.DeliveredToUser);
 		mDeliveredHeader.setVisibility(participants.length == 0 ? View.GONE : View.VISIBLE);
 		first = true;
 		for (ParticipantImdnState participant : participants) {
@@ -239,7 +242,30 @@ public class ImdnFragment extends Fragment {
 			first = false;
 		}
 
-		participants = mMessage.getParticipantsThatHaveNotReceived();
+		participants = mMessage.getParticipantsByImdnState(ChatMessage.State.Delivered);
+		mSentHeader.setVisibility(participants.length == 0 ? View.GONE : View.VISIBLE);
+		first = true;
+		for (ParticipantImdnState participant : participants) {
+			Address address = participant.getParticipant().getAddress();
+
+			LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address);
+			String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address);
+
+			View v = mInflater.inflate(R.layout.chat_imdn_cell, mContainer, false);
+			v.findViewById(R.id.separator).setVisibility(first ? View.GONE : View.VISIBLE);
+			((TextView)v.findViewById(R.id.time)).setText(LinphoneUtils.timestampToHumanDate(getActivity(), participant.getStateChangeTime(), R.string.messages_date_format));
+			((TextView)v.findViewById(R.id.name)).setText(participantDisplayName);
+			if (participantContact != null && participantContact.hasPhoto()) {
+				LinphoneUtils.setThumbnailPictureFromUri(getActivity(), ((ImageView)v.findViewById(R.id.contact_picture)), participantContact.getThumbnailUri());
+			} else {
+				((ImageView)v.findViewById(R.id.contact_picture)).setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
+			}
+
+			mSent.addView(v);
+			first = false;
+		}
+
+		participants = mMessage.getParticipantsByImdnState(ChatMessage.State.NotDelivered);
 		mUndeliveredHeader.setVisibility(participants.length == 0 ? View.GONE : View.VISIBLE);
 		first = true;
 		for (ParticipantImdnState participant : participants) {
diff --git a/submodules/linphone b/submodules/linphone
index 480cca5f5..0041defd0 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 480cca5f5be39723359a30a319f64f37607cc437
+Subproject commit 0041defd0085c928e6e9dd659f1eae015254cb04