From 374d8bfe3048b555d62f15035a7aae12765e9f83 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 5 Jan 2018 01:13:54 -0500 Subject: [PATCH] Use latest message for lastSync timestamp --- qksms/src/main/java/common/util/SyncManager.kt | 6 +++--- qksms/src/main/java/interactor/PartialSync.kt | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/qksms/src/main/java/common/util/SyncManager.kt b/qksms/src/main/java/common/util/SyncManager.kt index 43b58a6b..b9230b7d 100644 --- a/qksms/src/main/java/common/util/SyncManager.kt +++ b/qksms/src/main/java/common/util/SyncManager.kt @@ -64,14 +64,14 @@ class SyncManager @Inject constructor( realm.delete(SyncLog::class.java) } - val lastSync = realm.where(SyncLog::class.java)?.max("date")?.toLong() ?: 0 + val lastSync = realm.where(Message::class.java)?.max("date")?.toLong() ?: 0 realm.insert(SyncLog()) // Sync conversations val conversationCursor = contentResolver.query( CursorToConversation.URI, CursorToConversation.PROJECTION, - "date >= ?", arrayOf(lastSync.toString()), + "date > ?", arrayOf(lastSync.toString()), "date desc") val conversations = conversationCursor.map { cursor -> cursorToConversation.map(cursor) } realm.insertOrUpdate(conversations) @@ -83,7 +83,7 @@ class SyncManager @Inject constructor( val messageColumns = CursorToMessage.MessageColumns(messageCursor) val messages = messageCursor.mapWhile( { cursor -> cursorToMessage.map(Pair(cursor, messageColumns)) }, - { message -> message.date >= lastSync }) + { message -> message.date > lastSync }) realm.insertOrUpdate(messages) messageCursor.close() diff --git a/qksms/src/main/java/interactor/PartialSync.kt b/qksms/src/main/java/interactor/PartialSync.kt index 81267901..eaa0b1f6 100644 --- a/qksms/src/main/java/interactor/PartialSync.kt +++ b/qksms/src/main/java/interactor/PartialSync.kt @@ -18,7 +18,6 @@ */ package interactor -import common.util.Keys import common.util.Permissions import common.util.SyncManager import io.reactivex.Flowable @@ -28,8 +27,7 @@ import javax.inject.Inject open class PartialSync @Inject constructor( private val syncManager: SyncManager, - private val permissions: Permissions, - private val keys: Keys + private val permissions: Permissions ) : Interactor() { override fun buildObservable(params: Unit): Flowable {