X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/55dde93811ac137741b49d3fab2483e689592038..c487929bcd505a76b4ee445a0765079184865e8b:/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
index 7d396bb1..e405f54c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
@@ -150,10 +150,9 @@ class ProvisioningManagerImpl implements ProvisioningManager {
 
             ManagerImpl m = null;
             try {
-                final var accountPathFinal = accountPath;
                 m = new ManagerImpl(account,
                         pathConfig,
-                        (newNumber, newAci) -> accountsStore.updateAccount(accountPathFinal, newNumber, newAci),
+                        new AccountFileUpdaterImpl(accountsStore, accountPath),
                         serviceEnvironmentConfig,
                         userAgent);
                 account = null;
@@ -162,7 +161,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                 try {
                     m.refreshPreKeys();
                 } catch (Exception e) {
-                    logger.error("Failed to refresh pre keys.");
+                    logger.error("Failed to refresh pre keys.", e);
                 }
 
                 logger.debug("Requesting sync data");
@@ -170,7 +169,8 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                     m.requestAllSyncData();
                 } catch (Exception e) {
                     logger.error(
-                            "Failed to request sync messages from linked device, data can be requested again with `sendSyncRequest`.");
+                            "Failed to request sync messages from linked device, data can be requested again with `sendSyncRequest`.",
+                            e);
                 }
 
                 if (newManagerListener != null) {
@@ -206,8 +206,8 @@ class ProvisioningManagerImpl implements ProvisioningManager {
         }
 
         try (signalAccount) {
-            if (signalAccount.isMasterDevice()) {
-                logger.debug("Account is a master device.");
+            if (signalAccount.isPrimaryDevice()) {
+                logger.debug("Account is a primary device.");
                 return false;
             }
             if (signalAccount.isRegistered()
@@ -220,7 +220,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
 
             final var m = new ManagerImpl(signalAccount,
                     pathConfig,
-                    (newNumber, newAci) -> accountsStore.updateAccount(accountPath, newNumber, newAci),
+                    new AccountFileUpdaterImpl(accountsStore, accountPath),
                     serviceEnvironmentConfig,
                     userAgent);
             try (m) {