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

Remove use of annimon.stream in several places.

Browse Source 
Resolves #14705
This commit is contained in:
Jesse Weinstein
2026-04-06 12:21:00 -04:00
committed by jeffrey-signal
parent 8c1cc03c6f
commit b57d922cdf
5 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsViewModel.java
View File

@@ -10,8 +10,8 @@ import androidx.lifecycle.Transformations;
import androidx.lifecycle.ViewModel;
import androidx.lifecycle.ViewModelProvider;
import com.annimon.stream.Collectors;
import com.annimon.stream.Stream;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -58,7 +58,7 @@ public final class AddGroupDetailsViewModel extends ViewModel {
sameGroups = Transformations.switchMap(members, memberList -> {
MutableLiveData<List<Recipient>> result = new MutableLiveData<>(Collections.emptyList());
if (!memberList.isEmpty()) {
Set<RecipientId> memberIds = Stream.of(memberList)
Set<RecipientId> memberIds = memberList.stream()
.map(member -> member.getMember().getId())
.collect(Collectors.toSet());
repository.getGroupsWithSameMembers(memberIds, result::postValue);
@@ -118,7 +118,7 @@ public final class AddGroupDetailsViewModel extends ViewModel {
void create() {
List<GroupMemberEntry.NewGroupCandidate> members = Objects.requireNonNull(this.members.getValue());
Set<RecipientId> memberIds = Stream.of(members).map(member -> member.getMember().getId()).collect(Collectors.toSet());
Set<RecipientId> memberIds = members.stream().map(member -> member.getMember().getId()).collect(Collectors.toSet());
byte[] avatarBytes = avatar.getValue();
String groupName = name.getValue();
Integer disappearingTimer = disappearingMessagesTimer.getValue();
@@ -136,13 +136,13 @@ public final class AddGroupDetailsViewModel extends ViewModel {
}
private static @NonNull List<GroupMemberEntry.NewGroupCandidate> filterDeletedMembers(@NonNull List<GroupMemberEntry.NewGroupCandidate> members, @NonNull Set<RecipientId> deleted) {
return Stream.of(members)
.filterNot(member -> deleted.contains(member.getMember().getId()))
.toList();
return members.stream()
.filter(member -> !deleted.contains(member.getMember().getId()))
.collect(Collectors.toList());
}
private static boolean isAnyForcedSms(@NonNull List<GroupMemberEntry.NewGroupCandidate> members) {
return Stream.of(members)
return members.stream()
.anyMatch(member -> !member.getMember().isRegistered());
}

4
app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java
View File

@@ -9,8 +9,6 @@ import android.content.Intent;
import androidx.annotation.NonNull;
import com.annimon.stream.Stream;
import org.signal.core.util.PendingIntentFlags;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.BuildConfig;
@@ -43,7 +41,7 @@ public class AlarmManagerScheduler implements Scheduler {
@Override
public void schedule(long delay, @NonNull List<Constraint> constraints) {
if (delay > 0 && Stream.of(constraints).allMatch(Constraint::isMet)) {
if (delay > 0 && constraints.stream().allMatch(Constraint::isMet)) {
setUniqueAlarm(application, System.currentTimeMillis() + delay);
}
}

6
app/src/main/java/org/thoughtcrime/securesms/scribbles/AndroidFaceDetector.java
View File

@@ -7,12 +7,12 @@ import android.graphics.RectF;
import androidx.annotation.NonNull;
import com.annimon.stream.Stream;
import org.signal.core.util.logging.Log;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* Detects faces with the built in Android face detection.
@@ -50,7 +50,7 @@ final class AndroidFaceDetector implements FaceDetector {
return Stream.of(faces)
.limit(foundFaces)
.map(AndroidFaceDetector::faceToFace)
.toList();
.collect(Collectors.toList());
} finally {
if (createBitmap) {
bitmap.recycle();

4
app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java
View File

@@ -14,8 +14,6 @@ import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.WorkerThread;
import com.annimon.stream.Stream;
import org.signal.core.util.DimensionUnit;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log;
@@ -28,6 +26,8 @@ import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPrefere
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import java.util.stream.Stream;
import static org.thoughtcrime.securesms.util.ConversationUtil.CONVERSATION_SUPPORT_VERSION;
/**