From 1eea84afa73d074a05998be2befb76143d9a8d48 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 12 Dec 2021 18:59:41 +0100 Subject: [PATCH] recognize ringtone change at save/discard dialog too --- .../contacts/pro/activities/ContactActivity.kt | 1 + .../contacts/pro/activities/EditContactActivity.kt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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 5c4ceff3..936fb415 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 @@ -38,6 +38,7 @@ abstract class ContactActivity : SimpleActivity() { protected val INTENT_SELECT_RINGTONE = 600 protected var contact: Contact? = null + protected var originalRingtone: String? = null protected var currentContactPhotoPath = "" override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) { 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 914ba5a9..fe717b39 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 @@ -156,6 +156,7 @@ class EditContactActivity : ContactActivity() { setupNewContact() } else { setupEditContact() + originalRingtone = contact?.ringtone } val action = intent.action @@ -295,7 +296,7 @@ class EditContactActivity : ContactActivity() { } } - private fun hasContactChanged() = contact != fillContactValues() + private fun hasContactChanged() = contact != fillContactValues() || originalRingtone != contact?.ringtone private fun openWith() { Intent().apply {