mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Fix display of moderated images + fix message deletion

Browse source 
(cherry picked from commit 7e2db4bd91)
This commit is contained in:
Stephen Paul Weber 2023-10-10 21:01:33 +02:00 • committed by 12aw
parent 8e1fe64a98
commit d139fb628c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -1695,8 +1695,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
final Transferable transferable = message.getTransferable();
final boolean unInitiatedButKnownSize = MessageUtils.unInitiatedButKnownSize(message);
if (unInitiatedButKnownSize || (message.isFileDeleted() && message.getModerated() == null) || (transferable != null && transferable.getStatus() != Transferable.STATUS_UPLOADING)) {
if (unInitiatedButKnownSize || message.isMessageDeleted() || transferable != null && transferable.getStatus() == Transferable.STATUS_OFFER) {
if (unInitiatedButKnownSize || message.isMessageDeleted() || (transferable != null && transferable.getStatus() != Transferable.STATUS_UPLOADING)) {
if (unInitiatedButKnownSize || (message.isMessageDeleted() && message.getModerated() == null) || transferable != null && transferable.getStatus() == Transferable.STATUS_OFFER) {
displayDownloadableMessage(viewHolder, message, activity.getString(R.string.download_x_file, UIHelper.getFileDescriptionString(activity, message)), darkBackground, type);
} else if (transferable != null && transferable.getStatus() == Transferable.STATUS_OFFER_CHECK_FILESIZE) {
displayDownloadableMessage(viewHolder, message, activity.getString(R.string.check_x_filesize, UIHelper.getFileDescriptionString(activity, message)), darkBackground, type);