From 94f792c6e572d4f8a7f061b4ad60bf28cce931aa Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Sun, 25 Nov 2018 20:40:37 +0100
Subject: [PATCH] Fixed IMDN view display

---
 .../main/java/org/linphone/chat/ImdnFragment.java  | 13 +++++++++++++
 app/src/main/res/layout/chat_bubble.xml            |  1 +
 app/src/main/res/layout/chat_imdn.xml              | 14 +++++++-------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/linphone/chat/ImdnFragment.java b/app/src/main/java/org/linphone/chat/ImdnFragment.java
index 782003df9..d3c528b12 100644
--- a/app/src/main/java/org/linphone/chat/ImdnFragment.java
+++ b/app/src/main/java/org/linphone/chat/ImdnFragment.java
@@ -30,6 +30,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.linphone.LinphoneManager;
+import org.linphone.mediastream.Log;
 import org.linphone.utils.LinphoneUtils;
 import org.linphone.R;
 import org.linphone.LinphoneActivity;
@@ -120,6 +121,18 @@ public class ImdnFragment extends Fragment {
         }
 
         refreshInfo();
+        mMessage.setListener(new ChatMessageListenerStub() {
+            @Override
+            public void onParticipantImdnStateChanged(ChatMessage msg, ParticipantImdnState state) {
+                refreshInfo();
+            }
+        });
+    }
+
+    @Override
+    public void onPause() {
+        mMessage.setListener(null);
+        super.onPause();
     }
 
     private void refreshInfo() {
diff --git a/app/src/main/res/layout/chat_bubble.xml b/app/src/main/res/layout/chat_bubble.xml
index 4e204c832..49cc22cdd 100644
--- a/app/src/main/res/layout/chat_bubble.xml
+++ b/app/src/main/res/layout/chat_bubble.xml
@@ -126,6 +126,7 @@
             android:layout_height="wrap_content"
             android:gravity="right"
             android:layout_marginTop="7dp"
+            android:layout_marginRight="5dp"
             android:layout_marginLeft="45dp"
             android:layout_toLeftOf="@id/imdn"/>
 
diff --git a/app/src/main/res/layout/chat_imdn.xml b/app/src/main/res/layout/chat_imdn.xml
index 9a7118679..fdcfd665c 100644
--- a/app/src/main/res/layout/chat_imdn.xml
+++ b/app/src/main/res/layout/chat_imdn.xml
@@ -53,13 +53,6 @@
         android:gravity="center_horizontal"
         android:layout_below="@id/top">
 
-        <include
-            android:id="@+id/bubble"
-            layout="@layout/chat_bubble"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="20dp"/>
-
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -69,6 +62,13 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
+                <include
+                    android:id="@+id/bubble"
+                    layout="@layout/chat_bubble"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="20dp"/>
+
                 <LinearLayout
                     android:id="@+id/read_layout_header"
                     android:layout_width="match_parent"