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 5d6d2815..e0654fde 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 @@ -18,9 +18,12 @@ */ package com.moez.QKSMS.feature.backup +import android.Manifest +import android.app.Activity import android.graphics.Typeface import android.view.View import androidx.appcompat.app.AlertDialog +import androidx.core.app.ActivityCompat import androidx.core.view.children import androidx.core.view.isVisible import com.jakewharton.rxbinding2.view.clicks @@ -49,6 +52,7 @@ class BackupController : QkController( @Inject lateinit var dateFormatter: DateFormatter @Inject override lateinit var presenter: BackupPresenter + private val activityVisibleSubject: Subject = PublishSubject.create() private val confirmRestoreSubject: Subject = PublishSubject.create() private val stopRestoreSubject: Subject = PublishSubject.create() @@ -108,6 +112,11 @@ class BackupController : QkController( .forEach { it.setTypeface(it.typeface, Typeface.BOLD) } } + override fun onActivityResumed(activity: Activity) { + super.onActivityResumed(activity) + activityVisibleSubject.onNext(Unit) + } + override fun render(state: BackupState) { when { state.backupProgress.running -> { @@ -161,6 +170,8 @@ class BackupController : QkController( }) } + override fun activityVisible(): Observable<*> = activityVisibleSubject + override fun restoreClicks(): Observable<*> = restore.clicks() override fun restoreFileSelected(): Observable = adapter.backupSelected @@ -174,6 +185,10 @@ class BackupController : QkController( override fun fabClicks(): Observable<*> = fab.clicks() + override fun requestStoragePermission() { + ActivityCompat.requestPermissions(activity!!, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0) + } + override fun selectFile() = backupFilesDialog.show() override fun confirmRestore() = confirmRestoreDialog.show() 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 fd8a5bab..d8faab78 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 @@ -26,10 +26,13 @@ import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.common.util.BillingManager import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.interactor.PerformBackup +import com.moez.QKSMS.manager.PermissionManager import com.moez.QKSMS.repository.BackupRepository import com.uber.autodispose.kotlin.autoDisposable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom +import io.reactivex.subjects.BehaviorSubject +import io.reactivex.subjects.Subject import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -39,9 +42,12 @@ class BackupPresenter @Inject constructor( private val context: Context, private val dateFormatter: DateFormatter, private val navigator: Navigator, - private val performBackup: PerformBackup + private val performBackup: PerformBackup, + private val permissionManager: PermissionManager ) : QkPresenter(BackupState()) { + private val storagePermissionSubject: Subject = BehaviorSubject.createDefault(permissionManager.hasStorage()) + init { disposables += backupRepo.getBackupProgress() .sample(16, TimeUnit.MILLISECONDS) @@ -53,7 +59,9 @@ class BackupPresenter @Inject constructor( .distinctUntilChanged() .subscribe { progress -> newState { copy(restoreProgress = progress) } } - disposables += backupRepo.getBackups() + disposables += storagePermissionSubject + .distinctUntilChanged() + .switchMap { backupRepo.getBackups() } .doOnNext { backups -> newState { copy(backups = backups) } } .map { backups -> backups.map { it.date }.max() ?: 0L } .map { lastBackup -> @@ -72,6 +80,11 @@ class BackupPresenter @Inject constructor( override fun bindIntents(view: BackupView) { super.bindIntents(view) + view.activityVisible() + .map { permissionManager.hasStorage() } + .autoDisposable(view.scope()) + .subscribe(storagePermissionSubject) + view.restoreClicks() .withLatestFrom( backupRepo.getBackupProgress(), @@ -82,6 +95,7 @@ class BackupPresenter @Inject constructor( !upgraded -> context.toast(R.string.backup_restore_error_plus) backupProgress.running -> context.toast(R.string.backup_restore_error_backup) restoreProgress.running -> context.toast(R.string.backup_restore_error_restore) + !permissionManager.hasStorage() -> view.requestStoragePermission() else -> view.selectFile() } } @@ -109,9 +123,10 @@ class BackupPresenter @Inject constructor( .withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded } .autoDisposable(view.scope()) .subscribe { upgraded -> - when (upgraded) { - true -> performBackup.execute(Unit) - false -> navigator.showQksmsPlusActivity("backup_fab") + when { + !upgraded -> navigator.showQksmsPlusActivity("backup_fab") + !permissionManager.hasStorage() -> view.requestStoragePermission() + upgraded -> performBackup.execute(Unit) } } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt index 70cceeda..abef9b0e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt @@ -24,6 +24,7 @@ import io.reactivex.Observable interface BackupView : QkViewContract { + fun activityVisible(): Observable<*> fun restoreClicks(): Observable<*> fun restoreFileSelected(): Observable fun restoreConfirmed(): Observable<*> @@ -31,6 +32,7 @@ interface BackupView : QkViewContract { fun stopRestoreConfirmed(): Observable<*> fun fabClicks(): Observable<*> + fun requestStoragePermission() fun selectFile() fun confirmRestore() fun stopRestore()