diff --git a/app/build.gradle b/app/build.gradle index 82168236..133ebc9e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:09e6c15f70' + implementation 'com.github.SimpleMobileTools:Simple-Commons:332725a9fc' implementation 'org.greenrobot:eventbus:3.2.0' implementation 'com.klinkerapps:android-smsmms:5.2.6' implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61' diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt index 763ddfaf..fa084b44 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt @@ -205,7 +205,7 @@ class MainActivity : SimpleActivity() { } private fun getNewConversations(cachedConversations: ArrayList) { - val privateCursor = getMyContactsCursor(false, true)?.loadInBackground() + val privateCursor = getMyContactsCursor(false, true) ensureBackgroundThread { val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor) val conversations = getConversations(privateContacts = privateContacts) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt index 3adc5672..7e057ce2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt @@ -173,7 +173,7 @@ class NewConversationActivity : SimpleActivity() { } private fun fillSuggestedContacts(callback: () -> Unit) { - val privateCursor = getMyContactsCursor(false, true)?.loadInBackground() + val privateCursor = getMyContactsCursor(false, true) ensureBackgroundThread { privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor) val suggestions = getSuggestedContacts(privateContacts) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index 7cef449b..3e4d13bd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -232,7 +232,7 @@ class ThreadActivity : SimpleActivity() { } private fun setupThread() { - val privateCursor = getMyContactsCursor(false, true)?.loadInBackground() + val privateCursor = getMyContactsCursor(false, true) ensureBackgroundThread { privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor) 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 9c9626a7..3c4f12bd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt @@ -669,7 +669,7 @@ fun Context.getThreadId(addresses: Set): Long { } fun Context.showReceivedMessageNotification(address: String, body: String, threadId: Long, bitmap: Bitmap?) { - val privateCursor = getMyContactsCursor(false, true)?.loadInBackground() + val privateCursor = getMyContactsCursor(false, true) ensureBackgroundThread { val senderName = getNameFromAddress(address, privateCursor) @@ -689,7 +689,7 @@ fun Context.getNameFromAddress(address: String, privateCursor: Cursor?): String } fun Context.getContactFromAddress(address: String, callback: ((contact: SimpleContact?) -> Unit)) { - val privateCursor = getMyContactsCursor(false, true)?.loadInBackground() + val privateCursor = getMyContactsCursor(false, true) SimpleContactsHelper(this).getAvailableContacts(false) { val contact = it.firstOrNull { it.doesHavePhoneNumber(address) } if (contact == null) { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt index f0b4ba98..c4cc4756 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt @@ -47,7 +47,7 @@ class SmsReceiver : BroadcastReceiver() { val bitmap = getPhotoForNotification(address, context) Handler(Looper.getMainLooper()).post { - val privateCursor = context.getMyContactsCursor(false, true)?.loadInBackground() + val privateCursor = context.getMyContactsCursor(false, true) if (!context.isNumberBlocked(address)) { ensureBackgroundThread { val newMessageId = context.insertNewSMS(address, subject, body, date, read, threadId, type, subscriptionId) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt index fca950e0..9949f37f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt @@ -51,7 +51,7 @@ class SmsStatusSentReceiver : SentReceiver() { private fun showSendingFailedNotification(context: Context, messageId: Long) { Handler(Looper.getMainLooper()).post { - val privateCursor = context.getMyContactsCursor(false, true)?.loadInBackground() + val privateCursor = context.getMyContactsCursor(false, true) ensureBackgroundThread { val address = context.getMessageRecipientAddress(messageId) val threadId = context.getThreadId(address)