X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/d690b35ed943b0210e3f483528b8c033fe2d667f..b0bb602eb59eb6238a87d8a4ba942ac3bc0dc90d:/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
index 4597d585..450abaac 100644
--- a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
@@ -90,8 +90,8 @@ public class SignalDependencies {
         return new SignalServiceAccountManager(getServiceEnvironmentConfig().getSignalServiceConfiguration(),
                 null,
                 number,
-                password,
                 SignalServiceAddress.DEFAULT_DEVICE_ID,
+                password,
                 userAgent,
                 ServiceConfig.AUTOMATIC_NETWORK_RETRY);
     }
@@ -191,7 +191,7 @@ public class SignalDependencies {
             final var certificateValidator = new CertificateValidator(serviceEnvironmentConfig.getUnidentifiedSenderTrustRoot());
             final var address = new SignalServiceAddress(credentialsProvider.getAci(), credentialsProvider.getE164());
             final var deviceId = credentialsProvider.getDeviceId();
-            cipher = new SignalServiceCipher(address, deviceId, dataStore, sessionLock, certificateValidator);
+            cipher = new SignalServiceCipher(address, deviceId, dataStore.aci(), sessionLock, certificateValidator);
         });
     }