diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/DBHelper.kt index 897311dc..a13b7aeb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/DBHelper.kt @@ -242,6 +242,13 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont val contacts = ArrayList() val projection = arrayOf(COL_ID, COL_PREFIX, COL_FIRST_NAME, COL_MIDDLE_NAME, COL_SURNAME, COL_SUFFIX, COL_PHONE_NUMBERS, COL_EMAILS, COL_EVENTS, COL_STARRED, COL_PHOTO, COL_ADDRESSES, COL_NOTES, COL_GROUPS, COL_COMPANY, COL_JOB_POSITION) + + val phoneNumbersToken = object : TypeToken>() {}.type + val emailsToken = object : TypeToken>() {}.type + val addressesToken = object : TypeToken>() {}.type + val eventsToken = object : TypeToken>() {}.type + val groupIdsToken = object : TypeToken>() {}.type + val cursor = mDb.query(CONTACTS_TABLE_NAME, projection, selection, selectionArgs, null, null, null) cursor.use { while (cursor.moveToNext()) { @@ -253,19 +260,15 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont val suffix = cursor.getStringValue(COL_SUFFIX) val phoneNumbersJson = cursor.getStringValue(COL_PHONE_NUMBERS) - val phoneNumbersToken = object : TypeToken>() {}.type val phoneNumbers = Gson().fromJson>(phoneNumbersJson, phoneNumbersToken) ?: ArrayList(1) val emailsJson = cursor.getStringValue(COL_EMAILS) - val emailsToken = object : TypeToken>() {}.type val emails = Gson().fromJson>(emailsJson, emailsToken) ?: ArrayList(1) val addressesJson = cursor.getStringValue(COL_ADDRESSES) - val addressesToken = object : TypeToken>() {}.type val addresses = Gson().fromJson>(addressesJson, addressesToken) ?: ArrayList(1) val eventsJson = cursor.getStringValue(COL_EVENTS) - val eventsToken = object : TypeToken>() {}.type val events = Gson().fromJson>(eventsJson, eventsToken) ?: ArrayList(1) val photoByteArray = cursor.getBlobValue(COL_PHOTO) ?: null @@ -279,7 +282,6 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont val starred = cursor.getIntValue(COL_STARRED) val groupIdsJson = cursor.getStringValue(COL_GROUPS) - val groupIdsToken = object : TypeToken>() {}.type val groupIds = Gson().fromJson>(groupIdsJson, groupIdsToken) ?: ArrayList(1) val groups = storedGroups.filter { groupIds.contains(it.id) } as ArrayList