diff --git a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt index 2609a98c..cf52e8d5 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt @@ -18,20 +18,65 @@ */ package com.moez.QKSMS.repository +import android.animation.ObjectAnimator import android.os.Environment +import androidx.core.animation.addListener import com.moez.QKSMS.model.Backup import com.moez.QKSMS.util.QkFileObserver import io.reactivex.Observable +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.subjects.BehaviorSubject +import io.reactivex.subjects.Subject import java.io.File +import java.util.concurrent.TimeUnit import javax.inject.Inject +import javax.inject.Singleton +@Singleton class BackupRepositoryImpl @Inject constructor() : BackupRepository { companion object { - private val BACKUP_LOCATION = Environment.getExternalStorageDirectory().toString() + "/QKSMS/Backups" + private val BACKUP_DIRECTORY = Environment.getExternalStorageDirectory().toString() + "/QKSMS/Backups" } - override fun getBackups(): Observable> = QkFileObserver(BACKUP_LOCATION) + data class BackupMessage( + val protocol: Int, + val address: String, + val date: Long, + val type: Int, + val body: String, + val service_center: String?, + val read: Boolean, + val status: Int, + val locked: Boolean, + val date_sent: Long) + + private val backupProgress: Subject = BehaviorSubject.createDefault(BackupRepository.Progress.Idle()) + private val restoreProgress: Subject = BehaviorSubject.createDefault(BackupRepository.Progress.Idle()) + + override fun performBackup() { + // If a backup or restore is already running, don't do anything + if (isBackupOrRestoreRunning()) return + + backupProgress.onNext(BackupRepository.Progress.Running(0)) + + Thread.sleep(1000) + + val animator = ObjectAnimator.ofInt(0, 100) + animator.duration = 3000 + animator.addUpdateListener { + val remaining = TimeUnit.MILLISECONDS.toSeconds(it.duration - it.currentPlayTime) + 1 + backupProgress.onNext(BackupRepository.Progress.Running(it.animatedValue as Int, "$remaining seconds remaining")) + } + animator.addListener(onEnd = { + backupProgress.onNext(BackupRepository.Progress.Idle()) + }) + AndroidSchedulers.mainThread().scheduleDirect { animator.start() } + } + + override fun getBackupProgress(): Observable = backupProgress + + override fun getBackups(): Observable> = QkFileObserver(BACKUP_DIRECTORY) .observable .map { path -> File(path).listFiles() } .map { files -> @@ -42,4 +87,31 @@ class BackupRepositoryImpl @Inject constructor() : BackupRepository { } } + override fun performRestore() { + // If a backup or restore is already running, don't do anything + if (isBackupOrRestoreRunning()) return + + restoreProgress.onNext(BackupRepository.Progress.Running(0)) + + Thread.sleep(1000) + + val animator = ObjectAnimator.ofInt(0, 100) + animator.duration = 3000 + animator.addUpdateListener { + val remaining = TimeUnit.MILLISECONDS.toSeconds(it.duration - it.currentPlayTime) + 1 + restoreProgress.onNext(BackupRepository.Progress.Running(it.animatedValue as Int, "$remaining seconds remaining")) + } + animator.addListener(onEnd = { + restoreProgress.onNext(BackupRepository.Progress.Idle()) + }) + AndroidSchedulers.mainThread().scheduleDirect { animator.start() } + } + + override fun getRestoreProgress(): Observable = restoreProgress + + private fun isBackupOrRestoreRunning(): Boolean { + return backupProgress.blockingFirst() is BackupRepository.Progress.Running + || restoreProgress.blockingFirst() is BackupRepository.Progress.Running + } + } \ No newline at end of file diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/PerformBackup.kt b/domain/src/main/java/com/moez/QKSMS/interactor/PerformBackup.kt new file mode 100644 index 00000000..37f2cdd9 --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/interactor/PerformBackup.kt @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * 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 . + */ +package com.moez.QKSMS.interactor + +import com.moez.QKSMS.repository.BackupRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class PerformBackup @Inject constructor( + private val backupRepo: BackupRepository +) : Interactor() { + + override fun buildObservable(params: Unit): Flowable<*> { + return Flowable.just(params) + .doOnNext { backupRepo.performBackup() } + } + +} \ No newline at end of file diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt b/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt new file mode 100644 index 00000000..80f91fe0 --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * 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 . + */ +package com.moez.QKSMS.interactor + +import com.moez.QKSMS.repository.BackupRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class PerformRestore @Inject constructor( + private val backupRepo: BackupRepository +) : Interactor() { + + override fun buildObservable(params: Unit): Flowable<*> { + return Flowable.just(params) + .doOnNext { backupRepo.performRestore() } + } + +} \ No newline at end of file diff --git a/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt index b1d04a04..ab345ca9 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt @@ -23,9 +23,22 @@ import io.reactivex.Observable interface BackupRepository { + sealed class Progress { + class Idle : Progress() + class Running(val progress: Int, val status: String? = null) : Progress() + } + + fun performBackup() + + fun getBackupProgress(): Observable + /** * Returns a list of all local backups */ fun getBackups(): Observable> + fun performRestore() + + fun getRestoreProgress(): Observable + } \ No newline at end of file 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 17feafd4..f0b860c5 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 @@ -22,6 +22,7 @@ import android.app.AlertDialog import android.graphics.Typeface import android.view.View import androidx.core.view.children +import androidx.core.view.isVisible import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkController @@ -31,6 +32,7 @@ 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.repository.BackupRepository import io.reactivex.Observable import kotlinx.android.synthetic.main.backup_controller.* import kotlinx.android.synthetic.main.backup_list_dialog.view.* @@ -82,6 +84,35 @@ class BackupController : QkController( } override fun render(state: BackupState) { + when { + state.backupProgress is BackupRepository.Progress.Running -> { + progressIcon.setImageResource(R.drawable.ic_file_upload_black_24dp) + progressTitle.setText(R.string.backup_backing_up) + progressSummary.text = state.backupProgress.status + progressSummary.isVisible = progressSummary.text.isNotEmpty() + progressBar.isIndeterminate = state.backupProgress.progress == 0 + progressBar.progress = state.backupProgress.progress + progress.isVisible = true + fab.isVisible = false + } + + state.restoreProgress is BackupRepository.Progress.Running -> { + progressIcon.setImageResource(R.drawable.ic_file_download_black_24dp) + progressTitle.setText(R.string.backup_restoring) + progressSummary.text = state.restoreProgress.status + progressSummary.isVisible = progressSummary.text.isNotEmpty() + progressBar.isIndeterminate = state.restoreProgress.progress == 0 + progressBar.progress = state.restoreProgress.progress + progress.isVisible = true + fab.isVisible = false + } + + else -> { + progress.isVisible = false + fab.isVisible = true + } + } + backup.summary = when (state.lastBackup) { null -> activity?.getString(R.string.backup_never) else -> dateFormatter.getDetailedTimestamp(state.lastBackup) @@ -105,6 +136,7 @@ class BackupController : QkController( override fun restoreClicks(): Observable<*> = restore.clicks() override fun restoreFileSelected(): Observable = adapter.backupSelected + .doOnNext { dialog.dismiss() } override fun fabClicks(): Observable<*> = fab.clicks() 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 b32ba1ea..05e7690c 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 @@ -21,6 +21,8 @@ package com.moez.QKSMS.feature.backup import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.common.util.BillingManager +import com.moez.QKSMS.interactor.PerformBackup +import com.moez.QKSMS.interactor.PerformRestore import com.moez.QKSMS.repository.BackupRepository import com.uber.autodispose.kotlin.autoDisposable import io.reactivex.rxkotlin.plusAssign @@ -30,10 +32,18 @@ import javax.inject.Inject class BackupPresenter @Inject constructor( backupRepo: BackupRepository, private val billingManager: BillingManager, - private val navigator: Navigator + private val navigator: Navigator, + private val performBackup: PerformBackup, + private val performRestore: PerformRestore ) : QkPresenter(BackupState()) { init { + disposables += backupRepo.getBackupProgress() + .subscribe { progress -> newState { copy(backupProgress = progress) } } + + disposables += backupRepo.getRestoreProgress() + .subscribe { progress -> newState { copy(restoreProgress = progress) } } + disposables += backupRepo.getBackups() .subscribe { backups -> newState { copy(lastBackup = backups.map { it.date }.max(), backups = backups) } } @@ -50,14 +60,14 @@ class BackupPresenter @Inject constructor( view.restoreFileSelected() .autoDisposable(view.scope()) - .subscribe() + .subscribe { performRestore.execute(Unit) } view.fabClicks() .withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded } .autoDisposable(view.scope()) .subscribe { upgraded -> when (upgraded) { - true -> navigator.showQksmsPlusActivity("backup_fab") + true -> performBackup.execute(Unit) false -> navigator.showQksmsPlusActivity("backup_fab") } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt index 2db0b2df..461feeaa 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt @@ -19,9 +19,12 @@ package com.moez.QKSMS.feature.backup import com.moez.QKSMS.model.Backup +import com.moez.QKSMS.repository.BackupRepository data class BackupState( - val upgraded: Boolean = false, + val backupProgress: BackupRepository.Progress = BackupRepository.Progress.Idle(), + val restoreProgress: BackupRepository.Progress = BackupRepository.Progress.Idle(), val lastBackup: Long? = null, - val backups: List = listOf() + val backups: List = listOf(), + val upgraded: Boolean = false ) \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_close_black_24dp.xml b/presentation/src/main/res/drawable/ic_close_black_24dp.xml new file mode 100644 index 00000000..68809bc2 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_close_black_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/presentation/src/main/res/layout/backup_controller.xml b/presentation/src/main/res/layout/backup_controller.xml index 4e7365b3..944edb1a 100644 --- a/presentation/src/main/res/layout/backup_controller.xml +++ b/presentation/src/main/res/layout/backup_controller.xml @@ -33,8 +33,90 @@ android:id="@+id/linearLayout" android:layout_width="match_parent" android:layout_height="wrap_content" + android:animateLayoutChanges="true" android:orientation="vertical"> + + + + + + + + + + + + + + + + Saved to gallery Backup and restore + Backing up messages + Restoring from backup Last backup Never Restore