Return a Manager from ProvisioningManager and RegistrationManager when finished

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / ProvisioningManager.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
index 0ce43bb9c0a0c9058a7018fd3ccf7b84178dbc58..e53f1b99b2eef221d9b712c4ab815b446b763943 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
@@ -92,7 +92,7 @@ public class ProvisioningManager {
         return new DeviceLinkInfo(deviceUuid, identityKey.getPublicKey().getPublicKey()).createDeviceLinkUri();
     }
 
-    public String finishDeviceLink(String deviceName) throws IOException, InvalidKeyException, TimeoutException, UserAlreadyExists {
+    public Manager finishDeviceLink(String deviceName) throws IOException, InvalidKeyException, TimeoutException, UserAlreadyExists {
         var ret = accountManager.finishNewDeviceRegistration(identityKey, false, true, registrationId, deviceName);
 
         var username = ret.getNumber();
@@ -114,17 +114,21 @@ public class ProvisioningManager {
             }
         }
 
-        try (var account = SignalAccount.createLinkedAccount(pathConfig.getDataPath(),
-                username,
-                ret.getUuid(),
-                password,
-                ret.getDeviceId(),
-                ret.getIdentity(),
-                registrationId,
-                profileKey)) {
+        SignalAccount account = null;
+        try {
+            account = SignalAccount.createLinkedAccount(pathConfig.getDataPath(),
+                    username,
+                    ret.getUuid(),
+                    password,
+                    ret.getDeviceId(),
+                    ret.getIdentity(),
+                    registrationId,
+                    profileKey);
             account.save();
 
-            try (var m = new Manager(account, pathConfig, serviceEnvironmentConfig, userAgent)) {
+            Manager m = null;
+            try {
+                m = new Manager(account, pathConfig, serviceEnvironmentConfig, userAgent);
 
                 try {
                     m.refreshPreKeys();
@@ -144,12 +148,22 @@ public class ProvisioningManager {
                     throw e;
                 }
 
-                m.close(false);
-            }
+                account.save();
 
-            account.save();
-        }
+                final var result = m;
+                account = null;
+                m = null;
 
-        return username;
+                return result;
+            } finally {
+                if (m != null) {
+                    m.close();
+                }
+            }
+        } finally {
+            if (account != null) {
+                account.close();
+            }
+        }
     }
 }