From a9e639d73e55a624bd81f3b95503c9c6bf9f7ad5 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 26 Apr 2020 21:22:38 +0200 Subject: [PATCH] check if the default set contact source is valid at creating a new contact --- .../contacts/pro/activities/EditContactActivity.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 ac985174..4a3d26e4 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 @@ -601,6 +601,18 @@ class EditContactActivity : ContactActivity() { getPublicContactSource(contact!!.source) { contact_source.text = it } + + // if the last used contact source is not available anymore, use the first available one. Could happen at ejecting SIM card + ContactsHelper(this).getSaveableContactSources { sources -> + val sourceNames = sources.map { it.name } + if (!sourceNames.contains(originalContactSource)) { + originalContactSource = sourceNames.first() + contact?.source = originalContactSource + getPublicContactSource(contact!!.source) { + contact_source.text = it + } + } + } } private fun setupTypePickers() {