From 43e8dd330312464d216d8d9ead76a52c0a4276f0 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 14 Feb 2021 17:58:30 +0100 Subject: [PATCH] show "No sound" at silent ringtones --- .../contacts/pro/activities/EditContactActivity.kt | 8 ++++++-- .../contacts/pro/activities/ViewContactActivity.kt | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt index a3efcd8c..cce2c4a1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt @@ -499,8 +499,12 @@ class EditContactActivity : ContactActivity() { val ringtone = contact!!.ringtone if (ringtone != null && ringtone.isNotEmpty()) { - val contactRingtone = RingtoneManager.getRingtone(this, Uri.parse(ringtone)) - contact_ringtone.text = contactRingtone.getTitle(this) + if (ringtone == SILENT) { + contact_ringtone.text = getString(R.string.no_sound) + } else { + val contactRingtone = RingtoneManager.getRingtone(this, Uri.parse(ringtone)) + contact_ringtone.text = contactRingtone.getTitle(this) + } } else { val default = getDefaultAlarmSound(RingtoneManager.TYPE_RINGTONE) contact_ringtone.text = default.title diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt index 077eeeb5..b28d498c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt @@ -576,9 +576,13 @@ class ViewContactActivity : ContactActivity() { val ringtone = contact!!.ringtone if (ringtone != null && ringtone.isNotEmpty()) { - val contactRingtone = RingtoneManager.getRingtone(this, Uri.parse(ringtone)) - val ringtoneTitle = contactRingtone.getTitle(this) - contact_ringtone.text = ringtoneTitle + if (ringtone == SILENT) { + contact_ringtone.text = getString(R.string.no_sound) + } else { + val contactRingtone = RingtoneManager.getRingtone(this, Uri.parse(ringtone)) + val ringtoneTitle = contactRingtone.getTitle(this) + contact_ringtone.text = ringtoneTitle + } } else { val default = getDefaultAlarmSound(RingtoneManager.TYPE_RINGTONE) contact_ringtone.text = default.title