X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/4d3e67ff83db070c90ddb4f435138f2dd22f27f6..f445cfb5c16ff0de5c96a9f96f5213e2cf5e770f:/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 19695ec6..4de49ec6 100644
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -1,33 +1,33 @@
 package org.asamk.signal.util;
 
-import org.whispersystems.signalservice.internal.util.Base64;
-
-import java.io.File;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdFormatException;
+import org.whispersystems.libsignal.util.guava.Optional;
 
 public class Util {
-    public static String getSecret(int size) {
-        byte[] secret = getSecretBytes(size);
-        return Base64.encodeBytes(secret);
+
+    private Util() {
     }
 
-    public static byte[] getSecretBytes(int size) {
-        byte[] secret = new byte[size];
-        getSecureRandom().nextBytes(secret);
-        return secret;
+    public static String getStringIfNotBlank(Optional<String> value) {
+        var string = value.orNull();
+        if (string == null || string.isBlank()) {
+            return null;
+        }
+        return string;
     }
 
-    private static SecureRandom getSecureRandom() {
-        try {
-            return SecureRandom.getInstance("SHA1PRNG");
-        } catch (NoSuchAlgorithmException e) {
-            throw new AssertionError(e);
+    public static String formatSafetyNumber(String digits) {
+        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();
     }
 
-    public static File createTempFile() throws IOException {
-        return File.createTempFile("signal_tmp_", ".tmp");
+    public static GroupId decodeGroupId(String groupId) throws GroupIdFormatException {
+        return GroupId.fromBase64(groupId);
     }
 }