diff options
author | lookshe <github@lookshe.org> | 2016-03-12 15:51:17 +0100 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-03-12 15:51:17 +0100 |
commit | 14c2c72bc1a00c8b9839047cdc73116e561ecd62 (patch) | |
tree | fe0828e9357d1876a0e3aa72ae13a2dad19718c4 /src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java | |
parent | 2a486c667a0c81772fcf125c5c3c9b49c78250e3 (diff) | |
parent | dc26c95b40c3d0f48ed539f91e53c1bff1dceec6 (diff) |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java index 3a4c3d4b..50b1e4a7 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java @@ -758,7 +758,7 @@ public class Conversation extends AbstractEntity implements Blockable { if (message.hasFileOnRemoteHost()) { otherBody = message.getFileParams().url.toString(); } else { - otherBody = message.body; + otherBody = message.getBody(); } if (otherBody != null && otherBody.equals(body)) { return message; |