From: AsamK <asamk@gmx.de>
Date: Thu, 4 Jun 2020 15:59:05 +0000 (+0200)
Subject: Create service config only once
X-Git-Tag: v0.6.9~27
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/5829e3f117b4297328be3f58e156b45198621a6e

Create service config only once
---

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 562267c4..b95b0093 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -43,6 +43,7 @@ import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 
 import java.io.File;
 import java.io.IOException;
@@ -102,14 +103,16 @@ public class Main {
                 dataPath = getDefaultDataPath();
             }
 
+            final SignalServiceConfiguration serviceConfiguration = ServiceConfig.createDefaultServiceConfiguration(BaseConfig.USER_AGENT);
+
             if (username == null) {
-                ProvisioningManager pm = new ProvisioningManager(dataPath, ServiceConfig.createDefaultServiceConfiguration(BaseConfig.USER_AGENT), BaseConfig.USER_AGENT);
+                ProvisioningManager pm = new ProvisioningManager(dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
                 return handleCommands(ns, pm);
             }
 
             Manager manager;
             try {
-                manager = Manager.init(username, dataPath, ServiceConfig.createDefaultServiceConfiguration(BaseConfig.USER_AGENT), BaseConfig.USER_AGENT);
+                manager = Manager.init(username, dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
             } catch (Throwable e) {
                 System.err.println("Error loading state file: " + e.getMessage());
                 return 2;