From 3abd3091ac6aa01b76bca5c6b17023d45fb084b8 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 3 May 2019 23:25:34 +0200
Subject: introduced type private_file_message to handle attachments in PMs

---
 src/main/java/de/pixart/messenger/parser/MessageParser.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/parser/MessageParser.java')

diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index 38ed21a3a..d67e84371 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -658,7 +658,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                             mXmppConnectionService.updateMessage(replacedMessage, uuid);
                             if (mXmppConnectionService.confirmMessages()
                                     && replacedMessage.getStatus() == Message.STATUS_RECEIVED
-                                    && (replacedMessage.trusted() || replacedMessage.getType() == Message.TYPE_PRIVATE)
+                                    && (replacedMessage.trusted() || replacedMessage.isPrivateMessage()) //TODO do we really want to send receipts for all PMs?
                                     && remoteMsgId != null
                                     && !selfAddressed
                                     && !isTypeGroupChat) {
@@ -684,7 +684,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
             }
 
             boolean checkForDuplicates = (isTypeGroupChat && packet.hasChild("delay", "urn:xmpp:delay"))
-                    || message.getType() == Message.TYPE_PRIVATE
+                    || message.isPrivateMessage()
                     || message.getServerMsgId() != null
                     || (query == null && mXmppConnectionService.getMessageArchiveService().isCatchupInProgress(conversation));
             if (checkForDuplicates) {
@@ -744,7 +744,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 
             if (mXmppConnectionService.confirmMessages()
                     && message.getStatus() == Message.STATUS_RECEIVED
-                    && (message.trusted() || message.getType() == Message.TYPE_PRIVATE)
+                    && (message.trusted() || message.isPrivateMessage())
                     && remoteMsgId != null
                     && !selfAddressed
                     && !isTypeGroupChat) {
-- 
cgit v1.2.3