diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-02-10 21:03:10 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-02-10 21:03:10 +0100 |
| commit | 53b200f6b17d134c8efbe19ef98d427548b46589 (patch) | |
| tree | dbf9840124edd9a344e15397e3e1a6b3bf134580 /src/main/java | |
| parent | ee460b64d867b977b651f4a6d6df3598cceca261 (diff) | |
only show and try resend for files which are not uploaded
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index f643cb888..c23305b3e 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -168,7 +168,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl for (final Message message : this.messages) { if ((message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE) && message.getEncryption() != Message.ENCRYPTION_PGP) { - if (message.getStatus() == Message.STATUS_SEND_FAILED && !message.isDeleted()) { + if (message.getStatus() == Message.STATUS_SEND_FAILED && !message.isDeleted() && message.needsUploading()) { onMessageFound.onMessageFound(message); } } @@ -1016,7 +1016,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 && !message.isDeleted()){ + if (message.getStatus() == Message.STATUS_SEND_FAILED && !message.isDeleted() && message.needsUploading()){ ++count; } } |