From 5717dd48ed38be2b5c3c3ab68b886ae4d7168a46 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 14 Jan 2018 22:54:06 +0100 Subject: [PATCH] remove some constants boilerplate by adding a more specific import --- .../contacts/activities/ContactActivity.kt | 85 ++++++----- .../contacts/helpers/Constants.kt | 28 ++-- .../contacts/helpers/ContactsHelper.kt | 143 +++++++++--------- 3 files changed, 134 insertions(+), 122 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt index 6269120a..ffd137d7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt @@ -1,5 +1,6 @@ package com.simplemobiletools.contacts.activities +import android.provider.ContactsContract.CommonDataKinds import android.app.DatePickerDialog import android.content.ClipData import android.content.Intent @@ -453,14 +454,14 @@ class ContactActivity : SimpleActivity() { private fun showNumberTypePicker(numberTypeField: TextView) { val items = arrayListOf( - RadioItem(ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE, getString(R.string.mobile)), - RadioItem(ContactsContract.CommonDataKinds.Phone.TYPE_HOME, getString(R.string.home)), - RadioItem(ContactsContract.CommonDataKinds.Phone.TYPE_WORK, getString(R.string.work)), - RadioItem(ContactsContract.CommonDataKinds.Phone.TYPE_MAIN, getString(R.string.main_number)), - RadioItem(ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK, getString(R.string.work_fax)), - RadioItem(ContactsContract.CommonDataKinds.Phone.TYPE_FAX_HOME, getString(R.string.home_fax)), - RadioItem(ContactsContract.CommonDataKinds.Phone.TYPE_PAGER, getString(R.string.pager)), - RadioItem(ContactsContract.CommonDataKinds.Phone.TYPE_OTHER, getString(R.string.other)) + RadioItem(CommonDataKinds.Phone.TYPE_MOBILE, getString(R.string.mobile)), + RadioItem(CommonDataKinds.Phone.TYPE_HOME, getString(R.string.home)), + RadioItem(CommonDataKinds.Phone.TYPE_WORK, getString(R.string.work)), + RadioItem(CommonDataKinds.Phone.TYPE_MAIN, getString(R.string.main_number)), + RadioItem(CommonDataKinds.Phone.TYPE_FAX_WORK, getString(R.string.work_fax)), + RadioItem(CommonDataKinds.Phone.TYPE_FAX_HOME, getString(R.string.home_fax)), + RadioItem(CommonDataKinds.Phone.TYPE_PAGER, getString(R.string.pager)), + RadioItem(CommonDataKinds.Phone.TYPE_OTHER, getString(R.string.other)) ) val currentNumberTypeId = getPhoneNumberTypeId(numberTypeField.value) @@ -471,10 +472,10 @@ class ContactActivity : SimpleActivity() { private fun showEmailTypePicker(emailTypeField: TextView) { val items = arrayListOf( - RadioItem(ContactsContract.CommonDataKinds.Email.TYPE_HOME, getString(R.string.home)), - RadioItem(ContactsContract.CommonDataKinds.Email.TYPE_WORK, getString(R.string.work)), - RadioItem(ContactsContract.CommonDataKinds.Email.TYPE_MOBILE, getString(R.string.mobile)), - RadioItem(ContactsContract.CommonDataKinds.Email.TYPE_OTHER, getString(R.string.other)) + RadioItem(CommonDataKinds.Email.TYPE_HOME, getString(R.string.home)), + RadioItem(CommonDataKinds.Email.TYPE_WORK, getString(R.string.work)), + RadioItem(CommonDataKinds.Email.TYPE_MOBILE, getString(R.string.mobile)), + RadioItem(CommonDataKinds.Email.TYPE_OTHER, getString(R.string.other)) ) val currentEmailTypeId = getEmailTypeId(emailTypeField.value) @@ -485,9 +486,9 @@ class ContactActivity : SimpleActivity() { private fun showEventTypePicker(eventTypeField: TextView) { val items = arrayListOf( - RadioItem(ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY, getString(R.string.birthday)), - RadioItem(ContactsContract.CommonDataKinds.Event.TYPE_ANNIVERSARY, getString(R.string.anniversary)), - RadioItem(ContactsContract.CommonDataKinds.Event.TYPE_OTHER, getString(R.string.other)) + RadioItem(CommonDataKinds.Event.TYPE_BIRTHDAY, getString(R.string.birthday)), + RadioItem(CommonDataKinds.Event.TYPE_ANNIVERSARY, getString(R.string.anniversary)), + RadioItem(CommonDataKinds.Event.TYPE_OTHER, getString(R.string.other)) ) val currentEventTypeId = getEventTypeId(eventTypeField.value) @@ -748,50 +749,50 @@ class ContactActivity : SimpleActivity() { } private fun getPhoneNumberTextId(type: Int) = when (type) { - ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE -> R.string.mobile - ContactsContract.CommonDataKinds.Phone.TYPE_HOME -> R.string.home - ContactsContract.CommonDataKinds.Phone.TYPE_WORK -> R.string.work - ContactsContract.CommonDataKinds.Phone.TYPE_MAIN -> R.string.main_number - ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK -> R.string.work_fax - ContactsContract.CommonDataKinds.Phone.TYPE_FAX_HOME -> R.string.home_fax - ContactsContract.CommonDataKinds.Phone.TYPE_PAGER -> R.string.pager + CommonDataKinds.Phone.TYPE_MOBILE -> R.string.mobile + CommonDataKinds.Phone.TYPE_HOME -> R.string.home + CommonDataKinds.Phone.TYPE_WORK -> R.string.work + CommonDataKinds.Phone.TYPE_MAIN -> R.string.main_number + CommonDataKinds.Phone.TYPE_FAX_WORK -> R.string.work_fax + CommonDataKinds.Phone.TYPE_FAX_HOME -> R.string.home_fax + CommonDataKinds.Phone.TYPE_PAGER -> R.string.pager else -> R.string.other } private fun getPhoneNumberTypeId(value: String) = when (value) { - getString(R.string.mobile) -> ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE - getString(R.string.home) -> ContactsContract.CommonDataKinds.Phone.TYPE_HOME - getString(R.string.work) -> ContactsContract.CommonDataKinds.Phone.TYPE_WORK - getString(R.string.main_number) -> ContactsContract.CommonDataKinds.Phone.TYPE_MAIN - getString(R.string.work_fax) -> ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK - getString(R.string.home_fax) -> ContactsContract.CommonDataKinds.Phone.TYPE_FAX_HOME - getString(R.string.pager) -> ContactsContract.CommonDataKinds.Phone.TYPE_PAGER - else -> ContactsContract.CommonDataKinds.Phone.TYPE_OTHER + getString(R.string.mobile) -> CommonDataKinds.Phone.TYPE_MOBILE + getString(R.string.home) -> CommonDataKinds.Phone.TYPE_HOME + getString(R.string.work) -> CommonDataKinds.Phone.TYPE_WORK + getString(R.string.main_number) -> CommonDataKinds.Phone.TYPE_MAIN + getString(R.string.work_fax) -> CommonDataKinds.Phone.TYPE_FAX_WORK + getString(R.string.home_fax) -> CommonDataKinds.Phone.TYPE_FAX_HOME + getString(R.string.pager) -> CommonDataKinds.Phone.TYPE_PAGER + else -> CommonDataKinds.Phone.TYPE_OTHER } private fun getEmailTextId(type: Int) = when (type) { - ContactsContract.CommonDataKinds.Email.TYPE_HOME -> R.string.home - ContactsContract.CommonDataKinds.Email.TYPE_WORK -> R.string.work - ContactsContract.CommonDataKinds.Email.TYPE_MOBILE -> R.string.mobile + CommonDataKinds.Email.TYPE_HOME -> R.string.home + CommonDataKinds.Email.TYPE_WORK -> R.string.work + CommonDataKinds.Email.TYPE_MOBILE -> R.string.mobile else -> R.string.other } private fun getEmailTypeId(value: String) = when (value) { - getString(R.string.home) -> ContactsContract.CommonDataKinds.Email.TYPE_HOME - getString(R.string.work) -> ContactsContract.CommonDataKinds.Email.TYPE_WORK - getString(R.string.mobile) -> ContactsContract.CommonDataKinds.Email.TYPE_MOBILE - else -> ContactsContract.CommonDataKinds.Email.TYPE_OTHER + getString(R.string.home) -> CommonDataKinds.Email.TYPE_HOME + getString(R.string.work) -> CommonDataKinds.Email.TYPE_WORK + getString(R.string.mobile) -> CommonDataKinds.Email.TYPE_MOBILE + else -> CommonDataKinds.Email.TYPE_OTHER } private fun getEventTextId(type: Int) = when (type) { - ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY -> R.string.birthday - ContactsContract.CommonDataKinds.Event.TYPE_ANNIVERSARY -> R.string.anniversary + CommonDataKinds.Event.TYPE_BIRTHDAY -> R.string.birthday + CommonDataKinds.Event.TYPE_ANNIVERSARY -> R.string.anniversary else -> R.string.other } private fun getEventTypeId(value: String) = when (value) { - getString(R.string.birthday) -> ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY - getString(R.string.anniversary) -> ContactsContract.CommonDataKinds.Event.TYPE_ANNIVERSARY - else -> ContactsContract.CommonDataKinds.Event.TYPE_OTHER + getString(R.string.birthday) -> CommonDataKinds.Event.TYPE_BIRTHDAY + getString(R.string.anniversary) -> CommonDataKinds.Event.TYPE_ANNIVERSARY + else -> CommonDataKinds.Event.TYPE_OTHER } } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt index 781c4acd..23dd6b9e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt @@ -1,6 +1,6 @@ package com.simplemobiletools.contacts.helpers -import android.provider.ContactsContract +import android.provider.ContactsContract.CommonDataKinds // shared prefs val CALL_CONTACT_ON_CLICK = "call_contact_on_click" @@ -19,17 +19,27 @@ val PHOTO_CHANGED = 3 val PHOTO_UNCHANGED = 4 // default contact values -val DEFAULT_EMAIL_TYPE = ContactsContract.CommonDataKinds.Email.TYPE_HOME -val DEFAULT_PHONE_NUMBER_TYPE = ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE -val DEFAULT_EVENT_TYPE = ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY +val DEFAULT_EMAIL_TYPE = CommonDataKinds.Email.TYPE_HOME +val DEFAULT_PHONE_NUMBER_TYPE = CommonDataKinds.Phone.TYPE_MOBILE +val DEFAULT_EVENT_TYPE = CommonDataKinds.Event.TYPE_BIRTHDAY // export/import val BEGIN_VCARD = "BEGIN:VCARD" val END_VCARD = "END:VCARD" -val N = "N" -val FN = "FN" +val N = "N:" +val FN = "FN:" val TEL = "TEL" -val VERSION = "VERSION" -val BDAY = "BDAY" +val BDAY = "BDAY:" val PHOTO = "PHOTO" -val EMAIL = "EMAIL" +val EMAIL = "EMAIL;" + +// phone number types +val CELL = "CELL" +val WORK = "WORK" +val HOME = "HOME" +val PREF = "PREF" +val WORK_FAX = "WORK;FAX" +val HOME_FAX = "HOME;FAX" +val PAGER = "PAGER" +val VOICE = "VOICE" +val EMPTY = "" diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt index ce3e774d..0875ca3a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt @@ -8,6 +8,7 @@ import android.database.Cursor import android.graphics.Bitmap import android.net.Uri import android.provider.ContactsContract +import android.provider.ContactsContract.CommonDataKinds import android.provider.MediaStore import android.util.SparseArray import com.simplemobiletools.commons.activities.BaseSimpleActivity @@ -35,7 +36,7 @@ class ContactsHelper(val activity: BaseSimpleActivity) { val uri = ContactsContract.Data.CONTENT_URI val projection = getContactProjection() val selection = "${ContactsContract.Data.MIMETYPE} = ?" - val selectionArgs = arrayOf(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) + val selectionArgs = arrayOf(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) val sortOrder = getSortString() var cursor: Cursor? = null @@ -44,15 +45,15 @@ class ContactsHelper(val activity: BaseSimpleActivity) { if (cursor?.moveToFirst() == true) { do { val id = cursor.getIntValue(ContactsContract.Data.RAW_CONTACT_ID) - val firstName = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME) ?: "" - val middleName = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.MIDDLE_NAME) ?: "" - val surname = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME) ?: "" - val photoUri = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.PHOTO_URI) ?: "" + val firstName = cursor.getStringValue(CommonDataKinds.StructuredName.GIVEN_NAME) ?: "" + val middleName = cursor.getStringValue(CommonDataKinds.StructuredName.MIDDLE_NAME) ?: "" + val surname = cursor.getStringValue(CommonDataKinds.StructuredName.FAMILY_NAME) ?: "" + val photoUri = cursor.getStringValue(CommonDataKinds.StructuredName.PHOTO_URI) ?: "" val number = ArrayList() // proper value is obtained below val emails = ArrayList() val events = ArrayList() val accountName = cursor.getStringValue(ContactsContract.RawContacts.ACCOUNT_NAME) - val starred = cursor.getIntValue(ContactsContract.CommonDataKinds.StructuredName.STARRED) + val starred = cursor.getIntValue(CommonDataKinds.StructuredName.STARRED) val contactId = cursor.getIntValue(ContactsContract.Data.CONTACT_ID) val contact = Contact(id, firstName, middleName, surname, photoUri, number, emails, events, accountName, starred, contactId) contacts.put(id, contact) @@ -88,11 +89,11 @@ class ContactsHelper(val activity: BaseSimpleActivity) { private fun getPhoneNumbers(contactId: Int? = null): SparseArray> { val phoneNumbers = SparseArray>() - val uri = ContactsContract.CommonDataKinds.Phone.CONTENT_URI + val uri = CommonDataKinds.Phone.CONTENT_URI val projection = arrayOf( ContactsContract.Data.RAW_CONTACT_ID, - ContactsContract.CommonDataKinds.Phone.NUMBER, - ContactsContract.CommonDataKinds.Phone.TYPE + CommonDataKinds.Phone.NUMBER, + CommonDataKinds.Phone.TYPE ) val selection = if (contactId == null) null else "${ContactsContract.Data.RAW_CONTACT_ID} = ?" @@ -104,8 +105,8 @@ class ContactsHelper(val activity: BaseSimpleActivity) { if (cursor?.moveToFirst() == true) { do { val id = cursor.getIntValue(ContactsContract.Data.RAW_CONTACT_ID) - val number = cursor.getStringValue(ContactsContract.CommonDataKinds.Phone.NUMBER) - val type = cursor.getIntValue(ContactsContract.CommonDataKinds.Phone.TYPE) + val number = cursor.getStringValue(CommonDataKinds.Phone.NUMBER) + val type = cursor.getIntValue(CommonDataKinds.Phone.TYPE) if (phoneNumbers[id] == null) { phoneNumbers.put(id, ArrayList()) @@ -122,11 +123,11 @@ class ContactsHelper(val activity: BaseSimpleActivity) { private fun getEmails(contactId: Int? = null): SparseArray> { val emails = SparseArray>() - val uri = ContactsContract.CommonDataKinds.Email.CONTENT_URI + val uri = CommonDataKinds.Email.CONTENT_URI val projection = arrayOf( ContactsContract.Data.RAW_CONTACT_ID, - ContactsContract.CommonDataKinds.Email.DATA, - ContactsContract.CommonDataKinds.Email.TYPE + CommonDataKinds.Email.DATA, + CommonDataKinds.Email.TYPE ) val selection = if (contactId == null) null else "${ContactsContract.Data.RAW_CONTACT_ID} = ?" @@ -138,8 +139,8 @@ class ContactsHelper(val activity: BaseSimpleActivity) { if (cursor?.moveToFirst() == true) { do { val id = cursor.getIntValue(ContactsContract.Data.RAW_CONTACT_ID) - val email = cursor.getStringValue(ContactsContract.CommonDataKinds.Email.DATA) ?: continue - val type = cursor.getIntValue(ContactsContract.CommonDataKinds.Email.TYPE) + val email = cursor.getStringValue(CommonDataKinds.Email.DATA) ?: continue + val type = cursor.getIntValue(CommonDataKinds.Email.TYPE) if (emails[id] == null) { emails.put(id, ArrayList()) @@ -159,18 +160,18 @@ class ContactsHelper(val activity: BaseSimpleActivity) { val events = SparseArray>() val uri = ContactsContract.Data.CONTENT_URI val projection = arrayOf( - ContactsContract.CommonDataKinds.Event.START_DATE, - ContactsContract.CommonDataKinds.Event.TYPE + CommonDataKinds.Event.START_DATE, + CommonDataKinds.Event.TYPE ) val selection = "${ContactsContract.Data.RAW_CONTACT_ID} = ? AND ${ContactsContract.Data.MIMETYPE} = ?" - val selectionArgs = arrayOf(contactId.toString(), ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE) + val selectionArgs = arrayOf(contactId.toString(), CommonDataKinds.Event.CONTENT_ITEM_TYPE) var cursor: Cursor? = null try { cursor = activity.contentResolver.query(uri, projection, selection, selectionArgs, null) if (cursor?.moveToFirst() == true) { do { - val startDate = cursor.getStringValue(ContactsContract.CommonDataKinds.Event.START_DATE) - val type = cursor.getIntValue(ContactsContract.CommonDataKinds.Event.TYPE) + val startDate = cursor.getStringValue(CommonDataKinds.Event.START_DATE) + val type = cursor.getIntValue(CommonDataKinds.Event.TYPE) if (events[contactId] == null) { events.put(contactId, ArrayList()) @@ -196,20 +197,20 @@ class ContactsHelper(val activity: BaseSimpleActivity) { val uri = ContactsContract.Data.CONTENT_URI val projection = getContactProjection() val selection = "${ContactsContract.Data.MIMETYPE} = ? AND ${ContactsContract.Data.RAW_CONTACT_ID} = ?" - val selectionArgs = arrayOf(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE, id.toString()) + val selectionArgs = arrayOf(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE, id.toString()) var cursor: Cursor? = null try { cursor = activity.contentResolver.query(uri, projection, selection, selectionArgs, null) if (cursor?.moveToFirst() == true) { - val firstName = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME) ?: "" - val middleName = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.MIDDLE_NAME) ?: "" - val surname = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME) ?: "" - val photoUri = cursor.getStringValue(ContactsContract.CommonDataKinds.Phone.PHOTO_URI) ?: "" + val firstName = cursor.getStringValue(CommonDataKinds.StructuredName.GIVEN_NAME) ?: "" + val middleName = cursor.getStringValue(CommonDataKinds.StructuredName.MIDDLE_NAME) ?: "" + val surname = cursor.getStringValue(CommonDataKinds.StructuredName.FAMILY_NAME) ?: "" + val photoUri = cursor.getStringValue(CommonDataKinds.Phone.PHOTO_URI) ?: "" val number = getPhoneNumbers(id)[id] ?: ArrayList() val emails = getEmails(id)[id] ?: ArrayList() val events = getEvents(id)[id] ?: ArrayList() val accountName = cursor.getStringValue(ContactsContract.RawContacts.ACCOUNT_NAME) - val starred = cursor.getIntValue(ContactsContract.CommonDataKinds.StructuredName.STARRED) + val starred = cursor.getIntValue(CommonDataKinds.StructuredName.STARRED) val contactId = cursor.getIntValue(ContactsContract.Data.CONTACT_ID) return Contact(id, firstName, middleName, surname, photoUri, number, emails, events, accountName, starred, contactId) } @@ -264,21 +265,21 @@ class ContactsHelper(val activity: BaseSimpleActivity) { private fun getContactProjection() = arrayOf( ContactsContract.Data.CONTACT_ID, ContactsContract.Data.RAW_CONTACT_ID, - ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME, - ContactsContract.CommonDataKinds.StructuredName.MIDDLE_NAME, - ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME, - ContactsContract.CommonDataKinds.StructuredName.PHOTO_URI, - ContactsContract.CommonDataKinds.StructuredName.STARRED, + CommonDataKinds.StructuredName.GIVEN_NAME, + CommonDataKinds.StructuredName.MIDDLE_NAME, + CommonDataKinds.StructuredName.FAMILY_NAME, + CommonDataKinds.StructuredName.PHOTO_URI, + CommonDataKinds.StructuredName.STARRED, ContactsContract.RawContacts.ACCOUNT_NAME ) private fun getSortString(): String { val sorting = activity.config.sorting var sort = when { - sorting and SORT_BY_FIRST_NAME != 0 -> "${ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME} COLLATE NOCASE" - sorting and SORT_BY_MIDDLE_NAME != 0 -> "${ContactsContract.CommonDataKinds.StructuredName.MIDDLE_NAME} COLLATE NOCASE" - sorting and SORT_BY_SURNAME != 0 -> "${ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME} COLLATE NOCASE" - else -> ContactsContract.CommonDataKinds.Phone.NUMBER + sorting and SORT_BY_FIRST_NAME != 0 -> "${CommonDataKinds.StructuredName.GIVEN_NAME} COLLATE NOCASE" + sorting and SORT_BY_MIDDLE_NAME != 0 -> "${CommonDataKinds.StructuredName.MIDDLE_NAME} COLLATE NOCASE" + sorting and SORT_BY_SURNAME != 0 -> "${CommonDataKinds.StructuredName.FAMILY_NAME} COLLATE NOCASE" + else -> CommonDataKinds.Phone.NUMBER } if (sorting and SORT_DESCENDING != 0) { @@ -294,18 +295,18 @@ class ContactsHelper(val activity: BaseSimpleActivity) { val operations = ArrayList() ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI).apply { val selection = "${ContactsContract.Data.RAW_CONTACT_ID} = ? AND ${ContactsContract.Data.MIMETYPE} = ?" - val selectionArgs = arrayOf(contact.id.toString(), ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) + val selectionArgs = arrayOf(contact.id.toString(), CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) withSelection(selection, selectionArgs) - withValue(ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME, contact.firstName) - withValue(ContactsContract.CommonDataKinds.StructuredName.MIDDLE_NAME, contact.middleName) - withValue(ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME, contact.surname) + withValue(CommonDataKinds.StructuredName.GIVEN_NAME, contact.firstName) + withValue(CommonDataKinds.StructuredName.MIDDLE_NAME, contact.middleName) + withValue(CommonDataKinds.StructuredName.FAMILY_NAME, contact.surname) operations.add(build()) } // delete phone numbers ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI).apply { val selection = "${ContactsContract.Data.RAW_CONTACT_ID} = ? AND ${ContactsContract.Data.MIMETYPE} = ? " - val selectionArgs = arrayOf(contact.id.toString(), ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE) + val selectionArgs = arrayOf(contact.id.toString(), CommonDataKinds.Phone.CONTENT_ITEM_TYPE) withSelection(selection, selectionArgs) operations.add(build()) } @@ -314,9 +315,9 @@ class ContactsHelper(val activity: BaseSimpleActivity) { contact.phoneNumbers.forEach { ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI).apply { withValue(ContactsContract.Data.RAW_CONTACT_ID, contact.id) - withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE) - withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, it.value) - withValue(ContactsContract.CommonDataKinds.Phone.TYPE, it.type) + withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Phone.CONTENT_ITEM_TYPE) + withValue(CommonDataKinds.Phone.NUMBER, it.value) + withValue(CommonDataKinds.Phone.TYPE, it.type) operations.add(build()) } } @@ -324,7 +325,7 @@ class ContactsHelper(val activity: BaseSimpleActivity) { // delete emails ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI).apply { val selection = "${ContactsContract.Data.RAW_CONTACT_ID} = ? AND ${ContactsContract.Data.MIMETYPE} = ? " - val selectionArgs = arrayOf(contact.id.toString(), ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE) + val selectionArgs = arrayOf(contact.id.toString(), CommonDataKinds.Email.CONTENT_ITEM_TYPE) withSelection(selection, selectionArgs) operations.add(build()) } @@ -333,9 +334,9 @@ class ContactsHelper(val activity: BaseSimpleActivity) { contact.emails.forEach { ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI).apply { withValue(ContactsContract.Data.RAW_CONTACT_ID, contact.id) - withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE) - withValue(ContactsContract.CommonDataKinds.Email.DATA, it.value) - withValue(ContactsContract.CommonDataKinds.Email.TYPE, it.type) + withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Email.CONTENT_ITEM_TYPE) + withValue(CommonDataKinds.Email.DATA, it.value) + withValue(CommonDataKinds.Email.TYPE, it.type) operations.add(build()) } } @@ -343,7 +344,7 @@ class ContactsHelper(val activity: BaseSimpleActivity) { // delete events ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI).apply { val selection = "${ContactsContract.Data.RAW_CONTACT_ID} = ? AND ${ContactsContract.Data.MIMETYPE} = ? " - val selectionArgs = arrayOf(contact.id.toString(), ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE) + val selectionArgs = arrayOf(contact.id.toString(), CommonDataKinds.Event.CONTENT_ITEM_TYPE) withSelection(selection, selectionArgs) operations.add(build()) } @@ -352,9 +353,9 @@ class ContactsHelper(val activity: BaseSimpleActivity) { contact.events.forEach { ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI).apply { withValue(ContactsContract.Data.RAW_CONTACT_ID, contact.id) - withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE) - withValue(ContactsContract.CommonDataKinds.Event.START_DATE, it.value) - withValue(ContactsContract.CommonDataKinds.Event.TYPE, it.type) + withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Event.CONTENT_ITEM_TYPE) + withValue(CommonDataKinds.Event.START_DATE, it.value) + withValue(CommonDataKinds.Event.TYPE, it.type) operations.add(build()) } } @@ -398,8 +399,8 @@ class ContactsHelper(val activity: BaseSimpleActivity) { ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI).apply { withValue(ContactsContract.Data.RAW_CONTACT_ID, contact.id) - withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE) - withValue(ContactsContract.CommonDataKinds.Photo.PHOTO, scaledSizePhotoData) + withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Photo.CONTENT_ITEM_TYPE) + withValue(CommonDataKinds.Photo.PHOTO, scaledSizePhotoData) operations.add(build()) } @@ -411,7 +412,7 @@ class ContactsHelper(val activity: BaseSimpleActivity) { private fun removePhoto(contact: Contact, operations: ArrayList): ArrayList { ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI).apply { val selection = "${ContactsContract.Data.RAW_CONTACT_ID} = ? AND ${ContactsContract.Data.MIMETYPE} = ?" - val selectionArgs = arrayOf(contact.id.toString(), ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE) + val selectionArgs = arrayOf(contact.id.toString(), CommonDataKinds.Photo.CONTENT_ITEM_TYPE) withSelection(selection, selectionArgs) operations.add(build()) } @@ -432,10 +433,10 @@ class ContactsHelper(val activity: BaseSimpleActivity) { // names ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI).apply { withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0) - withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) - withValue(ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME, contact.firstName) - withValue(ContactsContract.CommonDataKinds.StructuredName.MIDDLE_NAME, contact.middleName) - withValue(ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME, contact.surname) + withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) + withValue(CommonDataKinds.StructuredName.GIVEN_NAME, contact.firstName) + withValue(CommonDataKinds.StructuredName.MIDDLE_NAME, contact.middleName) + withValue(CommonDataKinds.StructuredName.FAMILY_NAME, contact.surname) operations.add(build()) } @@ -443,9 +444,9 @@ class ContactsHelper(val activity: BaseSimpleActivity) { contact.phoneNumbers.forEach { ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI).apply { withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0) - withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE) - withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, it.value) - withValue(ContactsContract.CommonDataKinds.Phone.TYPE, it.type) + withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Phone.CONTENT_ITEM_TYPE) + withValue(CommonDataKinds.Phone.NUMBER, it.value) + withValue(CommonDataKinds.Phone.TYPE, it.type) operations.add(build()) } } @@ -454,9 +455,9 @@ class ContactsHelper(val activity: BaseSimpleActivity) { contact.emails.forEach { ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI).apply { withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0) - withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE) - withValue(ContactsContract.CommonDataKinds.Email.DATA, it.value) - withValue(ContactsContract.CommonDataKinds.Email.TYPE, it.type) + withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Email.CONTENT_ITEM_TYPE) + withValue(CommonDataKinds.Email.DATA, it.value) + withValue(CommonDataKinds.Email.TYPE, it.type) operations.add(build()) } } @@ -465,9 +466,9 @@ class ContactsHelper(val activity: BaseSimpleActivity) { contact.events.forEach { ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI).apply { withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0) - withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE) - withValue(ContactsContract.CommonDataKinds.Event.START_DATE, it.value) - withValue(ContactsContract.CommonDataKinds.Event.TYPE, it.type) + withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Event.CONTENT_ITEM_TYPE) + withValue(CommonDataKinds.Event.START_DATE, it.value) + withValue(CommonDataKinds.Event.TYPE, it.type) operations.add(build()) } } @@ -489,8 +490,8 @@ class ContactsHelper(val activity: BaseSimpleActivity) { ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI).apply { withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0) - withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE) - withValue(ContactsContract.CommonDataKinds.Photo.PHOTO, scaledSizePhotoData) + withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Photo.CONTENT_ITEM_TYPE) + withValue(CommonDataKinds.Photo.PHOTO, scaledSizePhotoData) operations.add(build()) } } @@ -540,7 +541,7 @@ class ContactsHelper(val activity: BaseSimpleActivity) { val uri = ContactsContract.Data.CONTENT_URI val projection = arrayOf(ContactsContract.Data.CONTACT_ID, ContactsContract.Data.LOOKUP_KEY) val selection = "${ContactsContract.Data.MIMETYPE} = ? AND ${ContactsContract.Data.RAW_CONTACT_ID} = ?" - val selectionArgs = arrayOf(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE, contactId) + val selectionArgs = arrayOf(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE, contactId) var cursor: Cursor? = null try { cursor = activity.contentResolver.query(uri, projection, selection, selectionArgs, null)