Fix behavior for recipients with only UUIDs

[signal-cli] / src / main / java / org / asamk / signal / commands / UpdateGroupCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 63f5252ef9cd9c941bef2c7fc4c2c498a8e511a1..925b8c905daacf0ce54dad640cf69153e1806b9f 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -4,25 +4,16 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;

-import org.asamk.signal.AttachmentInvalidException;
-import org.asamk.signal.GroupIdFormatException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
+import org.asamk.signal.util.GroupIdFormatException;

 import org.asamk.signal.util.Util;
 import org.asamk.signal.util.Util;

-import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;

 import org.whispersystems.util.Base64;
 
 import org.whispersystems.util.Base64;
 

-import java.io.IOException;

 import java.util.ArrayList;
 import java.util.List;
 
 import java.util.ArrayList;
 import java.util.List;
 

-import static org.asamk.signal.util.ErrorUtils.handleEncapsulatedExceptions;
+import static org.asamk.signal.util.ErrorUtils.handleAssertionError;

 import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
 import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;

-import static org.asamk.signal.util.ErrorUtils.handleGroupNotFoundException;
-import static org.asamk.signal.util.ErrorUtils.handleIOException;
-import static org.asamk.signal.util.ErrorUtils.handleInvalidNumberException;
-import static org.asamk.signal.util.ErrorUtils.handleNotAGroupMemberException;

 
 public class UpdateGroupCommand implements DbusCommand {
 
 
 public class UpdateGroupCommand implements DbusCommand {
 


@@ -46,52 +37,48 @@ public class UpdateGroupCommand implements DbusCommand {
             return 1;
         }
 
             return 1;
         }
 

-        try {
-            byte[] groupId = null;
-            if (ns.getString("group") != null) {
+        byte[] groupId = null;
+        if (ns.getString("group") != null) {
+            try {

                 groupId = Util.decodeGroupId(ns.getString("group"));
                 groupId = Util.decodeGroupId(ns.getString("group"));

+            } catch (GroupIdFormatException e) {
+                handleGroupIdFormatException(e);
+                return 1;

             }
             }

-            if (groupId == null) {
-                groupId = new byte[0];
-            }
-            String groupName = ns.getString("name");
-            if (groupName == null) {
-                groupName = "";
-            }
-            List<String> groupMembers = ns.getList("member");
-            if (groupMembers == null) {
-                groupMembers = new ArrayList<>();
-            }
-            String groupAvatar = ns.getString("avatar");
-            if (groupAvatar == null) {
-                groupAvatar = "";
-            }
+        }
+        if (groupId == null) {
+            groupId = new byte[0];
+        }
+
+        String groupName = ns.getString("name");
+        if (groupName == null) {
+            groupName = "";
+        }
+
+        List<String> groupMembers = ns.getList("member");
+        if (groupMembers == null) {
+            groupMembers = new ArrayList<>();
+        }
+
+        String groupAvatar = ns.getString("avatar");
+        if (groupAvatar == null) {
+            groupAvatar = "";
+        }
+
+        try {

             byte[] newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
             if (groupId.length != newGroupId.length) {
                 System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …");
             }
             return 0;
             byte[] newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
             if (groupId.length != newGroupId.length) {
                 System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …");
             }
             return 0;

-        } catch (IOException e) {
-            handleIOException(e);
-            return 3;
-        } catch (AttachmentInvalidException e) {
-            System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());
-            System.err.println("Aborting sending.");
-            return 1;
-        } catch (GroupNotFoundException e) {
-            handleGroupNotFoundException(e);
+        } catch (AssertionError e) {
+            handleAssertionError(e);

             return 1;
             return 1;

-        } catch (NotAGroupMemberException e) {
-            handleNotAGroupMemberException(e);
-            return 1;
-        } catch (EncapsulatedExceptions e) {
-            handleEncapsulatedExceptions(e);
-            return 3;
-        } catch (GroupIdFormatException e) {
-            handleGroupIdFormatException(e);
+        } catch (Signal.Error.AttachmentInvalid e) {
+            System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());

             return 1;
             return 1;

-        } catch (InvalidNumberException e) {
-            handleInvalidNumberException(e);
+        } catch (DBusExecutionException e) {
+            System.err.println("Failed to send message: " + e.getMessage());

             return 1;
         }
     }
             return 1;
         }
     }