From 4bdd07db163513d9edee9a15835f75952b154a90 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 4 Jun 2021 09:09:34 -0300
Subject: [PATCH] Fix NPE if system ringtone name lookup returns null.

---
 .../settings/app/notifications/NotificationsSettingsFragment.kt | 2 +-
 app/src/main/res/values/strings.xml                             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
index 00929eaa34..f9aa9f59bd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
@@ -234,7 +234,7 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
     } else {
       val tone = RingtoneUtil.getRingtone(requireContext(), uri)
       if (tone != null) {
-        tone.getTitle(requireContext())
+        tone.getTitle(requireContext()) ?: getString(R.string.NotificationsSettingsFragment__unknown_ringtone)
       } else {
         getString(R.string.preferences__default)
       }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b0b722aea..57eba691db 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3538,6 +3538,7 @@
     <string name="StickerSearchDialogFragment_search_stickers">Search stickers</string>
     <string name="StickerSearchDialogFragment_no_results_found">No results found</string>
     <string name="EmojiSearchFragment__no_results_found">No results found</string>
+    <string name="NotificationsSettingsFragment__unknown_ringtone">Unknown ringtone</string>
 
     <!-- EOF -->