Show contact name for message Sender

[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..81065c778c894afca0c43f004f6842214ff55b61 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -1,5 +1,5 @@
 /*
 /*

-  Copyright (C) 2015-2018 AsamK
+  Copyright (C) 2015-2020 AsamK and contributors

 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by


@@ -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,12 +44,12 @@ 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) {

-        // Register our own security provider
-        Security.insertProviderAt(new SecurityProvider(), 1);
-        Security.addProvider(new BouncyCastleProvider());
+        installSecurityProviderWorkaround();

 
         Namespace ns = parseArgs(args);
         if (ns == null) {
 
         Namespace ns = parseArgs(args);
         if (ns == null) {


@@ -51,6 +60,12 @@ public class Main {
         System.exit(res);
     }
 
         System.exit(res);
     }
 

+    public static void installSecurityProviderWorkaround() {
+        // Register our own security provider
+        Security.insertProviderAt(new SecurityProvider(), 1);
+        Security.addProvider(new BouncyCastleProvider());
+    }
+

     private static int handleCommands(Namespace ns) {
         final String username = ns.getString("username");
         Manager m;
     private static int handleCommands(Namespace ns) {
         final String username = ns.getString("username");
         Manager m;


@@ -82,7 +97,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 +225,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);
             }