diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java index 10d4d67a73..d15d0cf2a5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java @@ -5,17 +5,13 @@ import android.content.Context; import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; -import com.annimon.stream.Stream; - import org.signal.core.util.logging.Log; -import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessageDatabase; import org.thoughtcrime.securesms.database.NoSuchMessageException; import org.thoughtcrime.securesms.database.model.MessageId; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.ReactionRecord; -import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.groups.GroupId; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; @@ -26,17 +22,14 @@ import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientUtil; import org.thoughtcrime.securesms.transport.RetryLaterException; import org.thoughtcrime.securesms.util.GroupUtil; -import org.whispersystems.libsignal.util.guava.Optional; -import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.ContentHint; -import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.SendMessageResult; import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage; -import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; import java.io.IOException; +import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -82,10 +75,13 @@ public class ReactionSendJob extends BaseJob { throw new AssertionError("We have a message, but couldn't find the thread!"); } - List recipients = conversationRecipient.isGroup() ? Stream.of(RecipientUtil.getEligibleForSending(conversationRecipient.getParticipants())).map(Recipient::getId).toList() - : Stream.of(conversationRecipient.getId()).toList(); - - recipients.remove(Recipient.self().getId()); + RecipientId selfId = Recipient.self().getId(); + List recipients = conversationRecipient.isGroup() ? RecipientUtil.getEligibleForSending(conversationRecipient.getParticipants()) + .stream() + .map(Recipient::getId) + .filter(r -> !r.equals(selfId)) + .collect(Collectors.toList()) + : Collections.singletonList(conversationRecipient.getId()); return new ReactionSendJob(messageId, isMms, @@ -178,7 +174,7 @@ public class ReactionSendJob extends BaseJob { return; } - List resolved = Stream.of(recipients).map(Recipient::resolved).toList(); + List resolved = recipients.stream().map(Recipient::resolved).collect(Collectors.toList()); List unregistered = resolved.stream().filter(Recipient::isUnregistered).map(Recipient::getId).collect(Collectors.toList()); List destinations = resolved.stream().filter(Recipient::isMaybeRegistered).collect(Collectors.toList()); List completions = deliver(conversationRecipient, destinations, targetAuthor, targetSentTimestamp);