From 690fb488b77275c0285462f5a4912a081ee82ac5 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 18 Feb 2019 11:43:21 +0100
Subject: [PATCH] Prevent crash if message is not found in ImdnFragment for
 some reason

---
 .../java/org/linphone/chat/ImdnFragment.java  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/linphone/chat/ImdnFragment.java b/app/src/main/java/org/linphone/chat/ImdnFragment.java
index 59baa62f1..873d8d24d 100644
--- a/app/src/main/java/org/linphone/chat/ImdnFragment.java
+++ b/app/src/main/java/org/linphone/chat/ImdnFragment.java
@@ -117,8 +117,6 @@ public class ImdnFragment extends Fragment {
                         refreshInfo();
                     }
                 };
-        if (mMessage == null) return null;
-        mMessage.setListener(mListener);
 
         return view;
     }
@@ -132,14 +130,16 @@ public class ImdnFragment extends Fragment {
         }
 
         refreshInfo();
-        mMessage.setListener(
-                new ChatMessageListenerStub() {
-                    @Override
-                    public void onParticipantImdnStateChanged(
-                            ChatMessage msg, ParticipantImdnState state) {
-                        refreshInfo();
-                    }
-                });
+        if (mMessage != null) {
+            mMessage.setListener(
+                    new ChatMessageListenerStub() {
+                        @Override
+                        public void onParticipantImdnStateChanged(
+                                ChatMessage msg, ParticipantImdnState state) {
+                            refreshInfo();
+                        }
+                    });
+        }
     }
 
     @Override