moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-24 09:42:17 -05:00
Code Issues Releases Wiki Activity

show file size for files smaller 1024 bytes. fixes #2415

Browse Source
This commit is contained in:
Daniel Gultsch 2017-03-31 09:26:55 +02:00
parent cf96a5e840
commit 4bfc54e51d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View File

@ -159,7 +159,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
} }
} }
private void displayStatus(ViewHolder viewHolder, Message message, int type, boolean darkBackground, boolean inValidSession) { private void displayStatus(ViewHolder viewHolder, Message message, int type, boolean darkBackground) {
String filesize = null; String filesize = null;
String info = null; String info = null;
boolean error = false; boolean error = false;
@ -182,8 +182,10 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
FileParams params = message.getFileParams(); FileParams params = message.getFileParams();
if (params.size > (1.5 * 1024 * 1024)) { if (params.size > (1.5 * 1024 * 1024)) {
filesize = params.size / (1024 * 1024)+ " MiB"; filesize = params.size / (1024 * 1024)+ " MiB";
} else if (params.size > 0) { } else if (params.size >= 1024) {
filesize = params.size / 1024 + " KiB"; filesize = params.size / 1024 + " KiB";
} else {
filesize = params.size + " B";
} }
if (message.getTransferable() != null && message.getTransferable().getStatus() == Transferable.STATUS_FAILED) { if (message.getTransferable() != null && message.getTransferable().getStatus() == Transferable.STATUS_FAILED) {
error = true; error = true;
@ -803,7 +805,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
} }
} }
displayStatus(viewHolder, message, type, darkBackground, isInValidSession); displayStatus(viewHolder, message, type, darkBackground);
return view; return view;
} }