From 39921fc66dc86fe2fd492317757a2cfd6f051a9d Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 20 Mar 2018 23:28:00 +0100 Subject: [PATCH] accept groups with null system_id in some cases --- .../contacts/helpers/ContactsHelper.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 3dbddfcb..fd46cfb0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt @@ -361,10 +361,11 @@ class ContactsHelper(val activity: BaseSimpleActivity) { val uri = ContactsContract.Groups.CONTENT_URI val projection = arrayOf( ContactsContract.Groups._ID, - ContactsContract.Groups.TITLE + ContactsContract.Groups.TITLE, + ContactsContract.Groups.SYSTEM_ID ) - val selection = "${ContactsContract.Groups.AUTO_ADD} = ? AND ${ContactsContract.Groups.FAVORITES} = ? AND ${ContactsContract.Groups.SYSTEM_ID} IS NULL" + val selection = "${ContactsContract.Groups.AUTO_ADD} = ? AND ${ContactsContract.Groups.FAVORITES} = ?" val selectionArgs = arrayOf("0", "0") var cursor: Cursor? = null @@ -374,6 +375,12 @@ class ContactsHelper(val activity: BaseSimpleActivity) { do { val id = cursor.getLongValue(ContactsContract.Groups._ID) val title = cursor.getStringValue(ContactsContract.Groups.TITLE) + + val systemId = cursor.getStringValue(ContactsContract.Groups.SYSTEM_ID) + if (groups.map { it.title }.contains(title) && systemId != null) { + continue + } + groups.add(Group(id, title)) } while (cursor.moveToNext()) }