Log signal-cli version on startup

[signal-cli] / src / main / java / org / asamk / signal / App.java

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 4f045345b62e0d22294aad19e573b749641cd273..a791941cfad72906cc62786e66312bb060db6fda 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -23,12 +23,12 @@ import org.asamk.signal.dbus.DbusProvisioningManagerImpl;
 import org.asamk.signal.dbus.DbusRegistrationManagerImpl;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.dbus.DbusRegistrationManagerImpl;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.RegistrationManager;

+import org.asamk.signal.manager.Settings;

 import org.asamk.signal.manager.SignalAccountFiles;
 import org.asamk.signal.manager.api.AccountCheckException;
 import org.asamk.signal.manager.api.NotRegisteredException;
 import org.asamk.signal.manager.SignalAccountFiles;
 import org.asamk.signal.manager.api.AccountCheckException;
 import org.asamk.signal.manager.api.NotRegisteredException;

-import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.config.ServiceEnvironment;
-import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
+import org.asamk.signal.manager.api.ServiceEnvironment;
+import org.asamk.signal.manager.api.TrustNewIdentity;

 import org.asamk.signal.output.JsonWriterImpl;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriterImpl;
 import org.asamk.signal.output.JsonWriterImpl;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriterImpl;


@@ -101,6 +101,10 @@ public class App {
                 .type(Arguments.enumStringType(TrustNewIdentityCli.class))
                 .setDefault(TrustNewIdentityCli.ON_FIRST_USE);
 
                 .type(Arguments.enumStringType(TrustNewIdentityCli.class))
                 .setDefault(TrustNewIdentityCli.ON_FIRST_USE);
 

+        parser.addArgument("--disable-send-log")
+                .help("Disable message send log (for resending messages that recipient couldn't decrypt)")
+                .action(Arguments.storeTrue());
+

         var subparsers = parser.addSubparsers().title("subcommands").dest("command");
 
         Commands.getCommandSubparserAttachers().forEach((key, value) -> {
         var subparsers = parser.addSubparsers().title("subcommands").dest("command");
 
         Commands.getCommandSubparserAttachers().forEach((key, value) -> {


@@ -116,6 +120,7 @@ public class App {
     }
 
     public void init() throws CommandException {
     }
 
     public void init() throws CommandException {

+        logger.debug("Starting {}", BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);

         var commandKey = ns.getString("command");
         var command = Commands.getCommand(commandKey);
         if (command == null) {
         var commandKey = ns.getString("command");
         var command = Commands.getCommand(commandKey);
         if (command == null) {


@@ -145,7 +150,7 @@ public class App {
             return;
         }
 
             return;
         }
 

-        if (!ServiceConfig.isSignalClientAvailable()) {
+        if (!Manager.isSignalClientAvailable()) {

             throw new UserErrorException("Missing required native library dependency: libsignal-client");
         }
 
             throw new UserErrorException("Missing required native library dependency: libsignal-client");
         }
 


@@ -167,12 +172,14 @@ public class App {
                 ? TrustNewIdentity.ON_FIRST_USE
                 : trustNewIdentityCli == TrustNewIdentityCli.ALWAYS ? TrustNewIdentity.ALWAYS : TrustNewIdentity.NEVER;
 
                 ? TrustNewIdentity.ON_FIRST_USE
                 : trustNewIdentityCli == TrustNewIdentityCli.ALWAYS ? TrustNewIdentity.ALWAYS : TrustNewIdentity.NEVER;
 

+        final var disableSendLog = Boolean.TRUE.equals(ns.getBoolean("disable-send-log"));
+

         final SignalAccountFiles signalAccountFiles;
         try {
             signalAccountFiles = new SignalAccountFiles(configPath,
                     serviceEnvironment,
                     BaseConfig.USER_AGENT,
         final SignalAccountFiles signalAccountFiles;
         try {
             signalAccountFiles = new SignalAccountFiles(configPath,
                     serviceEnvironment,
                     BaseConfig.USER_AGENT,

-                    trustNewIdentity);
+                    new Settings(trustNewIdentity, disableSendLog));

         } catch (IOException e) {
             throw new IOErrorException("Failed to read local accounts list", e);
         }
         } catch (IOException e) {
             throw new IOErrorException("Failed to read local accounts list", e);
         }