Update libsignal-service

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

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index b715611e12e06916c0d4c0878aed065fbd5a697b..b495466b8388b25efdda5b14e40e656310a4fc34 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -23,6 +23,8 @@ 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.internal.push.PushServiceSocket;
+import org.whispersystems.signalservice.internal.websocket.LibSignalNetwork;
+import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
 import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
 
 import java.util.List;
@@ -49,7 +51,7 @@ public class SignalDependencies {
     private ClientZkOperations clientZkOperations;
 
     private PushServiceSocket pushServiceSocket;
-    private Network libSignalNetwork;
+    private LibSignalNetwork libSignalNetwork;
     private SignalWebSocket signalWebSocket;
     private SignalServiceMessageReceiver messageReceiver;
     private SignalServiceMessageSender messageSender;
@@ -106,9 +108,10 @@ public class SignalDependencies {
                         ServiceConfig.AUTOMATIC_NETWORK_RETRY));
     }
 
-    public Network getLibSignalNetwork() {
+    public LibSignalNetwork getLibSignalNetwork() {
         return getOrCreate(() -> libSignalNetwork,
-                () -> libSignalNetwork = new Network(serviceEnvironmentConfig.netEnvironment()));
+                () -> libSignalNetwork = new LibSignalNetwork(new Network(serviceEnvironmentConfig.netEnvironment(),
+                        userAgent), serviceEnvironmentConfig.signalServiceConfiguration()));
     }
 
     public SignalServiceAccountManager getAccountManager() {
@@ -159,7 +162,7 @@ public class SignalDependencies {
             final var webSocketFactory = new WebSocketFactory() {
                 @Override
                 public WebSocketConnection createWebSocket() {
-                    return new WebSocketConnection("normal",
+                    return new OkHttpWebSocketConnection("normal",
                             serviceEnvironmentConfig.signalServiceConfiguration(),
                             Optional.of(credentialsProvider),
                             userAgent,
@@ -169,7 +172,7 @@ public class SignalDependencies {
 
                 @Override
                 public WebSocketConnection createUnidentifiedWebSocket() {
-                    return new WebSocketConnection("unidentified",
+                    return new OkHttpWebSocketConnection("unidentified",
                             serviceEnvironmentConfig.signalServiceConfiguration(),
                             Optional.empty(),
                             userAgent,