Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-04 15:35:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert all the toList calls to collect(Collectors.toList)

Browse Source 
Resolves #14718
This commit is contained in:
Jesse Weinstein
2026-04-07 10:22:29 -04:00
committed by jeffrey-signal
parent e9cdf0368e
commit 086883e565
70 changed files with 196 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java
+4 -5
View File
@@ -3,8 +3,6 @@ package org.thoughtcrime.securesms.mms;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.annimon.stream.Stream;
import org.signal.libsignal.zkgroup.InvalidInputException;
import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
import org.signal.storageservice.storage.protos.groups.local.DecryptedGroup;
@@ -29,6 +27,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* Represents either a GroupV1 or GroupV2 encoded context.
@@ -131,13 +130,13 @@ public final class MessageGroupContext {
public @NonNull List<RecipientId> getMembersListExcludingSelf() {
RecipientId selfId = Recipient.self().getId();
return Stream.of(groupContext.members)
return groupContext.members.stream()
.filter(m -> SignalE164Util.isPotentialE164(m.e164))
.map(m -> m.e164)
.filter(Objects::nonNull)
.map(RecipientId::fromE164)
.filter(other -> !selfId.equals(other))
.toList();
.collect(Collectors.toList());
}
}
@@ -173,7 +172,7 @@ public final class MessageGroupContext {
DecryptedGroup groupState = decryptedGroupV2Context.groupState;
DecryptedGroupChange groupChange = getChange();
return java.util.stream.Stream.of(DecryptedGroupUtil.toAciList(groupState.members),
return Stream.of(DecryptedGroupUtil.toAciList(groupState.members),
DecryptedGroupUtil.pendingToServiceIdList(groupState.pendingMembers),
DecryptedGroupUtil.removedMembersServiceIdList(groupChange),
DecryptedGroupUtil.removedPendingMembersServiceIdList(groupChange),
app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java
+2 -1
View File
@@ -19,6 +19,7 @@ package org.thoughtcrime.securesms.mms;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.annimon.stream.Collectors;
import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.attachments.Attachment;
@@ -110,7 +111,7 @@ public class SlideDeck {
}
public @NonNull List<Slide> getThumbnailSlides() {
return Stream.of(slides).filter(Slide::hasImage).toList();
return Stream.of(slides).filter(Slide::hasImage).collect(Collectors.toList());
}
public @Nullable AudioSlide getAudioSlide() {