Load parts during message sync

This commit is contained in:
Moez Bhatti
2018-01-14 20:03:39 -05:00
parent 4cc98e1cc1
commit 3ca5bfe6d7
6 changed files with 15 additions and 68 deletions
@@ -1,32 +0,0 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* This file is part of QKSMS.
*
* QKSMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* QKSMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
package interactor
import data.repository.MessageRepository
import io.reactivex.Flowable
import javax.inject.Inject
class LoadMmsParts @Inject constructor(private val messageRepo: MessageRepository): Interactor<Long, Long>() {
override fun buildObservable(params: Long): Flowable<Long> {
return Flowable.just(params)
.doOnNext { messageId -> messageRepo.loadParts(messageId) }
}
}
@@ -36,7 +36,6 @@ class ReceiveMms @Inject constructor(
override fun buildObservable(params: Uri): Flowable<Conversation> {
return Flowable.just(params)
.flatMap { uri -> syncManager.syncMessage(uri) } // Sync the message
.doOnNext { message -> messageRepo.loadParts(message.id) } // Sync the message parts
.mapNotNull { message -> messageRepo.getOrCreateConversation(message.threadId) } // Map message to conversation
.doOnNext { conversation -> if (conversation.archived) messageRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary
.doOnNext { conversation -> notificationManager.update(conversation.id) } // Update the notification
@@ -33,11 +33,6 @@ class SyncMessage @Inject constructor(
override fun buildObservable(params: Uri): Flowable<Message> {
return Flowable.just(params)
.flatMap { uri -> syncManager.syncMessage(uri) }
.doOnNext { message ->
if (message.isMms()) {
messageRepo.loadParts(message.id)
}
}
}
}