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

Fix NullPointerException when getting ringtone title.

Browse source
This commit is contained in:
Alex Hart 2021-09-21 09:57:37 -03:00
parent 1a5ae603d5
commit b1d1b7e31e
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsFragment.kt
View file

@ -10,6 +10,7 @@ import androidx.activity.result.ActivityResult
import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.fragment.app.viewModels import androidx.fragment.app.viewModels
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.settings.DSLConfiguration import org.thoughtcrime.securesms.components.settings.DSLConfiguration
import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
@ -19,6 +20,9 @@ import org.thoughtcrime.securesms.components.settings.configure
import org.thoughtcrime.securesms.database.RecipientDatabase import org.thoughtcrime.securesms.database.RecipientDatabase
import org.thoughtcrime.securesms.notifications.NotificationChannels import org.thoughtcrime.securesms.notifications.NotificationChannels
import org.thoughtcrime.securesms.util.RingtoneUtil import org.thoughtcrime.securesms.util.RingtoneUtil
import java.lang.NullPointerException
private val TAG = Log.tag(CustomNotificationsSettingsFragment::class.java)
class CustomNotificationsSettingsFragment : DSLSettingsFragment(R.string.CustomNotificationsDialogFragment__custom_notifications) { class CustomNotificationsSettingsFragment : DSLSettingsFragment(R.string.CustomNotificationsDialogFragment__custom_notifications) {
@ -135,7 +139,12 @@ class CustomNotificationsSettingsFragment : DSLSettingsFragment(R.string.CustomN
} else { } else {
val tone = RingtoneUtil.getRingtone(requireContext(), ringtone) val tone = RingtoneUtil.getRingtone(requireContext(), ringtone)
if (tone != null) { if (tone != null) {
return tone.getTitle(context) return try {
tone.getTitle(context)
} catch (e: NullPointerException) {
Log.w(TAG, "Could not get correct title for ringtone.", e)
context.getString(R.string.CustomNotificationsDialogFragment__unknown)
}
} }
} }
return context.getString(R.string.CustomNotificationsDialogFragment__default) return context.getString(R.string.CustomNotificationsDialogFragment__default)

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

@ -799,6 +799,7 @@
<string name="CustomNotificationsDialogFragment__enabled">Enabled</string> <string name="CustomNotificationsDialogFragment__enabled">Enabled</string>
<string name="CustomNotificationsDialogFragment__disabled">Disabled</string> <string name="CustomNotificationsDialogFragment__disabled">Disabled</string>
<string name="CustomNotificationsDialogFragment__default">Default</string> <string name="CustomNotificationsDialogFragment__default">Default</string>
<string name="CustomNotificationsDialogFragment__unknown">Unknown</string>
<!-- ShareableGroupLinkDialogFragment --> <!-- ShareableGroupLinkDialogFragment -->
<string name="ShareableGroupLinkDialogFragment__shareable_group_link">Shareable group link</string> <string name="ShareableGroupLinkDialogFragment__shareable_group_link">Shareable group link</string>