Add listAccounts command

[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 5501c5d60cf73b368eee1483b83722a580396971..5feb7c1bc0e777ebfb4164d97c8b5b1ce0b84566 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -11,10 +11,9 @@ import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.api.InactiveGroupLinkException;

 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;

-import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
-import org.whispersystems.signalservice.internal.push.exceptions.GroupPatchNotAcceptedException;

 
 import java.io.IOException;
 import java.util.Map;
 
 import java.io.IOException;
 import java.util.Map;


@@ -70,8 +69,6 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
                 }
             }
             handleSendMessageResults(results.second().results());
                 }
             }
             handleSendMessageResults(results.second().results());

-        } catch (GroupPatchNotAcceptedException e) {
-            throw new UserErrorException("Failed to join group, maybe already a member");

         } catch (IOException e) {
             throw new IOErrorException("Failed to send message: "
                     + e.getMessage()
         } catch (IOException e) {
             throw new IOErrorException("Failed to send message: "
                     + e.getMessage()


@@ -81,7 +78,7 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
         } catch (DBusExecutionException e) {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
                     .getSimpleName() + ")", e);
         } catch (DBusExecutionException e) {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
                     .getSimpleName() + ")", e);

-        } catch (GroupLinkNotActiveException e) {
+        } catch (InactiveGroupLinkException e) {

             throw new UserErrorException("Group link is not valid: " + e.getMessage());
         }
     }
             throw new UserErrorException("Group link is not valid: " + e.getMessage());
         }
     }