aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-06-11 19:07:02 +0200
committerChristian Schneppe <christian@pix-art.de>2017-06-11 19:07:02 +0200
commite1a427722b0d57eea9b2deda9846359819e37a58 (patch)
tree1c0c77f01142560af43a0fb738ff4fd417d4bb54 /src/main
parentf98da925da455b3907cb8d011f05210c8e13b7a5 (diff)
do not accept LMC for files
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Conversation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index d95894d00..0ebd31b71 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -282,7 +282,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
if (counterpart.equals(message.getCounterpart())
&& ((message.getStatus() == Message.STATUS_RECEIVED) == received)
&& (carbon == message.isCarbon() || received)) {
- if (id.equals(message.getRemoteMsgId())) {
+ if (id.equals(message.getRemoteMsgId()) && !message.isFileOrImage() && !message.treatAsDownloadable()) {
return message;
} else {
return null;