From 7d1e28203e100c76b0795763e15823383cb4b1b3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 20 May 2020 16:21:57 +0200 Subject: [PATCH] changing the conversation fetcher code style a bit --- .../com/simplemobiletools/smsmessenger/extensions/Context.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt index d7f0ea8c..27c5199b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt @@ -188,6 +188,7 @@ fun Context.getConversations(): ArrayList { val sortOrder = "${Threads.DATE} DESC" val conversations = ArrayList() + val simpleContactHelper = SimpleContactsHelper(this) queryCursor(uri, projection, selection, selectionArgs, sortOrder, true) { cursor -> val id = cursor.getIntValue(Threads._ID) var snippet = cursor.getStringValue(Threads.SNIPPET) ?: "" @@ -200,7 +201,6 @@ fun Context.getConversations(): ArrayList { date /= 1000 } - val read = cursor.getIntValue(Threads.READ) == 1 val rawIds = cursor.getStringValue(Threads.RECIPIENT_IDS) val recipientIds = rawIds.split(" ").filter { it.areDigitsOnly() }.map { it.toInt() }.toMutableList() val phoneNumbers = getThreadPhoneNumbers(recipientIds) @@ -210,8 +210,9 @@ fun Context.getConversations(): ArrayList { val names = getThreadContactNames(phoneNumbers) val title = TextUtils.join(", ", names.toTypedArray()) - val photoUri = if (phoneNumbers.size == 1) SimpleContactsHelper(this).getPhotoUriFromPhoneNumber(phoneNumbers.first()) else "" + val photoUri = if (phoneNumbers.size == 1) simpleContactHelper.getPhotoUriFromPhoneNumber(phoneNumbers.first()) else "" val isGroupConversation = phoneNumbers.size > 1 + val read = cursor.getIntValue(Threads.READ) == 1 val conversation = Conversation(id, snippet, date.toInt(), read, title, photoUri, isGroupConversation, phoneNumbers.first()) conversations.add(conversation)