Skip to content

Commit c505eac

Browse files
committed
chore: Move phone search logic to new contact module
1 parent 261f99f commit c505eac

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

data/contacts/src/main/java/de/mm20/launcher2/contacts/providers/AndroidContactProvider.kt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,19 @@ internal class AndroidContactProvider(
3030
val results = withContext(Dispatchers.IO) {
3131
val proj = arrayOf(
3232
ContactsContract.RawContacts.CONTACT_ID,
33-
ContactsContract.RawContacts._ID
33+
ContactsContract.CommonDataKinds.Phone.CONTACT_ID,
3434
)
35-
val sel =
36-
"${ContactsContract.RawContacts.DISPLAY_NAME_PRIMARY} LIKE ? OR ${ContactsContract.RawContacts.DISPLAY_NAME_ALTERNATIVE} LIKE ? OR ${ContactsContract.RawContacts.PHONETIC_NAME} LIKE ? OR ${ContactsContract.RawContacts.SORT_KEY_PRIMARY} LIKE ?"
37-
val selArgs = arrayOf("%$query%", "%$query%", "%$query%", "%$query%")
35+
val sel = """
36+
${ContactsContract.Contacts.DISPLAY_NAME_PRIMARY} LIKE ?
37+
OR ${ContactsContract.Contacts.DISPLAY_NAME_ALTERNATIVE} LIKE ?
38+
OR ${ContactsContract.Contacts.PHONETIC_NAME} LIKE ?
39+
OR ${ContactsContract.Contacts.SORT_KEY_PRIMARY} LIKE ?
40+
OR ${ContactsContract.CommonDataKinds.Phone.NUMBER} LIKE ?
41+
""".trimIndent()
42+
43+
val selArgs = arrayOf("%$query%", "%$query%", "%$query%", "%$query%", "%$query%")
3844
val cursor = context.contentResolver.query(
39-
ContactsContract.RawContacts.CONTENT_URI, proj, sel, selArgs, null
45+
ContactsContract.CommonDataKinds.Phone.CONTENT_URI, proj, sel, selArgs, null
4046
) ?: return@withContext mutableListOf()
4147
//Maps raw contact ids to contact ids
4248
val contactMap = mutableMapOf<Long, MutableSet<Long>>()

0 commit comments

Comments
 (0)