Store device name in account file and prevent it from becoming null on the server

[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 92bfae7bbada88a51544c83e5c229c0683290a7f..4de49ec65186033a94b390f926655c91405a3a57 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -2,17 +2,26 @@ package org.asamk.signal.util;
 
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupIdFormatException;

+import org.whispersystems.libsignal.util.guava.Optional;

 
 public class Util {
 
     private Util() {
     }
 
 
 public class Util {
 
     private Util() {
     }
 

+    public static String getStringIfNotBlank(Optional<String> value) {
+        var string = value.orNull();
+        if (string == null || string.isBlank()) {
+            return null;
+        }
+        return string;
+    }
+

     public static String formatSafetyNumber(String digits) {
     public static String formatSafetyNumber(String digits) {

-        final int partCount = 12;
-        int partSize = digits.length() / partCount;
-        StringBuilder f = new StringBuilder(digits.length() + partCount);
-        for (int i = 0; i < partCount; i++) {
+        final var partCount = 12;
+        var partSize = digits.length() / partCount;
+        var f = new StringBuilder(digits.length() + partCount);
+        for (var i = 0; i < partCount; i++) {

             f.append(digits, i * partSize, (i * partSize) + partSize).append(" ");
         }
         return f.toString();
             f.append(digits, i * partSize, (i * partSize) + partSize).append(" ");
         }
         return f.toString();