Refactor to use GroupId class to wrap the byte array

[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 d6b467b04bbfc9abfe7a284507a362b2c44815c4..3cd5619a382904b170f576c649ec6b1199ed0b5c 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -2,13 +2,13 @@ package org.asamk.signal.util;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
 

+import org.asamk.signal.manager.GroupId;
+import org.asamk.signal.manager.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.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.IOException;

 import java.io.InvalidObjectException;
 
 public class Util {
 import java.io.InvalidObjectException;
 
 public class Util {


@@ -41,18 +41,15 @@ public class Util {
     public static JsonNode getNotNullNode(JsonNode parent, String name) throws InvalidObjectException {
         JsonNode node = parent.get(name);
         if (node == null) {
     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));
+            throw new InvalidObjectException(String.format("Incorrect file format: expected parameter %s not found ",
+                    name));

         }
 
         return node;
     }
 
         }
 
         return node;
     }
 

-    public static byte[] decodeGroupId(String groupId) throws GroupIdFormatException {
-        try {
-            return Base64.decode(groupId);
-        } catch (IOException e) {
-            throw new GroupIdFormatException(groupId, e);
-        }
+    public static GroupId decodeGroupId(String groupId) throws GroupIdFormatException {
+        return GroupId.fromBase64(groupId);

     }
 
     public static String canonicalizeNumber(String number, String localNumber) throws InvalidNumberException {
     }
 
     public static String canonicalizeNumber(String number, String localNumber) throws InvalidNumberException {