From e55834d5233624a2ae877e3d04bdcd547279283c Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 22 Jan 2021 15:30:05 -0400
Subject: [PATCH] Prevent NPE in PhoneNumberFormatter.

---
 .../signalservice/api/util/PhoneNumberFormatter.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java
index fa4ddfc826..b21ecc8329 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java
@@ -147,7 +147,7 @@ public class PhoneNumberFormatter {
 
     return "+"                                                     +
         countryCode.replaceAll("[^0-9]", "").replaceAll("^0*", "") +
-        number.replaceAll("[^0-9]", "");
+        (number != null ? number.replaceAll("[^0-9]", "") : "");
   }
 
   public static String getInternationalFormatFromE164(String e164number) {