From c1abc12907167618c58282daf5315c5c694a8136 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sun, 6 Dec 2015 17:22:39 +0100 Subject: [PATCH] Check if the username is a valid phone number with country code --- src/main/java/cli/Main.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java index 8aedd958..43535749 100644 --- a/src/main/java/cli/Main.java +++ b/src/main/java/cli/Main.java @@ -27,6 +27,7 @@ import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions; import org.whispersystems.textsecure.api.push.exceptions.NetworkFailureException; import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException; import org.whispersystems.textsecure.api.util.InvalidNumberException; +import org.whispersystems.textsecure.api.util.PhoneNumberFormatter; import java.io.File; import java.io.FileInputStream; @@ -347,6 +348,10 @@ public class Main { System.err.println("You need to specify a username (phone number)"); System.exit(2); } + if (!PhoneNumberFormatter.isValidNumber(ns.getString("username"))) { + 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.exit(2); -- 2.50.1