From 3d352967c2431f268ad5e47e7367eeaf82183c48 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 29 Aug 2018 21:23:08 -0400 Subject: [PATCH] Error handling for clicking restore --- .../QKSMS/feature/backup/BackupController.kt | 2 -- .../QKSMS/feature/backup/BackupPresenter.kt | 18 ++++++++++++++++-- presentation/src/main/res/values/strings.xml | 3 +++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt index c850433f..e8fa6138 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt @@ -118,8 +118,6 @@ class BackupController : QkController( else -> dateFormatter.getDetailedTimestamp(state.lastBackup) } - restore.isEnabled = state.upgraded - adapter.data = state.backups fabIcon.setImageResource(when (state.upgraded) { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt index ae2e5f1c..836c71d4 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt @@ -19,6 +19,8 @@ package com.moez.QKSMS.feature.backup import android.content.Context +import androidx.core.widget.toast +import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.common.util.BillingManager @@ -32,7 +34,7 @@ import java.util.concurrent.TimeUnit import javax.inject.Inject class BackupPresenter @Inject constructor( - backupRepo: BackupRepository, + private val backupRepo: BackupRepository, private val billingManager: BillingManager, private val context: Context, private val navigator: Navigator, @@ -61,8 +63,20 @@ class BackupPresenter @Inject constructor( super.bindIntents(view) view.restoreClicks() + .withLatestFrom( + backupRepo.getBackupProgress(), + backupRepo.getRestoreProgress(), + billingManager.upgradeStatus) + { _, backupProgress, restoreProgress, upgraded -> + when { + !upgraded -> context.toast(R.string.backup_restore_error_plus) + backupProgress is BackupRepository.Progress.Running -> context.toast(R.string.backup_restore_error_backup) + restoreProgress is BackupRepository.Progress.Running -> context.toast(R.string.backup_restore_error_restore) + else -> view.selectFile() + } + } .autoDisposable(view.scope()) - .subscribe { view.selectFile() } + .subscribe() view.restoreFileSelected() .autoDisposable(view.scope()) diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index b43446dc..d5bd2fa8 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -152,6 +152,9 @@ Never Restore Select a backup + Please unlock QKSMS+ to use backup and restore + Backup in progress… + Restore in progress… Backups /QKSMS/Backups No backups found