Update dependencies

[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 2d15c096084376eb0d72b06b3867071ec80298a2..e1343fbfb684fa888da0e306e0e73a7c5f10f76f 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -19,7 +19,6 @@ package org.asamk.signal;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;

-import org.apache.http.util.TextUtils;

 import org.asamk.Signal;
 import org.asamk.signal.commands.*;
 import org.asamk.signal.manager.BaseConfig;
 import org.asamk.Signal;
 import org.asamk.signal.commands.*;
 import org.asamk.signal.manager.BaseConfig;


@@ -35,6 +34,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 +83,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();
                 }
 


@@ -210,7 +211,7 @@ public class Main {
                 System.err.println("You need to specify a username (phone number)");
                 System.exit(2);
             }
                 System.err.println("You need to specify a username (phone number)");
                 System.exit(2);
             }

-            if (!PhoneNumberFormatter.isValidNumber(ns.getString("username"))) {
+            if (!PhoneNumberFormatter.isValidNumber(ns.getString("username"), null)) {

                 System.err.println("Invalid username (phone number), make sure you include the country code.");
                 System.exit(2);
             }
                 System.err.println("Invalid username (phone number), make sure you include the country code.");
                 System.exit(2);
             }