Move credentials provider to SignalAccount

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 742be52017d1ab093b9f9d1f0f76eeba56d5319c..992dfb8bba0d2d1aa7d83f950a56f61b5334e196 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -70,7 +70,6 @@ import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;

-import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;

 import org.whispersystems.signalservice.internal.util.Hex;
 import org.whispersystems.signalservice.internal.util.Util;
 
 import org.whispersystems.signalservice.internal.util.Hex;
 import org.whispersystems.signalservice.internal.util.Util;
 


@@ -100,7 +99,6 @@ class ManagerImpl implements Manager {
     private final static Logger logger = LoggerFactory.getLogger(ManagerImpl.class);
 
     private SignalAccount account;
     private final static Logger logger = LoggerFactory.getLogger(ManagerImpl.class);
 
     private SignalAccount account;

-    private final AccountFileUpdater accountFileUpdater;

     private final SignalDependencies dependencies;
     private final Context context;
 
     private final SignalDependencies dependencies;
     private final Context context;
 


@@ -121,12 +119,7 @@ class ManagerImpl implements Manager {
             String userAgent
     ) {
         this.account = account;
             String userAgent
     ) {
         this.account = account;

-        this.accountFileUpdater = accountFileUpdater;

 
 

-        final var credentialsProvider = new DynamicCredentialsProvider(account.getAci(),
-                account.getNumber(),
-                account.getPassword(),
-                account.getDeviceId());

         final var sessionLock = new SignalSessionLock() {
             private final ReentrantLock LEGACY_LOCK = new ReentrantLock();
 
         final var sessionLock = new SignalSessionLock() {
             private final ReentrantLock LEGACY_LOCK = new ReentrantLock();
 


@@ -138,7 +131,7 @@ class ManagerImpl implements Manager {
         };
         this.dependencies = new SignalDependencies(serviceEnvironmentConfig,
                 userAgent,
         };
         this.dependencies = new SignalDependencies(serviceEnvironmentConfig,
                 userAgent,

-                credentialsProvider,
+                account.getCredentialsProvider(),

                 account.getSignalProtocolStore(),
                 executor,
                 sessionLock);
                 account.getSignalProtocolStore(),
                 executor,
                 sessionLock);

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 cc894602e79191cb5911323f09f0de796fbca659..90bbbdc40856a59a24462718751e4dfa04b83051 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
@@ -18,9 +18,9 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.services.ProfileService;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.services.ProfileService;

+import org.whispersystems.signalservice.api.util.CredentialsProvider;

 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.api.websocket.WebSocketFactory;

-import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;

 import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
 
 import java.util.concurrent.ExecutorService;
 import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
 
 import java.util.concurrent.ExecutorService;


@@ -34,7 +34,7 @@ public class SignalDependencies {
 
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
     private final String userAgent;
 
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
     private final String userAgent;

-    private final DynamicCredentialsProvider credentialsProvider;
+    private final CredentialsProvider credentialsProvider;

     private final SignalServiceDataStore dataStore;
     private final ExecutorService executor;
     private final SignalSessionLock sessionLock;
     private final SignalServiceDataStore dataStore;
     private final ExecutorService executor;
     private final SignalSessionLock sessionLock;


@@ -55,7 +55,7 @@ public class SignalDependencies {
     SignalDependencies(
             final ServiceEnvironmentConfig serviceEnvironmentConfig,
             final String userAgent,
     SignalDependencies(
             final ServiceEnvironmentConfig serviceEnvironmentConfig,
             final String userAgent,

-            final DynamicCredentialsProvider credentialsProvider,
+            final CredentialsProvider credentialsProvider,

             final SignalServiceDataStore dataStore,
             final ExecutorService executor,
             final SignalSessionLock sessionLock
             final SignalServiceDataStore dataStore,
             final ExecutorService executor,
             final SignalSessionLock sessionLock

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index d77d51a2ad502a4360c5a4a9e31c310b8067ba30..cbe542a99e3abccd3f7ecc56c784b311173b3df5 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -50,6 +50,7 @@ import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.DistributionId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.storage.StorageKey;
 import org.whispersystems.signalservice.api.push.DistributionId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.storage.StorageKey;

+import org.whispersystems.signalservice.api.util.CredentialsProvider;

 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.ByteArrayInputStream;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.ByteArrayInputStream;


@@ -901,6 +902,30 @@ public class SignalAccount implements Closeable {
                 () -> messageSendLogStore = new MessageSendLogStore(getRecipientStore(), getAccountDatabase()));
     }
 
                 () -> messageSendLogStore = new MessageSendLogStore(getRecipientStore(), getAccountDatabase()));
     }
 

+    public CredentialsProvider getCredentialsProvider() {
+        return new CredentialsProvider() {
+            @Override
+            public ACI getAci() {
+                return aci;
+            }
+
+            @Override
+            public String getE164() {
+                return number;
+            }
+
+            @Override
+            public String getPassword() {
+                return password;
+            }
+
+            @Override
+            public int getDeviceId() {
+                return deviceId;
+            }
+        };
+    }
+

     public String getNumber() {
         return number;
     }
     public String getNumber() {
         return number;
     }