fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

properly fill all contact emails at the details activity

Browse Source
This commit is contained in:
tibbi
2017-12-17 22:30:06 +01:00
parent e3f9b0d111
commit 86b952ad82
2 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
View File

@ -3,6 +3,7 @@ package com.simplemobiletools.contacts.activities
import android.content.Intent import android.content.Intent
import android.graphics.Paint import android.graphics.Paint
import android.os.Bundle import android.os.Bundle
import android.util.Log
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
@ -27,6 +28,8 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
private var storedPrimaryColor = 0 private var storedPrimaryColor = 0
private var storedStartNameWithSurname = false private var storedStartNameWithSurname = false
private var isFirstResume = true
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main) setContentView(R.layout.activity_main)
@ -87,8 +90,11 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
contacts_placeholder_2.setOnClickListener { contacts_placeholder_2.setOnClickListener {
showFilterDialog() showFilterDialog()
} }
if (!isFirstResume) {
initContacts() initContacts()
} }
isFirstResume = false
}
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()

32
app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt
View File

@ -113,20 +113,24 @@ class ContactsHelper(val activity: BaseSimpleActivity) {
} }
} }
private fun getEmails(): SparseArray<Emails> { private fun getEmails(contactId: Int? = null): SparseArray<Emails> {
val emails = SparseArray<Emails>() val emails = SparseArray<Emails>()
val uri = ContactsContract.CommonDataKinds.Email.CONTENT_URI val uri = ContactsContract.CommonDataKinds.Email.CONTENT_URI
val projection = arrayOf( val projection = arrayOf(
ContactsContract.CommonDataKinds.Phone.CONTACT_ID, ContactsContract.CommonDataKinds.Email.CONTACT_ID,
ContactsContract.CommonDataKinds.Email.DATA, ContactsContract.CommonDataKinds.Email.DATA,
ContactsContract.CommonDataKinds.Email.TYPE ContactsContract.CommonDataKinds.Email.TYPE
) )
val selection = if (contactId == null) null else "${ContactsContract.CommonDataKinds.Email.CONTACT_ID} = ?"
val selectionArgs = if (contactId == null) null else arrayOf(contactId.toString())
var cursor: Cursor? = null var cursor: Cursor? = null
try { try {
cursor = activity.contentResolver.query(uri, projection, null, null, null) cursor = activity.contentResolver.query(uri, projection, selection, selectionArgs, null)
if (cursor?.moveToFirst() == true) { if (cursor?.moveToFirst() == true) {
do { do {
val id = cursor.getIntValue(ContactsContract.CommonDataKinds.Phone.CONTACT_ID) val id = cursor.getIntValue(ContactsContract.CommonDataKinds.Email.CONTACT_ID)
val email = cursor.getStringValue(ContactsContract.CommonDataKinds.Email.DATA) val email = cursor.getStringValue(ContactsContract.CommonDataKinds.Email.DATA)
val type = cursor.getIntValue(ContactsContract.CommonDataKinds.Email.TYPE) val type = cursor.getIntValue(ContactsContract.CommonDataKinds.Email.TYPE)
@ -167,24 +171,6 @@ class ContactsHelper(val activity: BaseSimpleActivity) {
return pairs return pairs
} }
fun getContactEmails(id: Int): String {
val uri = ContactsContract.CommonDataKinds.Email.CONTENT_URI
val projection = arrayOf(ContactsContract.CommonDataKinds.Email.DATA)
val selection = "${ContactsContract.CommonDataKinds.Email.CONTACT_ID} = ?"
val selectionArgs = arrayOf(id.toString())
var cursor: Cursor? = null
try {
cursor = activity.contentResolver.query(uri, projection, selection, selectionArgs, null)
if (cursor?.moveToFirst() == true) {
return cursor.getStringValue(ContactsContract.CommonDataKinds.Email.DATA)
}
} finally {
cursor?.close()
}
return ""
}
fun getContactNumber(id: Int): String { fun getContactNumber(id: Int): String {
val uri = ContactsContract.CommonDataKinds.Phone.CONTENT_URI val uri = ContactsContract.CommonDataKinds.Phone.CONTENT_URI
val projection = arrayOf(ContactsContract.CommonDataKinds.Phone.NUMBER) val projection = arrayOf(ContactsContract.CommonDataKinds.Phone.NUMBER)
@ -221,7 +207,7 @@ class ContactsHelper(val activity: BaseSimpleActivity) {
val surname = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME) ?: "" val surname = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME) ?: ""
val photoUri = cursor.getStringValue(ContactsContract.CommonDataKinds.Phone.PHOTO_URI) ?: "" val photoUri = cursor.getStringValue(ContactsContract.CommonDataKinds.Phone.PHOTO_URI) ?: ""
val number = getContactNumber(id) val number = getContactNumber(id)
val emails = Emails() val emails = getEmails(id)[id] ?: Emails()
val accountName = cursor.getStringValue(ContactsContract.RawContacts.ACCOUNT_NAME) val accountName = cursor.getStringValue(ContactsContract.RawContacts.ACCOUNT_NAME)
return Contact(id, firstName, middleName, surname, photoUri, number, emails, accountName) return Contact(id, firstName, middleName, surname, photoUri, number, emails, accountName)
} }