Extract AccountHelper

[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 f807e8fdfb5dfa6ef7622b4bad4e003be733ecec..98a1a0bc7cfff2a4bd77e16963eb044b803e1582 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -64,8 +64,8 @@ public class App {
 
         parser.addArgument("-v", "--version").help("Show package version.").action(Arguments.version());
         parser.addArgument("--verbose")
-                .help("Raise log level and include lib signal logs.")
-                .action(Arguments.storeTrue());
+                .help("Raise log level and include lib signal logs. Specify multiple times for even more logs.")
+                .action(Arguments.count());
         parser.addArgument("-c", "--config")
                 .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).");
 
@@ -290,6 +290,7 @@ public class App {
             final TrustNewIdentity trustNewIdentity
     ) throws CommandException {
         Manager manager;
+        logger.trace("Loading account file for {}", account);
         try {
             manager = Manager.init(account, dataPath, serviceEnvironment, BaseConfig.USER_AGENT, trustNewIdentity);
         } catch (NotRegisteredException e) {
@@ -304,6 +305,7 @@ public class App {
                     + ")", e);
         }
 
+        logger.trace("Checking account state");
         try {
             manager.checkAccountState();
         } catch (IOException e) {