From 0077be4abc4eee5cdabdd8de7326ccd5eec0de38 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 12 Mar 2025 12:05:53 -0400
Subject: [PATCH] Fix crash in change number flow.

---
 core-util-jvm/src/main/java/org/signal/core/util/E164Util.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core-util-jvm/src/main/java/org/signal/core/util/E164Util.kt b/core-util-jvm/src/main/java/org/signal/core/util/E164Util.kt
index ffc9e424e4..502d14f959 100644
--- a/core-util-jvm/src/main/java/org/signal/core/util/E164Util.kt
+++ b/core-util-jvm/src/main/java/org/signal/core/util/E164Util.kt
@@ -66,7 +66,9 @@ object E164Util {
    * value is needed for user display.
    */
   @JvmStatic
-  fun formatAsE164WithCountryCodeForDisplay(countryCode: String, input: String): String {
+  fun formatAsE164WithCountryCodeForDisplay(countryCode: String, input: String?): String {
+    val input = input ?: ""
+
     val result: String? = formatAsE164WithCountryCode(countryCode, input)
     if (result != null) {
       return result