fix: support secondary and teritary fields when importing contact (addresses #383)

Author: Bnyro

app/src/main/java/com/bnyro/contacts/ui/activities/MainActivity.kt

@@ -16,6 +16,7 @@ import com.bnyro.contacts.ui.screens.MainAppContent
 import com.bnyro.contacts.ui.theme.ConnectYouTheme
 import com.bnyro.contacts.util.BackupHelper
 import com.bnyro.contacts.util.ContactsHelper
+import com.bnyro.contacts.util.IntentHelper
 import java.net.URLDecoder
 
 class MainActivity : BaseActivity() {
@@ -49,34 +50,7 @@ class MainActivity : BaseActivity() {
     private fun getInsertContactData(): ContactData? {
         return when {
             intent?.action == Intent.ACTION_INSERT -> {
-                val name = intent.getStringExtra(Intents.Insert.NAME)
-                    ?: intent.getStringExtra(Intents.Insert.PHONETIC_NAME)
-                ContactData(
-                    displayName = name,
-                    firstName = name?.split(" ")?.firstOrNull(),
-                    surName = name?.split(" ", limit = 2)?.lastOrNull(),
-                    organization = intent.getStringExtra(Intents.Insert.COMPANY),
-                    numbers = listOfNotNull(
-                        intent.getStringExtra(Intents.Insert.PHONE)?.let {
-                            ValueWithType(it, 0)
-                        }
-                    ),
-                    emails = listOfNotNull(
-                        intent.getStringExtra(Intents.Insert.EMAIL)?.let {
-                            ValueWithType(it, 0)
-                        }
-                    ),
-                    notes = listOfNotNull(
-                        intent.getStringExtra(Intents.Insert.NOTES)?.let {
-                            ValueWithType(it, 0)
-                        }
-                    ),
-                    addresses = listOfNotNull(
-                        intent.getStringExtra(Intents.Insert.POSTAL)?.let {
-                            ValueWithType(it, 0)
-                        }
-                    )
-                )
+                IntentHelper.extractContactFromIntent(intent)
             }
 
             intent?.getStringExtra("action") == "create" -> ContactData()

app/src/main/java/com/bnyro/contacts/util/IntentHelper.kt

@@ -8,6 +8,9 @@ import android.provider.ContactsContract
 import androidx.core.net.toUri
 import com.bnyro.contacts.R
 import com.bnyro.contacts.enums.IntentActionType
+import com.bnyro.contacts.obj.ContactData
+import com.bnyro.contacts.obj.TranslatedType
+import com.bnyro.contacts.obj.ValueWithType
 
 object IntentHelper {
     fun launchAction(context: Context, type: IntentActionType, argument: String) {
@@ -67,4 +70,43 @@ object IntentHelper {
         val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
         context.startActivity(intent)
     }
+
+    fun extractContactFromIntent(intent: Intent): ContactData {
+        val name = intent.getStringExtra(ContactsContract.Intents.Insert.NAME)
+            ?: intent.getStringExtra(ContactsContract.Intents.Insert.PHONETIC_NAME)
+
+        return ContactData(
+            displayName = name,
+            firstName = name?.split(" ")?.firstOrNull(),
+            surName = name?.split(" ", limit = 2)?.lastOrNull(),
+            organization = intent.getStringExtra(ContactsContract.Intents.Insert.COMPANY),
+            numbers = extractIntentValue(intent, ContactsContract.Intents.Insert.PHONE, ContactsContract.Intents.Insert.PHONE_TYPE) +
+                    extractIntentValue(intent, ContactsContract.Intents.Insert.SECONDARY_PHONE, ContactsContract.Intents.Insert.SECONDARY_PHONE_TYPE) +
+                    extractIntentValue(intent, ContactsContract.Intents.Insert.TERTIARY_PHONE, ContactsContract.Intents.Insert.TERTIARY_PHONE_TYPE),
+            emails = extractIntentValue(intent, ContactsContract.Intents.Insert.EMAIL, ContactsContract.Intents.Insert.EMAIL_TYPE) +
+                    extractIntentValue(intent, ContactsContract.Intents.Insert.SECONDARY_EMAIL, ContactsContract.Intents.Insert.SECONDARY_EMAIL_TYPE) +
+                    extractIntentValue(intent, ContactsContract.Intents.Insert.TERTIARY_EMAIL, ContactsContract.Intents.Insert.TERTIARY_EMAIL_TYPE),
+            notes = extractIntentValue(intent, ContactsContract.Intents.Insert.NOTES),
+            addresses = extractIntentValue(intent, ContactsContract.Intents.Insert.POSTAL)
+        )
+    }
+
+    private fun extractIntentValue(
+        intent: Intent,
+        key: String,
+        typeKey: String? = null,
+        types: List<TranslatedType> = emptyList()
+    ): List<ValueWithType> {
+        val entry = intent.getStringExtra(key) ?: return emptyList()
+
+        val type = if (typeKey != null) {
+            val typeIdentifier = intent.getStringExtra(typeKey)
+
+            types.firstOrNull {
+                it.vcardType?.value?.uppercase() == typeIdentifier
+            }?.id
+        } else null
+
+        return listOf(ValueWithType(entry, type ?: 0))
+    }
 }