Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated linphone + fixed some UI issues in chat fragment related to file transfer

Browse source
This commit is contained in:
Sylvain Berfini 2017-12-05 16:08:47 +01:00
parent 502af0ae40
commit 5d5dfecd0a
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/android/org/linphone/chat/ChatEventsAdapter.java
View file

@ -143,6 +143,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
holder.messageStatus.setVisibility(View.INVISIBLE); holder.messageStatus.setVisibility(View.INVISIBLE);
holder.messageSendingInProgress.setVisibility(View.GONE); holder.messageSendingInProgress.setVisibility(View.GONE);
holder.imdmLayout.setVisibility(View.INVISIBLE); holder.imdmLayout.setVisibility(View.INVISIBLE);
holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
if (isEditionEnabled()) { if (isEditionEnabled()) {
holder.delete.setOnCheckedChangeListener(null); holder.delete.setOnCheckedChangeListener(null);
@ -293,7 +294,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
} }
holder.fileTransferLayout.setVisibility(View.GONE); 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 message.setListener(this); // add the listener for file upload progress display
holder.messageSendingInProgress.setVisibility(View.GONE); holder.messageSendingInProgress.setVisibility(View.GONE);
holder.fileTransferLayout.setVisibility(View.VISIBLE); holder.fileTransferLayout.setVisibility(View.VISIBLE);
@ -443,6 +444,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
holder.fileTransferProgressBar.setVisibility(View.GONE); holder.fileTransferProgressBar.setVisibility(View.GONE);
holder.fileTransferLayout.setVisibility(View.GONE); holder.fileTransferLayout.setVisibility(View.GONE);
displayAttachedFile(message, holder); displayAttachedFile(message, holder);
message.setFileTransferFilepath(null); // Not needed anymore, will help differenciate between InProgress states for file transfer / message sending
} else { } else {
holder.fileTransferProgressBar.setVisibility(View.VISIBLE); holder.fileTransferProgressBar.setVisibility(View.VISIBLE);
holder.fileTransferProgressBar.setProgress(offset * 100 / total); holder.fileTransferProgressBar.setProgress(offset * 100 / total);

2
submodules/linphone

@ -1 +1 @@
Subproject commit 385aeb3357513bdc7d92dcb03a194036854be629 Subproject commit 71c5088307a50a4bd424e63b27b2698381490eec