From 9e3ac206e7ea7cf1b9833cb8a7591bbd28baa5e4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 27 Nov 2017 20:19:57 -0500 Subject: [PATCH] During partial sync, only open conversations more recent than the last sync --- .../java/com/moez/QKSMS/data/mapper/CursorToConversation.kt | 4 +++- .../java/com/moez/QKSMS/domain/interactor/PartialSync.kt | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversation.kt b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversation.kt index 203681ae..47369da9 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversation.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversation.kt @@ -26,10 +26,12 @@ class CursorToConversation @Inject constructor(private val contactsRepo: Contact val URI: Uri = Uri.parse("content://mms-sms/conversations?simple=true") val PROJECTION = arrayOf( Threads._ID, - Threads.RECIPIENT_IDS) + Threads.RECIPIENT_IDS, + Threads.DATE) val ID = 0 val RECIPIENT_IDS = 1 + val DATE = 2 } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt index 4a6413b2..017bfa9a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt @@ -22,14 +22,12 @@ open class PartialSync @Inject constructor( override fun buildObservable(params: Unit): Flowable { val contentResolver = context.contentResolver - val conversationsCursor = contentResolver.query(CursorToConversation.URI, CursorToConversation.PROJECTION, null, null, "date desc") - var realm: Realm? = null var lastSync = 0L var startTime = 0L - return Flowable.just(conversationsCursor) + return Flowable.just(params) .doOnNext { startTime = System.currentTimeMillis() @@ -42,6 +40,7 @@ open class PartialSync @Inject constructor( // Add a log entry for this sync realm?.insert(SyncLog()) } + .map { contentResolver.query(CursorToConversation.URI, CursorToConversation.PROJECTION, "date >= ?", arrayOf(lastSync.toString()), "date desc") } .flatMap { cursor -> cursor.asFlowable().map { cursorToConversation.map(it) } } .distinct { conversation -> conversation.id } .doOnNext { conversation -> realm?.insertOrUpdate(conversation) }