From d52f09b6f4f165fda2d147cd968dcee23524c339 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 17 Jul 2019 20:44:34 +0200 Subject: handle blocking and unblocking of full jids --- src/main/java/de/pixart/messenger/parser/MessageParser.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 a0080e4da..d0831aef9 100644 --- a/src/main/java/de/pixart/messenger/parser/MessageParser.java +++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java @@ -220,7 +220,8 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece service.reportBrokenSessionException(e, postpone); return new Message(conversation, "", Message.ENCRYPTION_AXOLOTL_FAILED, status); } else { - Log.d(Config.LOGTAG, "ignoring broken session exception because checkForDuplicase failed"); + Log.d(Config.LOGTAG, "ignoring broken session exception because checkForDuplicates failed"); + //TODO should be still emit a failed message? return null; } } catch (NotEncryptedForThisDeviceException e) { @@ -557,7 +558,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece fallbacksBySourceId = Collections.emptySet(); origin = from; } - + //TODO either or is probably fine? final boolean checkedForDuplicates = serverMsgId != null && remoteMsgId != null && !conversation.possibleDuplicate(serverMsgId, remoteMsgId); if (origin != null) { -- cgit v1.2.3