|
@@ -175,9 +175,11 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar
|
|
if (contactCursor.count > 0) {
|
|
if (contactCursor.count > 0) {
|
|
contactCursor.moveToFirst()
|
|
contactCursor.moveToFirst()
|
|
for (i in 0 until contactCursor.count) {
|
|
for (i in 0 until contactCursor.count) {
|
|
- val id = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Contacts._ID))
|
|
|
|
|
|
+ val id = contactCursor.getString(contactCursor.getColumnIndexOrThrow(ContactsContract.Contacts._ID))
|
|
val lookup =
|
|
val lookup =
|
|
- contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY))
|
|
|
|
|
|
+ contactCursor.getString(
|
|
|
|
+ contactCursor.getColumnIndexOrThrow(ContactsContract.Contacts.LOOKUP_KEY)
|
|
|
|
+ )
|
|
deviceContactsWithNumbers[lookup] = getPhoneNumbersFromDeviceContact(id)
|
|
deviceContactsWithNumbers[lookup] = getPhoneNumbersFromDeviceContact(id)
|
|
contactCursor.moveToNext()
|
|
contactCursor.moveToNext()
|
|
}
|
|
}
|
|
@@ -228,13 +230,16 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar
|
|
if (rawContactsCursor.count > 0) {
|
|
if (rawContactsCursor.count > 0) {
|
|
while (rawContactsCursor.moveToNext()) {
|
|
while (rawContactsCursor.moveToNext()) {
|
|
val lookupKey =
|
|
val lookupKey =
|
|
- rawContactsCursor.getString(rawContactsCursor.getColumnIndex(ContactsContract.Data.LOOKUP_KEY))
|
|
|
|
|
|
+ rawContactsCursor.getString(
|
|
|
|
+ rawContactsCursor.getColumnIndexOrThrow(ContactsContract.Data.LOOKUP_KEY)
|
|
|
|
+ )
|
|
val contactId =
|
|
val contactId =
|
|
- rawContactsCursor.getString(rawContactsCursor.getColumnIndex(ContactsContract.Data.CONTACT_ID))
|
|
|
|
-
|
|
|
|
- if (contactsWithAssociatedPhoneNumbers == null || !contactsWithAssociatedPhoneNumbers.containsKey(
|
|
|
|
- lookupKey
|
|
|
|
|
|
+ rawContactsCursor.getString(
|
|
|
|
+ rawContactsCursor.getColumnIndexOrThrow(ContactsContract.Data.CONTACT_ID)
|
|
)
|
|
)
|
|
|
|
+
|
|
|
|
+ if (contactsWithAssociatedPhoneNumbers == null ||
|
|
|
|
+ !contactsWithAssociatedPhoneNumbers.containsKey(lookupKey)
|
|
) {
|
|
) {
|
|
deleteLinkedAccount(contactId)
|
|
deleteLinkedAccount(contactId)
|
|
}
|
|
}
|
|
@@ -302,7 +307,7 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar
|
|
if (contactCursor.count > 0) {
|
|
if (contactCursor.count > 0) {
|
|
contactCursor.moveToFirst()
|
|
contactCursor.moveToFirst()
|
|
|
|
|
|
- val id = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Contacts._ID))
|
|
|
|
|
|
+ val id = contactCursor.getString(contactCursor.getColumnIndexOrThrow(ContactsContract.Contacts._ID))
|
|
if (hasLinkedAccount(id)) {
|
|
if (hasLinkedAccount(id)) {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -416,7 +421,7 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar
|
|
while (phonesNumbersCursor.moveToNext()) {
|
|
while (phonesNumbersCursor.moveToNext()) {
|
|
numbers.add(
|
|
numbers.add(
|
|
phonesNumbersCursor.getString(
|
|
phonesNumbersCursor.getString(
|
|
- phonesNumbersCursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER)
|
|
|
|
|
|
+ phonesNumbersCursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.NUMBER)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
}
|
|
}
|