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

Fixed display issue due to file transfer

Browse source
This commit is contained in:
Sylvain Berfini 2019-02-25 10:40:38 +01:00
parent b75f8245ab
commit 158dc1a574
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
View file

@ -238,8 +238,14 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
private void displayContent( private void displayContent(
final ChatMessage message, Content c, View content, boolean isMultiContent) { final ChatMessage message, Content c, View content, boolean isMultiContent) {
Button download = content.findViewById(R.id.download); final Button download = content.findViewById(R.id.download);
download.setVisibility(View.GONE); download.setVisibility(View.GONE);
final ImageView bigImage = content.findViewById(R.id.bigImage);
bigImage.setVisibility(View.GONE);
final ImageView smallImage = content.findViewById(R.id.image);
smallImage.setVisibility(View.GONE);
final TextView fileName = content.findViewById(R.id.file);
fileName.setVisibility(View.GONE);
if (c.isFile() || (c.isFileTransfer() && message.isOutgoing())) { if (c.isFile() || (c.isFileTransfer() && message.isOutgoing())) {
// If message is outgoing, even if content // If message is outgoing, even if content
@ -252,15 +258,15 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
&& mContext.getResources() && mContext.getResources()
.getBoolean( .getBoolean(
R.bool.use_big_pictures_to_preview_images_file_transfers)) { R.bool.use_big_pictures_to_preview_images_file_transfers)) {
v = content.findViewById(R.id.bigImage); loadBitmap(c.getFilePath(), bigImage);
loadBitmap(c.getFilePath(), ((ImageView) v)); v = bigImage;
} else { } else {
v = content.findViewById(R.id.image); loadBitmap(c.getFilePath(), smallImage);
loadBitmap(c.getFilePath(), ((ImageView) v)); v = smallImage;
} }
} else { } else {
v = content.findViewById(R.id.file); fileName.setText(FileUtils.getNameFromFilePath(filePath));
((TextView) v).setText(FileUtils.getNameFromFilePath(filePath)); v = fileName;
} }
v.setVisibility(View.VISIBLE); v.setVisibility(View.VISIBLE);
v.setOnClickListener( v.setOnClickListener(
@ -302,7 +308,9 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Content c = (Content) v.getTag(); Content c = (Content) v.getTag();
message.downloadContent(c); if (!message.isFileTransferInProgress()) {
message.downloadContent(c);
}
} }
}); });
} else { } else {