Save account state after ending session even if sending the message has failed

[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 4eeabf1c91298b439e04f974904f5e1163a618dd..847abcc2c48467cfa35714be66292edf6b24581f 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -1,31 +1,70 @@
-package org.asamk.signal;
+package org.asamk.signal.util;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import org.asamk.signal.GroupIdFormatException;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.util.InvalidNumberException;
+import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
+import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.util.Base64;

 
 

-import java.io.File;

 import java.io.IOException;
 import java.io.IOException;

-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
+import java.io.InvalidObjectException;
+
+public class Util {
+
+    private Util() {
+    }

 
 

-class Util {
-    public static String getSecret(int size) {
-        byte[] secret = getSecretBytes(size);
-        return Base64.encodeBytes(secret);
+    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++) {
+            f.append(digits, i * partSize, (i * partSize) + partSize).append(" ");
+        }
+        return f.toString();

     }
 
     }
 

-    public static byte[] getSecretBytes(int size) {
-        byte[] secret = new byte[size];
-        getSecureRandom().nextBytes(secret);
-        return secret;
+    public static String join(CharSequence separator, Iterable<? extends CharSequence> list) {
+        StringBuilder buf = new StringBuilder();
+        for (CharSequence str : list) {
+            if (buf.length() > 0) {
+                buf.append(separator);
+            }
+            buf.append(str);
+        }
+
+        return buf.toString();

     }
 
     }
 

-    private static SecureRandom getSecureRandom() {
+    public static JsonNode getNotNullNode(JsonNode parent, String name) throws InvalidObjectException {
+        JsonNode node = parent.get(name);
+        if (node == null) {
+            throw new InvalidObjectException(String.format("Incorrect file format: expected parameter %s not found ", name));
+        }
+
+        return node;
+    }
+
+    public static byte[] decodeGroupId(String groupId) throws GroupIdFormatException {

         try {
         try {

-            return SecureRandom.getInstance("SHA1PRNG");
-        } catch (NoSuchAlgorithmException e) {
-            throw new AssertionError(e);
+            return Base64.decode(groupId);
+        } catch (IOException e) {
+            throw new GroupIdFormatException(groupId, e);

         }
     }
 
         }
     }
 

-    public static File createTempFile() throws IOException {
-        return File.createTempFile("signal_tmp_", ".tmp");
+    public static String canonicalizeNumber(String number, String localNumber) throws InvalidNumberException {
+        return PhoneNumberFormatter.formatNumber(number, localNumber);
+    }
+
+    public static SignalServiceAddress getSignalServiceAddressFromIdentifier(final String identifier) {
+        if (UuidUtil.isUuid(identifier)) {
+            return new SignalServiceAddress(UuidUtil.parseOrNull(identifier), null);
+        } else {
+            return new SignalServiceAddress(null, identifier);
+        }

     }
 }
     }
 }