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

Fixed incoming file transfer messages UI + updated linphone

Browse source
This commit is contained in:
Sylvain Berfini 2017-11-09 13:12:13 +01:00
parent 0d25a2e296
commit b3382daf26
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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);
}

2
submodules/linphone

@ -1 +1 @@
Subproject commit 79e6d1ca3cbf9fb61e2c1329327217db99205aae
Subproject commit 7018a708c318e29a5fea288cb024ece801f79253