From 3a5f5a9a414de82dae2e33eb79719543b11361f6 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 6 Aug 2019 09:46:43 +1000 Subject: [PATCH] Fix ratcheting bug --- src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java index 5c504176ef..a5d80b16ee 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java @@ -111,7 +111,6 @@ import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSy import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage; import org.whispersystems.signalservice.api.messages.shared.SharedContact; import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import org.whispersystems.signalservice.loki.api.LokiGroupChatAPI; import org.whispersystems.signalservice.loki.crypto.LokiServiceCipher; import org.whispersystems.signalservice.loki.messaging.LokiMessageFriendRequestStatus; import org.whispersystems.signalservice.loki.messaging.LokiServiceMessage; @@ -831,13 +830,10 @@ public class PushDecryptJob extends BaseJob implements InjectableType { } Long threadId; - boolean isLokiPublicChatMessage; if (smsMessageId.isPresent() && !message.getGroupInfo().isPresent()) { - isLokiPublicChatMessage = false; threadId = database.updateBundleMessageBody(smsMessageId.get(), body).second; } else { - isLokiPublicChatMessage = new String(message.getGroupInfo().get().getGroupId()).equals("loki-group-chat-" + LokiGroupChatAPI.getPublicChatID()); notifyTypingStoppedFromIncomingMessage(recipient, content.getSender(), content.getSenderDevice()); IncomingTextMessage textMessage = new IncomingTextMessage(Address.fromSerialized(content.getSender()), @@ -856,7 +852,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType { if (smsMessageId.isPresent()) database.deleteMessage(smsMessageId.get()); } - if (threadId != null && !isLokiPublicChatMessage) { + if (threadId != null) { MessageNotifier.updateNotification(context, threadId); } }