Extract lib module

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

diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
index 8438e1fad635a6a5bada22df8c85b13a2356fba4..bfe46650c8d006853c607174aacd0aa89fdec348 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -3,10 +3,9 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.Signal;
-import org.asamk.signal.manager.GroupId;
-import org.asamk.signal.manager.GroupInviteLinkUrl;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupInviteLinkUrl;

 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;


@@ -29,26 +28,21 @@ public class JoinGroupCommand implements LocalCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {

-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
-

         final GroupInviteLinkUrl linkUrl;
         String uri = ns.getString("uri");
         try {
             linkUrl = GroupInviteLinkUrl.fromUri(uri);
         } catch (GroupInviteLinkUrl.InvalidGroupLinkException e) {
             System.err.println("Group link is invalid: " + e.getMessage());
         final GroupInviteLinkUrl linkUrl;
         String uri = ns.getString("uri");
         try {
             linkUrl = GroupInviteLinkUrl.fromUri(uri);
         } catch (GroupInviteLinkUrl.InvalidGroupLinkException e) {
             System.err.println("Group link is invalid: " + e.getMessage());

-            return 2;
+            return 1;

         } catch (GroupInviteLinkUrl.UnknownGroupLinkVersionException e) {
             System.err.println("Group link was created with an incompatible version: " + e.getMessage());
         } catch (GroupInviteLinkUrl.UnknownGroupLinkVersionException e) {
             System.err.println("Group link was created with an incompatible version: " + e.getMessage());

-            return 2;
+            return 1;

         }
 
         if (linkUrl == null) {
             System.err.println("Link is not a signal group invitation link");
         }
 
         if (linkUrl == null) {
             System.err.println("Link is not a signal group invitation link");

-            return 2;
+            return 1;

         }
 
         try {
         }
 
         try {


@@ -69,16 +63,13 @@ public class JoinGroupCommand implements LocalCommand {
         } catch (IOException e) {
             e.printStackTrace();
             handleIOException(e);
         } catch (IOException e) {
             e.printStackTrace();
             handleIOException(e);

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

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

-            return 1;
+            return 2;

         } catch (GroupLinkNotActiveException e) {
             System.err.println("Group link is not valid: " + e.getMessage());
         } catch (GroupLinkNotActiveException e) {
             System.err.println("Group link is not valid: " + e.getMessage());

-            return 2;
+            return 1;

         }
     }
 }
         }
     }
 }