diff options
author | Christian Schneppe <christian@pix-art.de> | 2019-05-03 23:25:34 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2019-05-03 23:25:34 +0200 |
commit | 3abd3091ac6aa01b76bca5c6b17023d45fb084b8 (patch) | |
tree | 8a105cffc34caf7a90482e989c5d6aa95b4ebc6e /src/main/java/de/pixart/messenger/entities/Conversation.java | |
parent | ace3930d3ca1d56e679e8f38beb6a269d110b1a1 (diff) |
introduced type private_file_message to handle attachments in PMs
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities/Conversation.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 acaf9b643..7e1a9e91a 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -548,7 +548,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl final Message message = messages.get(i); if (message.getStatus() <= Message.STATUS_RECEIVED && (message.markable || isPrivateAndNonAnonymousMuc) - && message.getType() != Message.TYPE_PRIVATE) { + && !message.isPrivateMessage()) { return message; } } @@ -929,7 +929,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl synchronized (this.messages) { for (int i = this.messages.size() - 1; i >= 0; --i) { final Message message = this.messages.get(i); - if (message.getType() == Message.TYPE_PRIVATE) { + if (message.isPrivateMessage()) { continue; //it's unsafe to use private messages as anchor. They could be coming from user archive } if (message.getStatus() == Message.STATUS_RECEIVED || message.isCarbon() || message.getServerMsgId() != null) { |