X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/337f84ed2162d3aaf7efa5e70c9ad9a092f98348..7e267f1ebb17dd8e6b9ea007c2d65305fea0fb05:/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 e598d8e5..e1343fbf 100644
--- 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 org.apache.http.util.TextUtils;
 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 static org.whispersystems.signalservice.internal.util.Util.isEmpty;
+
 public class Main {
 
     public static void main(String[] args) {
@@ -82,7 +83,7 @@ public class Main {
                 }
             } else {
                 String dataPath = ns.getString("config");
-                if (TextUtils.isEmpty(dataPath)) {
+                if (isEmpty(dataPath)) {
                     dataPath = getDefaultDataPath();
                 }
 
@@ -210,13 +211,13 @@ public class Main {
                 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);
             }
         }
         if (ns.getList("recipient") != null && !ns.getList("recipient").isEmpty() && ns.getString("group") != null) {
-            System.err.println("You cannot specify recipients by phone number and groups a the same time");
+            System.err.println("You cannot specify recipients by phone number and groups at the same time");
             System.exit(2);
         }
         return ns;