empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix NPE if system ringtone name lookup returns null.

Browse source
This commit is contained in:
Alex Hart 2021-06-04 09:09:34 -03:00
parent 511b095647
commit 4bdd07db16
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
View file

@ -234,7 +234,7 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
} else { } else {
val tone = RingtoneUtil.getRingtone(requireContext(), uri) val tone = RingtoneUtil.getRingtone(requireContext(), uri)
if (tone != null) { if (tone != null) {
tone.getTitle(requireContext()) tone.getTitle(requireContext()) ?: getString(R.string.NotificationsSettingsFragment__unknown_ringtone)
} else { } else {
getString(R.string.preferences__default) getString(R.string.preferences__default)
} }

1
app/src/main/res/values/strings.xml
View file

@ -3538,6 +3538,7 @@
<string name="StickerSearchDialogFragment_search_stickers">Search stickers</string> <string name="StickerSearchDialogFragment_search_stickers">Search stickers</string>
<string name="StickerSearchDialogFragment_no_results_found">No results found</string> <string name="StickerSearchDialogFragment_no_results_found">No results found</string>
<string name="EmojiSearchFragment__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 --> <!-- EOF -->