forked from upstream-mirrors/quik
use Rx to insert conversations and messages into realm asyncronously
This commit is contained in:
+1
-1
@@ -7,7 +7,7 @@ buildscript {
|
|||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
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 "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
classpath "io.realm:realm-gradle-plugin:3.3.1"
|
classpath "io.realm:realm-gradle-plugin:3.3.1"
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package com.moez.QKSMS
|
|||||||
|
|
||||||
import android.Manifest
|
import android.Manifest
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.support.v7.app.AppCompatActivity
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import com.karumi.dexter.Dexter
|
import com.karumi.dexter.Dexter
|
||||||
import com.karumi.dexter.PermissionToken
|
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.PermissionGrantedResponse
|
||||||
import com.karumi.dexter.listener.PermissionRequest
|
import com.karumi.dexter.listener.PermissionRequest
|
||||||
import com.karumi.dexter.listener.single.PermissionListener
|
import com.karumi.dexter.listener.single.PermissionListener
|
||||||
|
import com.moez.QKSMS.ui.base.QkActivity
|
||||||
import com.moez.QKSMS.ui.conversations.ConversationListFragment
|
import com.moez.QKSMS.ui.conversations.ConversationListFragment
|
||||||
|
|
||||||
class MainActivity : AppCompatActivity() {
|
class MainActivity : QkActivity() {
|
||||||
val TAG = "MainActivity"
|
val TAG = "MainActivity"
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
|||||||
@@ -2,51 +2,55 @@ package com.moez.QKSMS.data.sync
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.util.Log
|
|
||||||
import com.moez.QKSMS.model.Conversation
|
import com.moez.QKSMS.model.Conversation
|
||||||
import com.moez.QKSMS.model.Message
|
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
|
import io.realm.Realm
|
||||||
|
|
||||||
internal object SyncManager {
|
internal object SyncManager {
|
||||||
private val TAG = "SyncManager"
|
private val TAG = "SyncManager"
|
||||||
|
|
||||||
fun copyToRealm(context: Context) {
|
fun copyToRealm(context: Context, completionListener: () -> Unit) {
|
||||||
|
|
||||||
val contentResolver = context.contentResolver
|
val contentResolver = context.contentResolver
|
||||||
val conversationsCursor = contentResolver.query(ConversationColumns.URI, ConversationColumns.PROJECTION, null, null, "date desc")
|
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 realm: Realm? = null
|
||||||
var totalMessages = 0
|
|
||||||
var currentMessage = 0
|
|
||||||
conversationsCursor.forEach(false) { totalMessages += it.getInt(ConversationColumns.MESSAGE_COUNT) }
|
|
||||||
|
|
||||||
|
Flowable.just(conversationsCursor)
|
||||||
val realm = Realm.getDefaultInstance()
|
.subscribeOn(Schedulers.io())
|
||||||
realm.executeTransaction {
|
.doOnNext {
|
||||||
it.delete(Conversation::class.java)
|
// We need to setup realm on the io thread, and doOnSubscribe doesn't support setting a custom Scheduler
|
||||||
it.delete(Message::class.java)
|
realm = Realm.getDefaultInstance()
|
||||||
|
realm?.beginTransaction()
|
||||||
conversationsCursor.forEach {
|
realm?.delete(Conversation::class.java)
|
||||||
realm.insertOrUpdate(Conversation(conversationsCursor))
|
realm?.delete(Message::class.java)
|
||||||
|
|
||||||
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))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
.flatMap { cursor -> cursor.asFlowable() }
|
||||||
}
|
.map { cursor -> Conversation(cursor) }
|
||||||
realm.close()
|
.doOnNext { conversation -> realm?.insert(conversation) }
|
||||||
|
.map { conversation -> conversation.id }
|
||||||
Log.i(TAG, "Inserted $currentMessage messages")
|
.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()
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
package com.moez.QKSMS.ui.base
|
||||||
|
|
||||||
|
import android.support.v7.app.AppCompatActivity
|
||||||
|
|
||||||
|
abstract class QkActivity : AppCompatActivity()
|
||||||
@@ -6,4 +6,8 @@ import com.hannesdorfmann.mosby.mvp.MvpView
|
|||||||
|
|
||||||
abstract class QkFragment<V : MvpView, P : MvpPresenter<V>> : MvpFragment<V, P>() {
|
abstract class QkFragment<V : MvpView, P : MvpPresenter<V>> : MvpFragment<V, P>() {
|
||||||
|
|
||||||
|
override fun getContext(): QkActivity {
|
||||||
|
return super.getContext() as QkActivity
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -4,6 +4,7 @@ import android.os.Bundle
|
|||||||
import android.support.v7.widget.LinearLayoutManager
|
import android.support.v7.widget.LinearLayoutManager
|
||||||
import android.support.v7.widget.RecyclerView
|
import android.support.v7.widget.RecyclerView
|
||||||
import android.view.*
|
import android.view.*
|
||||||
|
import android.widget.ProgressBar
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.data.sync.SyncManager
|
import com.moez.QKSMS.data.sync.SyncManager
|
||||||
import com.moez.QKSMS.model.Conversation
|
import com.moez.QKSMS.model.Conversation
|
||||||
@@ -12,6 +13,7 @@ import io.realm.RealmResults
|
|||||||
|
|
||||||
class ConversationListFragment : QkFragment<ConversationListView, ConversationListPresenter>(), ConversationListView {
|
class ConversationListFragment : QkFragment<ConversationListView, ConversationListPresenter>(), ConversationListView {
|
||||||
|
|
||||||
|
var progress: ProgressBar? = null
|
||||||
var conversationList: RecyclerView? = null
|
var conversationList: RecyclerView? = null
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
@@ -22,6 +24,8 @@ class ConversationListFragment : QkFragment<ConversationListView, ConversationLi
|
|||||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||||
val view = inflater.inflate(R.layout.conversation_list_fragment, container, false)
|
val view = inflater.inflate(R.layout.conversation_list_fragment, container, false)
|
||||||
|
|
||||||
|
progress = view.findViewById(R.id.conversation_progress)
|
||||||
|
|
||||||
conversationList = view.findViewById(R.id.conversation_list)
|
conversationList = view.findViewById(R.id.conversation_list)
|
||||||
conversationList?.layoutManager = LinearLayoutManager(context)
|
conversationList?.layoutManager = LinearLayoutManager(context)
|
||||||
|
|
||||||
@@ -42,7 +46,10 @@ class ConversationListFragment : QkFragment<ConversationListView, ConversationLi
|
|||||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
when (item.itemId) {
|
when (item.itemId) {
|
||||||
R.id.load_conversations -> { // TODO: This is for testing, remove this
|
R.id.load_conversations -> { // TODO: This is for testing, remove this
|
||||||
SyncManager.copyToRealm(context)
|
progress?.visibility = View.VISIBLE
|
||||||
|
SyncManager.copyToRealm(context) {
|
||||||
|
progress?.visibility = View.GONE
|
||||||
|
}
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
package com.moez.QKSMS.ui.messages
|
package com.moez.QKSMS.ui.messages
|
||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.support.v7.app.AppCompatActivity
|
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
|
import com.moez.QKSMS.ui.base.QkActivity
|
||||||
|
|
||||||
class MessageListActivity : AppCompatActivity() {
|
class MessageListActivity : QkActivity() {
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.moez.QKSMS.util
|
package com.moez.QKSMS.util
|
||||||
|
|
||||||
import android.database.Cursor
|
import android.database.Cursor
|
||||||
|
import io.reactivex.Flowable
|
||||||
|
|
||||||
fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = {}) {
|
fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = {}) {
|
||||||
moveToPosition(-1)
|
moveToPosition(-1)
|
||||||
@@ -11,4 +12,21 @@ fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = {
|
|||||||
if (closeOnComplete) {
|
if (closeOnComplete) {
|
||||||
close()
|
close()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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<Cursor> {
|
||||||
|
return Flowable.range(0, count)
|
||||||
|
.map {
|
||||||
|
moveToPosition(it)
|
||||||
|
this
|
||||||
|
}
|
||||||
|
.doOnComplete { close() }
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:shape="rectangle">
|
||||||
|
<solid android:color="@android:color/white" />
|
||||||
|
</shape>
|
||||||
@@ -3,12 +3,24 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
android:animateLayoutChanges="true"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
android:id="@+id/conversation_progress"
|
||||||
|
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:progressDrawable="@drawable/progress_drawable"
|
||||||
|
android:indeterminate="true"
|
||||||
|
android:indeterminateTint="@color/colorPrimary"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
<android.support.v7.widget.RecyclerView
|
<android.support.v7.widget.RecyclerView
|
||||||
android:id="@+id/conversation_list"
|
android:id="@+id/conversation_list"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="0dp"
|
||||||
|
android:layout_weight="1"
|
||||||
android:clipChildren="false"
|
android:clipChildren="false"
|
||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:paddingBottom="8dp"
|
android:paddingBottom="8dp"
|
||||||
|
|||||||
Reference in New Issue
Block a user