From 5d5dfecd0aca58a64f4725b050cfbcd4f695921e Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 5 Dec 2017 16:08:47 +0100 Subject: [PATCH] Updated linphone + fixed some UI issues in chat fragment related to file transfer --- src/android/org/linphone/chat/ChatEventsAdapter.java | 4 +++- submodules/linphone | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java index 9383b872a..ae4efb476 100644 --- a/src/android/org/linphone/chat/ChatEventsAdapter.java +++ b/src/android/org/linphone/chat/ChatEventsAdapter.java @@ -143,6 +143,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa holder.messageStatus.setVisibility(View.INVISIBLE); holder.messageSendingInProgress.setVisibility(View.GONE); holder.imdmLayout.setVisibility(View.INVISIBLE); + holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); if (isEditionEnabled()) { holder.delete.setOnCheckedChangeListener(null); @@ -293,7 +294,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa } holder.fileTransferLayout.setVisibility(View.GONE); - if (message.getState() == ChatMessage.State.InProgress) { + if (message.getState() == ChatMessage.State.InProgress && message.getFileTransferFilepath() != null) { // Only for file transfer InProgress state message.setListener(this); // add the listener for file upload progress display holder.messageSendingInProgress.setVisibility(View.GONE); holder.fileTransferLayout.setVisibility(View.VISIBLE); @@ -443,6 +444,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa holder.fileTransferProgressBar.setVisibility(View.GONE); holder.fileTransferLayout.setVisibility(View.GONE); displayAttachedFile(message, holder); + message.setFileTransferFilepath(null); // Not needed anymore, will help differenciate between InProgress states for file transfer / message sending } else { holder.fileTransferProgressBar.setVisibility(View.VISIBLE); holder.fileTransferProgressBar.setProgress(offset * 100 / total); diff --git a/submodules/linphone b/submodules/linphone index 385aeb335..71c508830 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 385aeb3357513bdc7d92dcb03a194036854be629 +Subproject commit 71c5088307a50a4bd424e63b27b2698381490eec