From b3382daf26078286996cfe5358ab35aa3c85777b Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 9 Nov 2017 13:12:13 +0100 Subject: [PATCH] Fixed incoming file transfer messages UI + updated linphone --- src/android/org/linphone/chat/ChatEventsAdapter.java | 8 +++----- submodules/linphone | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java index 73055b5c2..c561b1261 100644 --- a/src/android/org/linphone/chat/ChatEventsAdapter.java +++ b/src/android/org/linphone/chat/ChatEventsAdapter.java @@ -305,9 +305,10 @@ public class ChatEventsAdapter extends BaseAdapter implements ChatMessageListene } String externalBodyUrl = message.getExternalBodyUrl(); + Log.e("External body url is " + externalBodyUrl); Content fileTransferContent = message.getFileTransferInformation(); String appData = message.getAppdata(); - if (externalBodyUrl != null) { // Incoming file transfer + if (externalBodyUrl != null || fileTransferContent != null) { // Incoming file transfer if (appData != null) { // Download already done, just display the result displayAttachedFile(message, holder); } else { // Attachment not yet downloaded @@ -357,12 +358,8 @@ public class ChatEventsAdapter extends BaseAdapter implements ChatMessageListene holder.bubbleLayout.setLayoutParams(layoutParams); } else { // Event is not chat message - /*if (event.isFullState()) { // Do not display full state events - return view; - }*/ holder.eventLayout.setVisibility(View.VISIBLE); - Log.d("Conference event type is " + event.getType().toString()); Address address = event.getParticipantAddress(); String displayName = null; if (address != null) { @@ -495,6 +492,7 @@ public class ChatEventsAdapter extends BaseAdapter implements ChatMessageListene holder.fileTransferLayout.setVisibility(View.GONE); displayAttachedFile(message, holder); } else { + holder.fileTransferAction.setVisibility(View.GONE); holder.fileTransferProgressBar.setVisibility(View.VISIBLE); holder.fileTransferProgressBar.setProgress(offset * 100 / total); } diff --git a/submodules/linphone b/submodules/linphone index 79e6d1ca3..7018a708c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 79e6d1ca3cbf9fb61e2c1329327217db99205aae +Subproject commit 7018a708c318e29a5fea288cb024ece801f79253