diff --git a/build.gradle b/build.gradle index 5b1445ae..393b5132 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-beta1' + classpath 'com.android.tools.build:gradle:3.0.0-beta2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.realm:realm-gradle-plugin:3.3.1" diff --git a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt index a410a188..725a381c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt @@ -2,7 +2,6 @@ package com.moez.QKSMS import android.Manifest import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.util.Log import com.karumi.dexter.Dexter import com.karumi.dexter.PermissionToken @@ -10,9 +9,10 @@ import com.karumi.dexter.listener.PermissionDeniedResponse import com.karumi.dexter.listener.PermissionGrantedResponse import com.karumi.dexter.listener.PermissionRequest import com.karumi.dexter.listener.single.PermissionListener +import com.moez.QKSMS.ui.base.QkActivity import com.moez.QKSMS.ui.conversations.ConversationListFragment -class MainActivity : AppCompatActivity() { +class MainActivity : QkActivity() { val TAG = "MainActivity" override fun onCreate(savedInstanceState: Bundle?) { 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 6e59f540..a90ff924 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 @@ -2,51 +2,55 @@ package com.moez.QKSMS.data.sync import android.content.Context 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 com.moez.QKSMS.util.asFlowable +import io.reactivex.Flowable +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers import io.realm.Realm internal object SyncManager { private val TAG = "SyncManager" - fun copyToRealm(context: Context) { + fun copyToRealm(context: Context, completionListener: () -> Unit) { 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) } + var realm: Realm? = null - - val realm = Realm.getDefaultInstance() - realm.executeTransaction { - it.delete(Conversation::class.java) - it.delete(Message::class.java) - - 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) - - 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 - realm.insertOrUpdate(Message(threadId, messagesCursor, columnsMap)) - } + Flowable.just(conversationsCursor) + .subscribeOn(Schedulers.io()) + .doOnNext { + // We need to setup realm on the io thread, and doOnSubscribe doesn't support setting a custom Scheduler + realm = Realm.getDefaultInstance() + realm?.beginTransaction() + realm?.delete(Conversation::class.java) + realm?.delete(Message::class.java) } - } - } - realm.close() - - Log.i(TAG, "Inserted $currentMessage messages") + .flatMap { cursor -> cursor.asFlowable() } + .map { cursor -> Conversation(cursor) } + .doOnNext { conversation -> realm?.insert(conversation) } + .map { conversation -> conversation.id } + .concatMap { threadId -> + val uri = Uri.withAppendedPath(MessageColumns.URI, threadId.toString()) + val messagesCursor = contentResolver.query(uri, MessageColumns.PROJECTION, null, null, "date desc") + val columnsMap = MessageColumns(messagesCursor) + messagesCursor.asFlowable().map { cursor -> Message(threadId, cursor, columnsMap) } + } + .filter { message -> message.type == "sms" || message.type == "mms" } + .doOnNext { message -> realm?.insert(message) } + .count() + .toFlowable() + .doOnNext { + realm?.commitTransaction() + realm?.close() + } + .observeOn(AndroidSchedulers.mainThread()) + .subscribe({ + completionListener.invoke() + }) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt new file mode 100644 index 00000000..59c79374 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt @@ -0,0 +1,5 @@ +package com.moez.QKSMS.ui.base + +import android.support.v7.app.AppCompatActivity + +abstract class QkActivity : AppCompatActivity() diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt index f3aff041..cf437e3e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt @@ -6,4 +6,8 @@ import com.hannesdorfmann.mosby.mvp.MvpView abstract class QkFragment> : MvpFragment() { + override fun getContext(): QkActivity { + return super.getContext() as QkActivity + } + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt index e4f34223..89a6a491 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt @@ -4,6 +4,7 @@ import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView import android.view.* +import android.widget.ProgressBar import com.moez.QKSMS.R import com.moez.QKSMS.data.sync.SyncManager import com.moez.QKSMS.model.Conversation @@ -12,6 +13,7 @@ import io.realm.RealmResults class ConversationListFragment : QkFragment(), ConversationListView { + var progress: ProgressBar? = null var conversationList: RecyclerView? = null override fun onCreate(savedInstanceState: Bundle?) { @@ -22,6 +24,8 @@ class ConversationListFragment : QkFragment { // TODO: This is for testing, remove this - SyncManager.copyToRealm(context) + progress?.visibility = View.VISIBLE + SyncManager.copyToRealm(context) { + progress?.visibility = View.GONE + } return true } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt index 1ffae5c7..62bde82c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt @@ -1,10 +1,10 @@ package com.moez.QKSMS.ui.messages import android.os.Bundle -import android.support.v7.app.AppCompatActivity import com.moez.QKSMS.R +import com.moez.QKSMS.ui.base.QkActivity -class MessageListActivity : AppCompatActivity() { +class MessageListActivity : QkActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt b/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt index d28abd04..02467509 100644 --- a/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt +++ b/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt @@ -1,6 +1,7 @@ package com.moez.QKSMS.util import android.database.Cursor +import io.reactivex.Flowable fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = {}) { moveToPosition(-1) @@ -11,4 +12,21 @@ fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = { if (closeOnComplete) { close() } -} \ No newline at end of file +} + +/** + * We're using this simple implementation with .range() because of the + * complexities of dealing with Backpressure with a Cursor. We can't simply + * use a loop and call onNext() from a generator because we'll need to close + * the cursor at the end, and if any items are still in the buffer, then + * they will be made invalid + */ +fun Cursor.asFlowable(): Flowable { + return Flowable.range(0, count) + .map { + moveToPosition(it) + this + } + .doOnComplete { close() } +} + diff --git a/qksms/src/main/res/drawable/progress_drawable.xml b/qksms/src/main/res/drawable/progress_drawable.xml new file mode 100644 index 00000000..f1e295c6 --- /dev/null +++ b/qksms/src/main/res/drawable/progress_drawable.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/conversation_list_fragment.xml b/qksms/src/main/res/layout/conversation_list_fragment.xml index e889f4ad..1095da34 100644 --- a/qksms/src/main/res/layout/conversation_list_fragment.xml +++ b/qksms/src/main/res/layout/conversation_list_fragment.xml @@ -3,12 +3,24 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:animateLayoutChanges="true" android:orientation="vertical"> + +