added sync type to sync messages json

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

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index e5335b282ff713a1b2bb961fc4ef7bbfeabd8446..f0010a44b2aceaab862abc889f26c85dfc308c9a 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -18,10 +18,19 @@ package org.asamk.signal;
 
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;

-import net.sourceforge.argparse4j.inf.*;
-import org.apache.http.util.TextUtils;
+import net.sourceforge.argparse4j.inf.ArgumentParser;
+import net.sourceforge.argparse4j.inf.ArgumentParserException;
+import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;
+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;

-import org.asamk.signal.commands.*;
+import org.asamk.signal.commands.Command;
+import org.asamk.signal.commands.Commands;
+import org.asamk.signal.commands.DbusCommand;
+import org.asamk.signal.commands.ExtendedDbusCommand;
+import org.asamk.signal.commands.LocalCommand;

 import org.asamk.signal.manager.BaseConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.manager.BaseConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.IOUtils;


@@ -35,6 +44,8 @@ import java.io.File;
 import java.security.Security;
 import java.util.Map;
 
 import java.security.Security;
 import java.util.Map;
 

+import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
+

 public class Main {
 
     public static void main(String[] args) {
 public class Main {
 
     public static void main(String[] args) {


@@ -82,7 +93,7 @@ public class Main {
                 }
             } else {
                 String dataPath = ns.getString("config");
                 }
             } else {
                 String dataPath = ns.getString("config");

-                if (TextUtils.isEmpty(dataPath)) {
+                if (isEmpty(dataPath)) {

                     dataPath = getDefaultDataPath();
                 }
 
                     dataPath = getDefaultDataPath();
                 }