From f3e6c0c76fb1ad718c0642b4ec787ccb50ea11ed Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 1 Feb 2018 13:51:06 +0100 Subject: [PATCH] Improved code a bit --- .../org/linphone/chat/GroupChatFragment.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java index fb4c55596..304a714a7 100644 --- a/src/android/org/linphone/chat/GroupChatFragment.java +++ b/src/android/org/linphone/chat/GroupChatFragment.java @@ -622,20 +622,17 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con cr.markAsRead(); LinphoneActivity.instance().updateMissedChatCount(); - if (event.getType() == EventLog.Type.ConferenceChatMessage) { - ChatMessage message = event.getChatMessage(); - if (message.getErrorInfo() != null && message.getErrorInfo().getReason() == Reason.UnsupportedContent) { - Log.w("Message received but content is unsupported, do not display it"); - return; - } - - if (!message.hasTextContent() && message.getFileTransferInformation() == null) { - Log.w("Message has no text or file transfer information to display, ignoring it..."); - return; - } + ChatMessage msg = event.getChatMessage(); + if (msg.getErrorInfo() != null && msg.getErrorInfo().getReason() == Reason.UnsupportedContent) { + Log.w("Message received but content is unsupported, do not display it"); + return; + } + + if (!msg.hasTextContent() && msg.getFileTransferInformation() == null) { + Log.w("Message has no text or file transfer information to display, ignoring it..."); + return; } - ChatMessage msg = event.getChatMessage(); String externalBodyUrl = msg.getExternalBodyUrl(); Content fileTransferContent = msg.getFileTransferInformation(); if (externalBodyUrl != null || fileTransferContent != null) {