diff --git a/qksms/src/main/java/common/util/Keys.kt b/qksms/src/main/java/common/util/Keys.kt index eea2bbd9..bcae98f2 100644 --- a/qksms/src/main/java/common/util/Keys.kt +++ b/qksms/src/main/java/common/util/Keys.kt @@ -32,18 +32,18 @@ class Keys @Inject constructor() { private var maxValue: Long = 0L init { - refresh() - } - - /** - * Should be called upon initialization, and after a sync - */ - fun refresh() { val realm = Realm.getDefaultInstance() maxValue = realm.where(Message::class.java).max("id")?.toLong() ?: 0L realm.close() } + /** + * Should be called when a new sync is being started + */ + fun reset() { + maxValue = 0L + } + /** * Returns a valid ID that can be used to store a new message */ diff --git a/qksms/src/main/java/data/mapper/CursorToMessage.kt b/qksms/src/main/java/data/mapper/CursorToMessage.kt index 8450b366..6642bb8c 100644 --- a/qksms/src/main/java/data/mapper/CursorToMessage.kt +++ b/qksms/src/main/java/data/mapper/CursorToMessage.kt @@ -22,12 +22,16 @@ import android.content.Context import android.database.Cursor import android.net.Uri import android.provider.Telephony.* +import common.util.Keys import data.model.Message import data.model.Message.DeliveryStatus import timber.log.Timber import javax.inject.Inject -class CursorToMessage @Inject constructor(val context: Context) : Mapper, Message> { +class CursorToMessage @Inject constructor( + private val context: Context, + private val keys: Keys +) : Mapper, Message> { override fun map(from: Pair): Message { val cursor = from.first @@ -39,7 +43,8 @@ class CursorToMessage @Inject constructor(val context: Context) : Mapper cursor.getString(columnsMap.msgType) } - id = cursor.getLong(columnsMap.msgId) + id = keys.newId() + contentId = cursor.getLong(columnsMap.msgId) when (type) { "sms" -> { diff --git a/qksms/src/main/java/data/model/Message.kt b/qksms/src/main/java/data/model/Message.kt index 052867c7..41f4b193 100644 --- a/qksms/src/main/java/data/model/Message.kt +++ b/qksms/src/main/java/data/model/Message.kt @@ -30,6 +30,12 @@ open class Message : RealmObject() { enum class AttachmentType { TEXT, IMAGE, VIDEO, AUDIO, SLIDESHOW, NOT_LOADED } @PrimaryKey var id: Long = 0 + + // The MMS-SMS content provider returns messages where duplicate ids can exist. This is because + // SMS and MMS are stored in separate tables. We can't use these ids as our realm message id + // since it's our primary key for the single message object, so we'll store the original id in + // case we need to access the original message item in the content provider + var contentId: Long = 0 var threadId: Long = 0 var address: String = "" var boxId: Int = 0 @@ -70,7 +76,7 @@ open class Message : RealmObject() { fun getUri(): Uri { val baseUri = if (isMms()) Mms.CONTENT_URI else Sms.CONTENT_URI - return ContentUris.withAppendedId(baseUri, id) + return ContentUris.withAppendedId(baseUri, contentId) } fun isMms(): Boolean = type == "mms" diff --git a/qksms/src/main/java/interactor/FullSync.kt b/qksms/src/main/java/interactor/FullSync.kt index 2636bf9c..6e4b23ab 100644 --- a/qksms/src/main/java/interactor/FullSync.kt +++ b/qksms/src/main/java/interactor/FullSync.kt @@ -18,16 +18,21 @@ */ package interactor +import common.util.Keys import common.util.SyncManager import io.reactivex.Flowable import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject -class FullSync @Inject constructor(private val syncManager: SyncManager) : Interactor() { +class FullSync @Inject constructor( + private val syncManager: SyncManager, + private val keys: Keys +) : Interactor() { override fun buildObservable(params: Unit): Flowable { return Flowable.just(System.currentTimeMillis()) + .doOnNext { keys.reset() } .doOnNext { syncManager.performSync(true) } .map { startTime -> System.currentTimeMillis() - startTime } .map { elapsed -> TimeUnit.MILLISECONDS.toSeconds(elapsed) } diff --git a/qksms/src/main/java/interactor/PartialSync.kt b/qksms/src/main/java/interactor/PartialSync.kt index e046eafe..81267901 100644 --- a/qksms/src/main/java/interactor/PartialSync.kt +++ b/qksms/src/main/java/interactor/PartialSync.kt @@ -36,7 +36,6 @@ open class PartialSync @Inject constructor( return Flowable.just(System.currentTimeMillis()) .skipWhile { !permissions.hasSmsAndContacts() } .doOnNext { syncManager.performSync() } - .doOnNext { keys.refresh() } .map { startTime -> System.currentTimeMillis() - startTime } .map { elapsed -> TimeUnit.MILLISECONDS.toSeconds(elapsed) } .doOnNext { seconds -> Timber.v("Completed sync in $seconds seconds") }