From 691f95ab58ae529f0f286d0b4481fae86cebfcb7 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sun, 30 Mar 2025 12:16:45 +0200
Subject: [PATCH] Fix crash on invalid phone number

Fix #1325
---
 .../java/de/mm20/launcher2/contacts/ContactRepository.kt     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt b/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt
index f8fd95f5..7fd7f2db 100644
--- a/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt
+++ b/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt
@@ -181,8 +181,9 @@ internal class ContactRepository(
                     } else {
                         PhoneNumberUtils.areSamePhoneNumber(a.number, b.number, mainLocaleISO3)
                     }
-                }.map {
-                    it.copy(number = PhoneNumberUtils.formatNumber(it.number, mainLocaleISO3))
+                }.mapNotNull {
+                    val formattedNumber = PhoneNumberUtils.formatNumber(it.number, mainLocaleISO3) ?: return@mapNotNull null
+                    it.copy(number = formattedNumber)
                 },
                 emailAddresses = emailAddresses.distinct(),
                 postalAddresses = postalAddresses.distinct(),