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

Fixed file transfer display if using new API to store images

Browse source
This commit is contained in:
Sylvain Berfini 2018-09-06 11:59:46 +02:00
parent 1f5d906c57
commit 3d94dc0629
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -296,11 +296,20 @@ public class ChatEventsAdapter extends SelectableAdapter<ChatBubbleViewHolder> {
String externalBodyUrl = message.getExternalBodyUrl(); String externalBodyUrl = message.getExternalBodyUrl();
Content fileTransferContent = message.getFileTransferInformation(); Content fileTransferContent = message.getFileTransferInformation();
if (message.getAppdata() != null) { // Something to display boolean hasFile = message.getAppdata() != null;
boolean hasFileTransfer = externalBodyUrl != null;
for (Content c : message.getContents()) {
if (c.isFile()) {
hasFile = true;
} else if (c.isFileTransfer()) {
hasFileTransfer = true;
}
}
if (hasFile) { // Something to display
displayAttachedFile(message, holder); displayAttachedFile(message, holder);
} }
if (externalBodyUrl != null) { // Incoming file transfer not yet downloaded if (hasFileTransfer) { // Incoming file transfer not yet downloaded
holder.fileName.setVisibility(View.VISIBLE); holder.fileName.setVisibility(View.VISIBLE);
holder.fileName.setText(fileTransferContent.getName()); holder.fileName.setText(fileTransferContent.getName());
@ -493,6 +502,14 @@ public class ChatEventsAdapter extends SelectableAdapter<ChatBubbleViewHolder> {
holder.fileName.setVisibility(View.VISIBLE); holder.fileName.setVisibility(View.VISIBLE);
String appData = message.getAppdata(); String appData = message.getAppdata();
if (appData == null) {
for (Content c : message.getContents()) {
if (c.isFile()) {
appData = c.getFilePath();
}
}
}
if (appData != null) { if (appData != null) {
holder.fileName.setText(LinphoneUtils.getNameFromFilePath(appData)); holder.fileName.setText(LinphoneUtils.getNameFromFilePath(appData));
if (LinphoneUtils.isExtensionImage(appData)) { if (LinphoneUtils.isExtensionImage(appData)) {