Implement logic to export messages to json

This commit is contained in:
Moez Bhatti
2018-08-23 17:47:17 -04:00
parent adb6d50cad
commit cb3b1e47a1
13 changed files with 106 additions and 36 deletions
@@ -26,7 +26,7 @@ import com.moez.QKSMS.R
import com.moez.QKSMS.common.base.FlowableAdapter
import com.moez.QKSMS.common.base.QkViewHolder
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.model.Backup
import com.moez.QKSMS.model.BackupFile
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.backup_list_item.view.*
@@ -35,9 +35,9 @@ import javax.inject.Inject
class BackupAdapter @Inject constructor(
private val context: Context,
private val dateFormatter: DateFormatter
) : FlowableAdapter<Backup>() {
) : FlowableAdapter<BackupFile>() {
val backupSelected: Subject<Backup> = PublishSubject.create()
val backupSelected: Subject<BackupFile> = PublishSubject.create()
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
val layoutInflater = LayoutInflater.from(parent.context)
@@ -52,7 +52,7 @@ class BackupAdapter @Inject constructor(
val backup = getItem(position)
val view = holder.itemView
val count = backup.messages.size
val count = backup.messages
view.title.text = dateFormatter.getDetailedTimestamp(backup.date)
view.messages.text = context.resources.getQuantityString(R.plurals.backup_message_count, count, count)
@@ -31,7 +31,7 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint
import com.moez.QKSMS.common.util.extensions.setTint
import com.moez.QKSMS.common.widget.PreferenceView
import com.moez.QKSMS.injection.appComponent
import com.moez.QKSMS.model.Backup
import com.moez.QKSMS.model.BackupFile
import com.moez.QKSMS.repository.BackupRepository
import io.reactivex.Observable
import kotlinx.android.synthetic.main.backup_controller.*
@@ -135,7 +135,7 @@ class BackupController : QkController<BackupView, BackupState, BackupPresenter>(
override fun restoreClicks(): Observable<*> = restore.clicks()
override fun restoreFileSelected(): Observable<Backup> = adapter.backupSelected
override fun restoreFileSelected(): Observable<BackupFile> = adapter.backupSelected
.doOnNext { dialog.dismiss() }
override fun fabClicks(): Observable<*> = fab.clicks()
@@ -27,6 +27,7 @@ import com.moez.QKSMS.repository.BackupRepository
import com.uber.autodispose.kotlin.autoDisposable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
import java.util.concurrent.TimeUnit
import javax.inject.Inject
class BackupPresenter @Inject constructor(
@@ -39,9 +40,13 @@ class BackupPresenter @Inject constructor(
init {
disposables += backupRepo.getBackupProgress()
.sample(16, TimeUnit.MILLISECONDS)
.distinctUntilChanged()
.subscribe { progress -> newState { copy(backupProgress = progress) } }
disposables += backupRepo.getRestoreProgress()
.sample(16, TimeUnit.MILLISECONDS)
.distinctUntilChanged()
.subscribe { progress -> newState { copy(restoreProgress = progress) } }
disposables += backupRepo.getBackups()
@@ -18,13 +18,13 @@
*/
package com.moez.QKSMS.feature.backup
import com.moez.QKSMS.model.Backup
import com.moez.QKSMS.model.BackupFile
import com.moez.QKSMS.repository.BackupRepository
data class BackupState(
val backupProgress: BackupRepository.Progress = BackupRepository.Progress.Idle(),
val restoreProgress: BackupRepository.Progress = BackupRepository.Progress.Idle(),
val lastBackup: Long? = null,
val backups: List<Backup> = listOf(),
val backups: List<BackupFile> = listOf(),
val upgraded: Boolean = false
)
@@ -19,14 +19,13 @@
package com.moez.QKSMS.feature.backup
import com.moez.QKSMS.common.base.QkViewContract
import com.moez.QKSMS.model.Backup
import com.moez.QKSMS.model.BackupFile
import io.reactivex.Observable
import java.io.File
interface BackupView : QkViewContract<BackupState> {
fun restoreClicks(): Observable<*>
fun restoreFileSelected(): Observable<Backup>
fun restoreFileSelected(): Observable<BackupFile>
fun fabClicks(): Observable<*>
fun selectFile()