diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-10-20 19:45:26 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-10-20 19:45:26 +0200 |
| commit | 59e861ee6904296cbe8dd43c4a29513c2e928981 (patch) | |
| tree | a3bf768814ece1c377caefca35bc535c758a47c5 /src/main/java/eu/siacs/conversations/entities/Conversation.java | |
| parent | 2860088f0ea1cd5753756861c71cc7c118094f32 (diff) | |
| parent | 9ec29bb1dcf664fea606105b7e700641a4b44ae4 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 7878cecd..299c5f7d 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -748,12 +748,7 @@ public class Conversation extends AbstractEntity implements Blockable { for (int i = this.messages.size() - 1; i >= 0; --i) { Message message = this.messages.get(i); if (message.getStatus() == Message.STATUS_UNSEND || message.getStatus() == Message.STATUS_SEND) { - String otherBody; - if (message.hasFileOnRemoteHost()) { - otherBody = message.getFileParams().url.toString(); - } else { - otherBody = message.getBody(); - } + String otherBody = message.getBody(); if (otherBody != null && otherBody.equals(body)) { return message; } |