]> nmode's Git Repositories - signal-cli/blobdiff - lib/src/main/java/org/asamk/signal/manager/util/Utils.java
Update libsignal-service-java
[signal-cli] / lib / src / main / java / org / asamk / signal / manager / util / Utils.java
index 535c157db76e862545ca50f074b95021f2fef0e4..49f474ed5af3d7261087c9606042d1e427cd8c4e 100644 (file)
@@ -70,7 +70,7 @@ public class Utils {
         } else {
             // Version 1: E164 user
             version = 1;
-            if (!ownAddress.getNumber().isPresent() || !theirAddress.getNumber().isPresent()) {
+            if (ownAddress.getNumber().isEmpty() || theirAddress.getNumber().isEmpty()) {
                 return null;
             }
             ownId = ownAddress.getNumber().get().getBytes();
@@ -102,7 +102,7 @@ public class Utils {
     public static <L, R, T> Stream<T> zip(Stream<L> leftStream, Stream<R> rightStream, BiFunction<L, R, T> combiner) {
         Spliterator<L> lefts = leftStream.spliterator();
         Spliterator<R> rights = rightStream.spliterator();
-        return StreamSupport.stream(new Spliterators.AbstractSpliterator<T>(Long.min(lefts.estimateSize(),
+        return StreamSupport.stream(new Spliterators.AbstractSpliterator<>(Long.min(lefts.estimateSize(),
                 rights.estimateSize()), lefts.characteristics() & rights.characteristics()) {
             @Override
             public boolean tryAdvance(Consumer<? super T> action) {