From b7156056022384be0747fb233365cfd4049208b8 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 13 Jul 2018 16:54:17 +0200 Subject: [PATCH] Display images without using the appData --- src/android/org/linphone/chat/ChatEventsAdapter.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java index d06305350..0436dc7ef 100644 --- a/src/android/org/linphone/chat/ChatEventsAdapter.java +++ b/src/android/org/linphone/chat/ChatEventsAdapter.java @@ -337,7 +337,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter { String externalBodyUrl = message.getExternalBodyUrl(); Content fileTransferContent = message.getFileTransferInformation(); - if (message.getAppdata() != null) { // Something to display + if (fileTransferContent != null && fileTransferContent.isFile()) { // Something to display displayAttachedFile(message, holder); } @@ -506,9 +506,10 @@ public class ChatEventsAdapter extends ListSelectionAdapter { private void displayAttachedFile(ChatMessage message, ChatBubbleViewHolder holder) { holder.fileName.setVisibility(View.VISIBLE); - String appData = message.getAppdata(); - if (appData != null) { - holder.fileName.setText(LinphoneUtils.getNameFromFilePath(appData)); + Content fileContent = message.getFileTransferInformation(); + String appData = fileContent.getFilePath(); + if (fileContent != null && fileContent.isFile() && appData != null) { + holder.fileName.setText(fileContent.getName()); if (LinphoneUtils.isExtensionImage(appData)) { holder.messageImage.setVisibility(View.VISIBLE); loadBitmap(appData, holder.messageImage);