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

do not use the raw_contact_id at fetching group members

Browse Source
This commit is contained in:
tibbi
2018-04-30 15:09:06 +02:00
parent fbc1fd6034
commit c707ffceec
1 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,39 +268,6 @@ class ContactsHelper(val activity: BaseSimpleActivity) {
return addresses
}
private fun getQuestionMarks() = "?,".times(displayContactSources.size).trimEnd(',')
private fun getSourcesSelection(addMimeType: Boolean = false, addContactId: Boolean = false): String {
val strings = ArrayList<String>()
if (addMimeType) {
strings.add("${ContactsContract.Data.MIMETYPE} = ?")
}
if (addContactId) {
strings.add("${ContactsContract.Data.RAW_CONTACT_ID} = ?")
} else {
strings.add("${ContactsContract.RawContacts.ACCOUNT_NAME} IN (${getQuestionMarks()})")
}
return TextUtils.join(" AND ", strings)
}
private fun getSourcesSelectionArgs(mimetype: String? = null, contactId: Int? = null): Array<String> {
val args = ArrayList<String>()
if (mimetype != null) {
args.add(mimetype)
}
if (contactId != null) {
args.add(contactId.toString())
} else {
args.addAll(displayContactSources)
}
return args.toTypedArray()
}
private fun getEvents(contactId: Int? = null): SparseArray<ArrayList<Event>> {
val events = SparseArray<ArrayList<Event>>()
val uri = ContactsContract.Data.CONTENT_URI
@@ -448,7 +415,7 @@ class ContactsHelper(val activity: BaseSimpleActivity) {
ContactsContract.Data.DATA1
)
val selection = getSourcesSelection(true, contactId != null)
val selection = getSourcesSelection(true, contactId != null, false)
val selectionArgs = getSourcesSelectionArgs(CommonDataKinds.GroupMembership.CONTENT_ITEM_TYPE, contactId)
var cursor: Cursor? = null
@@ -476,6 +443,39 @@ class ContactsHelper(val activity: BaseSimpleActivity) {
return groups
}
private fun getQuestionMarks() = "?,".times(displayContactSources.size).trimEnd(',')
private fun getSourcesSelection(addMimeType: Boolean = false, addContactId: Boolean = false, useRawContactId: Boolean = true): String {
val strings = ArrayList<String>()
if (addMimeType) {
strings.add("${ContactsContract.Data.MIMETYPE} = ?")
}
if (addContactId) {
strings.add("${if (useRawContactId) ContactsContract.Data.RAW_CONTACT_ID else ContactsContract.Data.CONTACT_ID} = ?")
} else {
strings.add("${ContactsContract.RawContacts.ACCOUNT_NAME} IN (${getQuestionMarks()})")
}
return TextUtils.join(" AND ", strings)
}
private fun getSourcesSelectionArgs(mimetype: String? = null, contactId: Int? = null): Array<String> {
val args = ArrayList<String>()
if (mimetype != null) {
args.add(mimetype)
}
if (contactId != null) {
args.add(contactId.toString())
} else {
args.addAll(displayContactSources)
}
return args.toTypedArray()
}
fun getStoredGroups(): ArrayList<Group> {
val groups = getDeviceStoredGroups()
groups.addAll(activity.dbHelper.getGroups())