diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsViewModel.java index bbc41aadcf..f93e36322e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsViewModel.java @@ -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> result = new MutableLiveData<>(Collections.emptyList()); if (!memberList.isEmpty()) { - Set memberIds = Stream.of(memberList) + Set 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 members = Objects.requireNonNull(this.members.getValue()); - Set memberIds = Stream.of(members).map(member -> member.getMember().getId()).collect(Collectors.toSet()); + Set 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 filterDeletedMembers(@NonNull List members, @NonNull Set 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 members) { - return Stream.of(members) + return members.stream() .anyMatch(member -> !member.getMember().isRegistered()); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java index bd4e16c57a..7aeefe4dbc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java @@ -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 constraints) { - if (delay > 0 && Stream.of(constraints).allMatch(Constraint::isMet)) { + if (delay > 0 && constraints.stream().allMatch(Constraint::isMet)) { setUniqueAlarm(application, System.currentTimeMillis() + delay); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/AndroidFaceDetector.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/AndroidFaceDetector.java index 1e08760740..f8d1dc6561 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/AndroidFaceDetector.java +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/AndroidFaceDetector.java @@ -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(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java index a1576cac97..8db6738684 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java @@ -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; /** diff --git a/app/src/test/java/org/thoughtcrime/securesms/payments/history/BlockTransactionReconstructionTests.java b/app/src/test/java/org/thoughtcrime/securesms/payments/history/BlockTransactionReconstructionTests.java index 3688231013..b7914acd3a 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/payments/history/BlockTransactionReconstructionTests.java +++ b/app/src/test/java/org/thoughtcrime/securesms/payments/history/BlockTransactionReconstructionTests.java @@ -2,9 +2,6 @@ package org.thoughtcrime.securesms.payments.history; import androidx.annotation.NonNull; -import com.annimon.stream.Collectors; -import com.annimon.stream.Stream; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -18,6 +15,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Locale; +import java.util.stream.Collectors; +import java.util.stream.Stream; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -72,7 +71,7 @@ public final class BlockTransactionReconstructionTests { TransactionReconstruction estimate = TransactionReconstruction.estimateBlockLevelActivity(spentTransactionOutputs.getMoney(), unspentTransactionOutputs.getMoney()); assertEquals(expectedReceivedTransactions.getMoney(), toValueList(estimate.received())); - assertTrue(Stream.of(estimate.received()).allMatch(t -> t.getDirection() == Direction.RECEIVED)); + assertTrue(estimate.received().stream().allMatch(t -> t.getDirection() == Direction.RECEIVED)); } @Test @@ -80,7 +79,7 @@ public final class BlockTransactionReconstructionTests { TransactionReconstruction estimate = TransactionReconstruction.estimateBlockLevelActivity(spentTransactionOutputs.getMoney(), unspentTransactionOutputs.getMoney()); assertEquals(expectedSentTransactions.getMoney(), toValueList(estimate.sent())); - assertTrue(Stream.of(estimate.sent()).allMatch(t -> t.getDirection() == Direction.SENT)); + assertTrue(estimate.sent().stream().allMatch(t -> t.getDirection() == Direction.SENT)); } @Test @@ -115,7 +114,7 @@ public final class BlockTransactionReconstructionTests { } private static @NonNull List sort(@NonNull List transactions) { - return Stream.of(transactions) + return transactions.stream() .sorted((o1, o2) -> { if (o1.getDirection() != o2.getDirection()) { if (o1.getDirection() == Direction.RECEIVED) { @@ -130,13 +129,13 @@ public final class BlockTransactionReconstructionTests { } private static List toValueList(List received) { - return Stream.of(received) + return received.stream() .map(TransactionReconstruction.Transaction::getValue) .toList(); } private static List toValueListWithDirection(List received) { - return Stream.of(received) + return received.stream() .map(TransactionReconstruction.Transaction::getValueWithDirection) .toList(); } @@ -159,7 +158,7 @@ public final class BlockTransactionReconstructionTests { @Override public @NonNull String toString() { - return "[" + Stream.of(money) + return "[" + money.stream() .map(f -> f.toString(MONEY_FORMATTER)) .collect(Collectors.joining(", ")) + "]";