From 0a5d12cbc36e081d393e054dd6b3f4f55598b876 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Tue, 12 May 2020 11:32:00 +1000 Subject: [PATCH] Debug --- src/org/thoughtcrime/securesms/jobs/TypingSendJob.java | 6 ++---- .../securesms/notifications/MarkReadReceiver.java | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java b/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java index dd8260080..92d08f34b 100644 --- a/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java @@ -21,9 +21,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage. import org.whispersystems.signalservice.api.push.SignalServiceAddress; import java.util.Collections; -import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.concurrent.TimeUnit; import javax.inject.Inject; @@ -86,11 +84,11 @@ public class TypingSendJob extends BaseJob implements InjectableType { throw new IllegalStateException("Tried to send a typing indicator to a non-existent thread."); } - Set recipients = new HashSet<>(Collections.singletonList(recipient)); + List recipients = Collections.singletonList(recipient); Optional groupId = Optional.absent(); if (recipient.isGroupRecipient()) { - recipients = new HashSet<>(DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipient.getAddress().toGroupString(), false)); + recipients = DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipient.getAddress().toGroupString(), false); groupId = Optional.of(GroupUtil.getDecodedId(recipient.getAddress().toGroupString())); } diff --git a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java index 5ee1a0c43..0ad6cd020 100644 --- a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java +++ b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java @@ -77,8 +77,9 @@ public class MarkReadReceiver extends BroadcastReceiver { for (MarkedMessageInfo messageInfo : markedReadMessages) { scheduleDeletion(context, messageInfo.getExpirationInfo()); - if (!SyncMessagesProtocol.shouldSyncReadReceipt(messageInfo.getSyncMessageId().getAddress())) { continue; } - syncMessageIds.add(messageInfo.getSyncMessageId()); + if (SyncMessagesProtocol.shouldSyncReadReceipt(messageInfo.getSyncMessageId().getAddress())) { + syncMessageIds.add(messageInfo.getSyncMessageId()); + } } ApplicationContext.getInstance(context)