Use var instead of explicit types

[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 6dc3d799c2a9c52c9a75ffd998fcfeab5f23745f..5f0f1cdfb40aa9735d9a434c4652f523dc737cdc 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -3,10 +3,7 @@ package org.asamk.signal;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParser;

-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;

 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Namespace;

-import net.sourceforge.argparse4j.inf.Subparser;
-import net.sourceforge.argparse4j.inf.Subparsers;

 
 import org.asamk.Signal;
 import org.asamk.signal.commands.Command;
 
 import org.asamk.Signal;
 import org.asamk.signal.commands.Command;


@@ -21,19 +18,18 @@ import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotRegisteredException;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.NotRegisteredException;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.RegistrationManager;

-import org.asamk.signal.manager.ServiceConfig;
+import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.config.ServiceEnvironment;

 import org.asamk.signal.util.IOUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.asamk.signal.util.IOUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;

-import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;

 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;

-import java.util.Map;

 import java.util.Objects;
 import java.util.stream.Collectors;
 
 import java.util.Objects;
 import java.util.stream.Collectors;
 


@@ -44,7 +40,7 @@ public class App {
     private final Namespace ns;
 
     static ArgumentParser buildArgumentParser() {
     private final Namespace ns;
 
     static ArgumentParser buildArgumentParser() {

-        ArgumentParser parser = ArgumentParsers.newFor("signal-cli")
+        var parser = ArgumentParsers.newFor("signal-cli")

                 .build()
                 .defaultHelp(true)
                 .description("Commandline interface for Signal.")
                 .build()
                 .defaultHelp(true)
                 .description("Commandline interface for Signal.")


@@ -59,7 +55,7 @@ public class App {
 
         parser.addArgument("-u", "--username").help("Specify your phone number, that will be used for verification.");
 
 
         parser.addArgument("-u", "--username").help("Specify your phone number, that will be used for verification.");
 

-        MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
+        var mut = parser.addMutuallyExclusiveGroup();

         mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
         mut.addArgument("--dbus-system").help("Make request via system dbus.").action(Arguments.storeTrue());
 
         mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
         mut.addArgument("--dbus-system").help("Make request via system dbus.").action(Arguments.storeTrue());
 


@@ -68,11 +64,11 @@ public class App {
                 .type(Arguments.enumStringType(OutputType.class))
                 .setDefault(OutputType.PLAIN_TEXT);
 
                 .type(Arguments.enumStringType(OutputType.class))
                 .setDefault(OutputType.PLAIN_TEXT);
 

-        Subparsers subparsers = parser.addSubparsers().title("subcommands").dest("command");
+        var subparsers = parser.addSubparsers().title("subcommands").dest("command");

 
 

-        final Map<String, Command> commands = Commands.getCommands();
-        for (Map.Entry<String, Command> entry : commands.entrySet()) {
-            Subparser subparser = subparsers.addParser(entry.getKey());
+        final var commands = Commands.getCommands();
+        for (var entry : commands.entrySet()) {
+            var subparser = subparsers.addParser(entry.getKey());

             entry.getValue().attachToSubparser(subparser);
         }
 
             entry.getValue().attachToSubparser(subparser);
         }
 


@@ -84,8 +80,8 @@ public class App {
     }
 
     public int init() {
     }
 
     public int init() {

-        String commandKey = ns.getString("command");
-        Command command = Commands.getCommand(commandKey);
+        var commandKey = ns.getString("command");
+        var command = Commands.getCommand(commandKey);

         if (command == null) {
             logger.error("Command not implemented!");
             return 1;
         if (command == null) {
             logger.error("Command not implemented!");
             return 1;


@@ -97,7 +93,7 @@ public class App {
             return 1;
         }
 
             return 1;
         }
 

-        String username = ns.getString("username");
+        var username = ns.getString("username");

 
         final boolean useDbus = ns.getBoolean("dbus");
         final boolean useDbusSystem = ns.getBoolean("dbus_system");
 
         final boolean useDbus = ns.getBoolean("dbus");
         final boolean useDbusSystem = ns.getBoolean("dbus_system");


@@ -107,39 +103,43 @@ public class App {
         }
 
         final File dataPath;
         }
 
         final File dataPath;

-        String config = ns.getString("config");
+        var config = ns.getString("config");

         if (config != null) {
             dataPath = new File(config);
         } else {
             dataPath = getDefaultDataPath();
         }
 
         if (config != null) {
             dataPath = new File(config);
         } else {
             dataPath = getDefaultDataPath();
         }
 

-        final SignalServiceConfiguration serviceConfiguration = ServiceConfig.createDefaultServiceConfiguration(
-                BaseConfig.USER_AGENT);
+        final var serviceEnvironment = ServiceEnvironment.LIVE;

 
         if (!ServiceConfig.getCapabilities().isGv2()) {
             logger.warn("WARNING: Support for new group V2 is disabled,"
                     + " because the required native library dependency is missing: libzkgroup");
         }
 
 
         if (!ServiceConfig.getCapabilities().isGv2()) {
             logger.warn("WARNING: Support for new group V2 is disabled,"
                     + " because the required native library dependency is missing: libzkgroup");
         }
 

+        if (!ServiceConfig.isSignalClientAvailable()) {
+            logger.error("Missing required native library dependency: libsignal-client");
+            return 1;
+        }
+

         if (command instanceof ProvisioningCommand) {
             if (username != null) {
                 System.err.println("You cannot specify a username (phone number) when linking");
                 return 1;
             }
 
         if (command instanceof ProvisioningCommand) {
             if (username != null) {
                 System.err.println("You cannot specify a username (phone number) when linking");
                 return 1;
             }
 

-            return handleProvisioningCommand((ProvisioningCommand) command, dataPath, serviceConfiguration);
+            return handleProvisioningCommand((ProvisioningCommand) command, dataPath, serviceEnvironment);

         }
 
         if (username == null) {
         }
 
         if (username == null) {

-            List<String> usernames = Manager.getAllLocalUsernames(dataPath);
+            var usernames = Manager.getAllLocalUsernames(dataPath);

             if (usernames.size() == 0) {
                 System.err.println("No local users found, you first need to register or link an account");
                 return 1;
             }
 
             if (command instanceof MultiLocalCommand) {
             if (usernames.size() == 0) {
                 System.err.println("No local users found, you first need to register or link an account");
                 return 1;
             }
 
             if (command instanceof MultiLocalCommand) {

-                return handleMultiLocalCommand((MultiLocalCommand) command, dataPath, serviceConfiguration, usernames);
+                return handleMultiLocalCommand((MultiLocalCommand) command, dataPath, serviceEnvironment, usernames);

             }
 
             if (usernames.size() > 1) {
             }
 
             if (usernames.size() > 1) {


@@ -154,7 +154,7 @@ public class App {
         }
 
         if (command instanceof RegistrationCommand) {
         }
 
         if (command instanceof RegistrationCommand) {

-            return handleRegistrationCommand((RegistrationCommand) command, username, dataPath, serviceConfiguration);
+            return handleRegistrationCommand((RegistrationCommand) command, username, dataPath, serviceEnvironment);

         }
 
         if (!(command instanceof LocalCommand)) {
         }
 
         if (!(command instanceof LocalCommand)) {


@@ -162,15 +162,13 @@ public class App {
             return 1;
         }
 
             return 1;
         }
 

-        return handleLocalCommand((LocalCommand) command, username, dataPath, serviceConfiguration);
+        return handleLocalCommand((LocalCommand) command, username, dataPath, serviceEnvironment);

     }
 
     private int handleProvisioningCommand(
     }
 
     private int handleProvisioningCommand(

-            final ProvisioningCommand command,
-            final File dataPath,
-            final SignalServiceConfiguration serviceConfiguration
+            final ProvisioningCommand command, final File dataPath, final ServiceEnvironment serviceEnvironment

     ) {
     ) {

-        ProvisioningManager pm = new ProvisioningManager(dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
+        var pm = ProvisioningManager.init(dataPath, serviceEnvironment, BaseConfig.USER_AGENT);

         return command.handleCommand(ns, pm);
     }
 
         return command.handleCommand(ns, pm);
     }
 


@@ -178,16 +176,16 @@ public class App {
             final RegistrationCommand command,
             final String username,
             final File dataPath,
             final RegistrationCommand command,
             final String username,
             final File dataPath,

-            final SignalServiceConfiguration serviceConfiguration
+            final ServiceEnvironment serviceEnvironment

     ) {
         final RegistrationManager manager;
         try {
     ) {
         final RegistrationManager manager;
         try {

-            manager = RegistrationManager.init(username, dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
+            manager = RegistrationManager.init(username, dataPath, serviceEnvironment, BaseConfig.USER_AGENT);

         } catch (Throwable e) {
             logger.error("Error loading or creating state file: {}", e.getMessage());
             return 2;
         }
         } catch (Throwable e) {
             logger.error("Error loading or creating state file: {}", e.getMessage());
             return 2;
         }

-        try (RegistrationManager m = manager) {
+        try (var m = manager) {

             return command.handleCommand(ns, m);
         } catch (IOException e) {
             logger.error("Cleanup failed", e);
             return command.handleCommand(ns, m);
         } catch (IOException e) {
             logger.error("Cleanup failed", e);


@@ -199,9 +197,9 @@ public class App {
             final LocalCommand command,
             final String username,
             final File dataPath,
             final LocalCommand command,
             final String username,
             final File dataPath,

-            final SignalServiceConfiguration serviceConfiguration
+            final ServiceEnvironment serviceEnvironment

     ) {
     ) {

-        try (Manager m = loadManager(username, dataPath, serviceConfiguration)) {
+        try (var m = loadManager(username, dataPath, serviceEnvironment)) {

             if (m == null) {
                 return 2;
             }
             if (m == null) {
                 return 2;
             }


@@ -216,17 +214,17 @@ public class App {
     private int handleMultiLocalCommand(
             final MultiLocalCommand command,
             final File dataPath,
     private int handleMultiLocalCommand(
             final MultiLocalCommand command,
             final File dataPath,

-            final SignalServiceConfiguration serviceConfiguration,
+            final ServiceEnvironment serviceEnvironment,

             final List<String> usernames
     ) {
             final List<String> usernames
     ) {

-        final List<Manager> managers = usernames.stream()
-                .map(u -> loadManager(u, dataPath, serviceConfiguration))
+        final var managers = usernames.stream()
+                .map(u -> loadManager(u, dataPath, serviceEnvironment))

                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
 
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
 

-        int result = command.handleCommand(ns, managers);
+        var result = command.handleCommand(ns, managers);

 
 

-        for (Manager m : managers) {
+        for (var m : managers) {

             try {
                 m.close();
             } catch (IOException e) {
             try {
                 m.close();
             } catch (IOException e) {


@@ -237,11 +235,11 @@ public class App {
     }
 
     private Manager loadManager(
     }
 
     private Manager loadManager(

-            final String username, final File dataPath, final SignalServiceConfiguration serviceConfiguration
+            final String username, final File dataPath, final ServiceEnvironment serviceEnvironment

     ) {
         Manager manager;
         try {
     ) {
         Manager manager;
         try {

-            manager = Manager.init(username, dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
+            manager = Manager.init(username, dataPath, serviceEnvironment, BaseConfig.USER_AGENT);

         } catch (NotRegisteredException e) {
             logger.error("User " + username + " is not registered.");
             return null;
         } catch (NotRegisteredException e) {
             logger.error("User " + username + " is not registered.");
             return null;


@@ -268,8 +266,8 @@ public class App {
             } else {
                 busType = DBusConnection.DBusBusType.SESSION;
             }
             } else {
                 busType = DBusConnection.DBusBusType.SESSION;
             }

-            try (DBusConnection dBusConn = DBusConnection.getConnection(busType)) {
-                Signal ts = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+            try (var dBusConn = DBusConnection.getConnection(busType)) {
+                var ts = dBusConn.getRemoteObject(DbusConfig.getBusname(),

                         DbusConfig.getObjectPath(username),
                         Signal.class);
 
                         DbusConfig.getObjectPath(username),
                         Signal.class);
 


@@ -300,14 +298,14 @@ public class App {
      * @return the data directory to be used by signal-cli.
      */
     private static File getDefaultDataPath() {
      * @return the data directory to be used by signal-cli.
      */
     private static File getDefaultDataPath() {

-        File dataPath = new File(IOUtils.getDataHomeDir(), "signal-cli");
+        var dataPath = new File(IOUtils.getDataHomeDir(), "signal-cli");

         if (dataPath.exists()) {
             return dataPath;
         }
 
         if (dataPath.exists()) {
             return dataPath;
         }
 

-        File configPath = new File(System.getProperty("user.home"), ".config");
+        var configPath = new File(System.getProperty("user.home"), ".config");

 
 

-        File legacySettingsPath = new File(configPath, "signal");
+        var legacySettingsPath = new File(configPath, "signal");

         if (legacySettingsPath.exists()) {
             return legacySettingsPath;
         }
         if (legacySettingsPath.exists()) {
             return legacySettingsPath;
         }