Convert RecipientIdentifier to record

[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 892879f6c01f4757f9f52a07b16b6ea2fbfee10c..c7b8b0403ee91443408e0b7d488fb7ac365f7a2f 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -11,9 +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.manager.api.InactiveGroupLinkException;
 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;
@@ -69,7 +69,7 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
                     writer.println("Joined group \"{}\"", newGroupId.toBase64());
                 }
             }
-            handleSendMessageResults(results.second().getResults());
+            handleSendMessageResults(results.second().results());
         } catch (GroupPatchNotAcceptedException e) {
             throw new UserErrorException("Failed to join group, maybe already a member");
         } catch (IOException e) {
@@ -81,7 +81,7 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
         } 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());
         }
     }