From 7c6ed3504cae7ef43e2906c9cb59e81137a62536 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 5 Dec 2019 12:00:38 +0100 Subject: [PATCH] properly handle inserting contact emails via third party intents --- .../pro/activities/EditContactActivity.kt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 8f1950d1..0e460c5d 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 @@ -54,7 +54,9 @@ class EditContactActivity : ContactActivity() { private var isSaving = false private var isThirdPartyIntent = false private var highlightLastPhoneNumber = false + private var highlightLastEmail = false private var numberViewToColor: EditText? = null + private var emailViewToColor: EditText? = null private var originalContactSource = "" override fun onCreate(savedInstanceState: Bundle?) { @@ -183,6 +185,13 @@ class EditContactActivity : ContactActivity() { } } + val email = intent.getStringExtra("email") + if (email != null) { + val newEmail = Email(email, DEFAULT_EMAIL_TYPE, "") + contact!!.emails.add(newEmail) + highlightLastEmail = true + } + val firstName = intent.extras!!.get(KEY_NAME) if (firstName != null) { contact!!.firstName = firstName.toString() @@ -265,7 +274,8 @@ class EditContactActivity : ContactActivity() { } updateTextColors(contact_scrollview) - numberViewToColor?.setTextColor(getAdjustedPrimaryColor()) + numberViewToColor?.setTextColor(adjustedPrimaryColor) + emailViewToColor?.setTextColor(adjustedPrimaryColor) wasActivityInitialized = true invalidateOptionsMenu() } @@ -440,6 +450,9 @@ class EditContactActivity : ContactActivity() { emailHolder!!.apply { contact_email.setText(email.value) setupEmailTypePicker(contact_email_type, email.type, email.label) + if (highlightLastEmail && index == contact!!.emails.size - 1) { + emailViewToColor = contact_email + } } } }