From 68082ab9edcc080c7d6f8cdb9cb9ab9a502d2116 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 4 Mar 2021 21:02:03 +0100 Subject: [PATCH] properly handle fetching the current ringtone uri --- .../contacts/pro/activities/ContactActivity.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt index aee1927b..fc5c0859 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt @@ -231,12 +231,19 @@ abstract class ContactActivity : SimpleActivity() { protected fun getDefaultRingtoneUri() = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_RINGTONE) protected fun getRingtonePickerIntent(): Intent { + val defaultRingtoneUri = getDefaultRingtoneUri() + val currentRingtoneUri = if (contact!!.ringtone != null) { + Uri.parse(contact!!.ringtone) + } else { + defaultRingtoneUri + } + return Intent(RingtoneManager.ACTION_RINGTONE_PICKER).apply { putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true) putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true) putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_RINGTONE) - putExtra(RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI, getDefaultRingtoneUri()) - putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, Uri.parse(contact!!.ringtone)) + putExtra(RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI, defaultRingtoneUri) + putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, currentRingtoneUri) } } }