X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/221d937eecca5c9b09a3bee7df812203b9927a56..b7f05a1c806c37a044ce21f87e72598fcd342bb3:/src/main/java/org/asamk/signal/commands/LinkCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/LinkCommand.java b/src/main/java/org/asamk/signal/commands/LinkCommand.java
index 34775773..cd2e188e 100644
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -17,8 +17,6 @@ import org.whispersystems.libsignal.InvalidKeyException;
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
 
-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-
 public class LinkCommand implements ProvisioningCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(LinkCommand.class);
@@ -38,15 +36,13 @@ public class LinkCommand implements ProvisioningCommand {
         }
         try {
             writer.println("{}", m.getDeviceLinkUri());
-            var username = m.finishDeviceLink(deviceName);
-            writer.println("Associated with: {}", username);
+            try (var manager = m.finishDeviceLink(deviceName)) {
+                writer.println("Associated with: {}", manager.getUsername());
+            }
         } catch (TimeoutException e) {
             throw new UserErrorException("Link request timed out, please try again.");
         } catch (IOException e) {
             throw new IOErrorException("Link request error: " + e.getMessage());
-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            throw e;
         } catch (InvalidKeyException e) {
             logger.debug("Finish device link failed", e);
             throw new UnexpectedErrorException("Invalid key: " + e.getMessage());