Use console charset for reading/writing to stdin/out

[signal-cli] / src / main / java / org / asamk / signal / util / Util.java

diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index 5ded399eaf887a765a7edd30fb458ae9af8af5d8..c844e2ea910787f5cccdf1e7c18ff1d464cd7153 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -5,11 +5,10 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 

-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-

 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;

+import java.util.Optional;

 import java.util.stream.Collectors;
 
 public class Util {
 import java.util.stream.Collectors;
 
 public class Util {


@@ -17,8 +16,8 @@ public class Util {
     private Util() {
     }
 
     private Util() {
     }
 

-    public static String getStringIfNotBlank(org.whispersystems.libsignal.util.guava.Optional<String> value) {
-        var string = value.orNull();
+    public static String getStringIfNotBlank(Optional<String> value) {
+        var string = value.orElse(null);

         if (string == null || string.isBlank()) {
             return null;
         }
         if (string == null || string.isBlank()) {
             return null;
         }


@@ -58,10 +57,6 @@ public class Util {
         return f.toString();
     }
 
         return f.toString();
     }
 

-    public static String getLegacyIdentifier(final SignalServiceAddress address) {
-        return address.getNumber().or(() -> address.getUuid().toString());
-    }
-

     public static ObjectMapper createJsonObjectMapper() {
         var objectMapper = new ObjectMapper();
         objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.PUBLIC_ONLY);
     public static ObjectMapper createJsonObjectMapper() {
         var objectMapper = new ObjectMapper();
         objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.PUBLIC_ONLY);