diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt index 05e10849..6e59f540 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt @@ -5,6 +5,7 @@ import android.net.Uri import android.util.Log import com.moez.QKSMS.model.Conversation import com.moez.QKSMS.model.Message +import com.moez.QKSMS.util.forEach import io.realm.Realm internal object SyncManager { @@ -12,37 +13,40 @@ internal object SyncManager { fun copyToRealm(context: Context) { - val realm = Realm.getDefaultInstance() val contentResolver = context.contentResolver val conversationsCursor = contentResolver.query(ConversationColumns.URI, ConversationColumns.PROJECTION, null, null, "date desc") + // Get the total number of messages so that we can calculate progress + var totalMessages = 0 + var currentMessage = 0 + conversationsCursor.forEach(false) { totalMessages += it.getInt(ConversationColumns.MESSAGE_COUNT) } + + + val realm = Realm.getDefaultInstance() realm.executeTransaction { it.delete(Conversation::class.java) it.delete(Message::class.java) - while (conversationsCursor.moveToNext()) { - it.insertOrUpdate(Conversation(conversationsCursor)) + conversationsCursor.forEach { + realm.insertOrUpdate(Conversation(conversationsCursor)) val threadId = conversationsCursor.getLong(ConversationColumns.ID) val messagesUri = Uri.withAppendedPath(MessageColumns.URI, threadId.toString()) val messagesCursor = contentResolver.query(messagesUri, MessageColumns.PROJECTION, null, null, "date desc") val columnsMap = MessageColumns(messagesCursor) - Log.i(TAG, "Inserting conversation with ${messagesCursor.count} messages") - while (messagesCursor.moveToNext()) { + messagesCursor.forEach { + currentMessage++ val type = messagesCursor.getString(columnsMap.msgType) if (type == "sms" || type == "mms") { // If we can't read the type, don't use this message - it.insertOrUpdate(Message(threadId, messagesCursor, columnsMap)) + realm.insertOrUpdate(Message(threadId, messagesCursor, columnsMap)) } } - - messagesCursor.close() } } - - Log.i(TAG, "Inserted ${conversationsCursor.count} conversations") - conversationsCursor.close() realm.close() + + Log.i(TAG, "Inserted $currentMessage messages") } } diff --git a/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt b/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt new file mode 100644 index 00000000..d28abd04 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt @@ -0,0 +1,14 @@ +package com.moez.QKSMS.util + +import android.database.Cursor + +fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = {}) { + moveToPosition(-1) + while (moveToNext()) { + method.invoke(this) + } + + if (closeOnComplete) { + close() + } +} \ No newline at end of file