From 49fb5e29cd931a504bd414c3398cb0e39fa17da6 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 9 Feb 2017 15:36:36 +0100
Subject: only show failed uploads if file isn't deleted

---
 src/main/java/de/pixart/messenger/entities/Conversation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/entities/Conversation.java')

diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index 4a7b45088..db06ecb93 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -1000,7 +1000,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
             for (int i = this.messages.size() - 1; i >= 0; --i) {
                 Message message = this.messages.get(i);
                 if ((message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE) && message.getEncryption() != Message.ENCRYPTION_PGP) {
-                    if (message.getStatus() == Message.STATUS_SEND_FAILED){
+                    if (message.getStatus() == Message.STATUS_SEND_FAILED && !message.isDeleted()){
                         ++count;
                     }
                 }
-- 
cgit v1.2.3