diff --git a/build.gradle b/build.gradle index 08aa36d6..34f4f799 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ buildscript { ext.androidx_appcompat_version = '1.3.1' ext.androidx_constraintlayout_version = '1.1.3' ext.androidx_core_version = '1.1.0' + ext.androidx_documentfile_version = '1.0.1' ext.androidx_emoji_version = '1.0.0' ext.androidx_exifinterface_version = '1.0.0' ext.androidx_testrunner_version = '1.1.0-alpha3' diff --git a/data/build.gradle b/data/build.gradle index 91081b26..ee9114cd 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -51,6 +51,7 @@ dependencies { implementation "androidx.appcompat:appcompat:$androidx_appcompat_version" implementation "androidx.core:core-ktx:$androidx_core_version" implementation "androidx.exifinterface:exifinterface:$androidx_exifinterface_version" + implementation "androidx.documentfile:documentfile:$androidx_documentfile_version" // glide implementation "com.github.bumptech.glide:glide:$glide_version" 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 9fff3db3..214dd20e 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt @@ -18,26 +18,27 @@ */ package com.moez.QKSMS.repository +import android.annotation.SuppressLint import android.content.Context +import android.content.Intent +import android.net.Uri import android.os.Environment import android.provider.Telephony import androidx.core.content.contentValuesOf +import androidx.core.net.toUri +import androidx.documentfile.provider.DocumentFile +import com.moez.QKSMS.common.util.extensions.now import com.moez.QKSMS.model.BackupFile import com.moez.QKSMS.model.Message import com.moez.QKSMS.util.Preferences -import com.moez.QKSMS.util.QkFileObserver -import com.moez.QKSMS.util.tryOrNull import com.squareup.moshi.Moshi import io.reactivex.Observable -import io.reactivex.schedulers.Schedulers import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import io.realm.Realm import okio.buffer import okio.source import timber.log.Timber -import java.io.File -import java.io.FileOutputStream import java.text.SimpleDateFormat import java.util.* import javax.inject.Inject @@ -52,10 +53,6 @@ class BackupRepositoryImpl @Inject constructor( private val syncRepo: SyncRepository ) : BackupRepository { - companion object { - private val BACKUP_DIRECTORY = Environment.getExternalStorageDirectory().toString() + "/QKSMS/Backups" - } - data class Backup( val messageCount: Int = 0, val messages: List = listOf() @@ -91,11 +88,35 @@ class BackupRepositoryImpl @Inject constructor( @Volatile private var stopFlag: Boolean = false + override fun getDefaultBackupPath(): String { + return "${Environment.getExternalStorageDirectory()}/QKSMS/Backups" + } + + override fun getBackupDocumentTree(): DocumentFile? { + return prefs.backupDirectory.get() + .takeIf { uri -> uri != Uri.EMPTY } + ?.let { uri -> DocumentFile.fromTreeUri(context, uri) } + ?.takeIf { dir -> dir.exists() && dir.canRead() && dir.canWrite() } + } + + override fun getBackupPathUriForPicker(): Uri { + return prefs.backupDirectory.get().takeIf { uri -> uri != Uri.EMPTY } + ?: getDefaultBackupPath().toUri() + } + + override fun persistBackupDirectory(directory: Uri) { + context.contentResolver.takePersistableUriPermission(directory, + Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION) + prefs.backupDirectory.set(directory) + + Timber.v("Updated backup directory: $directory") + } + override fun performBackup() { // If a backup or restore is already running, don't do anything if (isBackupOrRestoreRunning()) return - var messageCount = 0 + var messageCount: Int // Map all the messages into our object we'll use for the Json mapping val backupMessages = Realm.getDefaultInstance().use { realm -> @@ -119,13 +140,15 @@ class BackupRepositoryImpl @Inject constructor( val json = adapter.toJson(Backup(messageCount, backupMessages)).toByteArray() try { - // Create the directory and file - val dir = File(BACKUP_DIRECTORY).apply { mkdirs() } - val timestamp = SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()).format(System.currentTimeMillis()) - val file = File(dir, "backup-$timestamp.json") + val timestamp = SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()).format(now()) + val inputStream = getBackupDocumentTree() + ?.createFile("application/json", "backup-$timestamp.json") + ?.let { file -> context.contentResolver.openOutputStream(file.uri) } + ?: throw Exception("Failed to open output stream") - // Write the log to the file - FileOutputStream(file, true).use { fileOutputStream -> fileOutputStream.write(json) } + inputStream.use { stream -> + stream.write(json) + } } catch (e: Exception) { Timber.w(e) } @@ -151,36 +174,34 @@ class BackupRepositoryImpl @Inject constructor( override fun getBackupProgress(): Observable = backupProgress - override fun getBackups(): Observable> = QkFileObserver(BACKUP_DIRECTORY).observable - .map { File(BACKUP_DIRECTORY).listFiles() ?: arrayOf() } - .subscribeOn(Schedulers.io()) - .observeOn(Schedulers.computation()) - .map { files -> - files.mapNotNull { file -> - val adapter = moshi.adapter(BackupMetadata::class.java) - val backup = tryOrNull(false) { - file.source().buffer().use(adapter::fromJson) - } ?: return@mapNotNull null + @SuppressLint("Recycle") // InputStream is closed by Okio BufferedSource + override fun parseBackup(uri: Uri): BackupFile { + val adapter = moshi.adapter(BackupMetadata::class.java) - val path = file.path - val date = file.lastModified() - val messages = backup.messageCount - val size = file.length() - BackupFile(path, date, messages, size) - } - } - .map { files -> files.sortedByDescending { file -> file.date } } + val file = DocumentFile.fromSingleUri(context, uri) + ?: throw IllegalArgumentException("Couldn't open backup file") - override fun performRestore(filePath: String) { + val metadata = context.contentResolver.openInputStream(file.uri) + ?.source() + ?.buffer() + ?.use(adapter::fromJson) + ?: throw IllegalArgumentException("Couldn't parse backup file") + + return BackupFile(file.lastModified(), metadata.messageCount) + } + + override fun performRestore(uri: Uri) { // If a backupFile or restore is already running, don't do anything if (isBackupOrRestoreRunning()) return restoreProgress.onNext(BackupRepository.Progress.Parsing()) - val file = File(filePath) - val backup = file.source().buffer().use { source -> - moshi.adapter(Backup::class.java).fromJson(source) - } + val adapter = moshi.adapter(Backup::class.java) + val backup = DocumentFile.fromSingleUri(context, uri) + ?.let { file -> context.contentResolver.openInputStream(file.uri) } + ?.source() + ?.buffer() + ?.use(adapter::fromJson) val messageCount = backup?.messages?.size ?: 0 var errorCount = 0 @@ -234,12 +255,12 @@ class BackupRepositoryImpl @Inject constructor( Timer().schedule(1000) { restoreProgress.onNext(BackupRepository.Progress.Idle()) } } + override fun getRestoreProgress(): Observable = restoreProgress + override fun stopRestore() { stopFlag = true } - override fun getRestoreProgress(): Observable = restoreProgress - private fun isBackupOrRestoreRunning(): Boolean { return backupProgress.blockingFirst().running || restoreProgress.blockingFirst().running } diff --git a/domain/build.gradle b/domain/build.gradle index 102e93e8..90a4cfe5 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -38,6 +38,8 @@ android { } dependencies { + // androidx + implementation "androidx.documentfile:documentfile:$androidx_documentfile_version" // dagger implementation "com.google.dagger:dagger:$dagger_version" diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt b/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt index 03ef3ca1..2dfb6ce4 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt @@ -18,17 +18,18 @@ */ package com.moez.QKSMS.interactor +import android.net.Uri import com.moez.QKSMS.repository.BackupRepository import io.reactivex.Flowable import javax.inject.Inject class PerformRestore @Inject constructor( private val backupRepo: BackupRepository -) : Interactor() { +) : Interactor() { - override fun buildObservable(params: String): Flowable<*> { + override fun buildObservable(params: Uri): Flowable<*> { return Flowable.just(params) .doOnNext(backupRepo::performRestore) } -} \ No newline at end of file +} diff --git a/domain/src/main/java/com/moez/QKSMS/model/BackupFile.kt b/domain/src/main/java/com/moez/QKSMS/model/BackupFile.kt index eca65921..5de80d21 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/BackupFile.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/BackupFile.kt @@ -19,8 +19,6 @@ package com.moez.QKSMS.model data class BackupFile( - val path: String, val date: Long, - val messages: Int, - val size: Long -) \ No newline at end of file + val messages: Int +) 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 7c73a731..57bc7695 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt @@ -18,6 +18,8 @@ */ package com.moez.QKSMS.repository +import android.net.Uri +import androidx.documentfile.provider.DocumentFile import com.moez.QKSMS.model.BackupFile import io.reactivex.Observable @@ -32,19 +34,24 @@ interface BackupRepository { class Finished : Progress(true, false) } + fun getDefaultBackupPath(): String + + fun getBackupDocumentTree(): DocumentFile? + + fun getBackupPathUriForPicker(): Uri + + fun persistBackupDirectory(directory: Uri) + fun performBackup() fun getBackupProgress(): Observable - /** - * Returns a list of all local backups - */ - fun getBackups(): Observable> + fun parseBackup(uri: Uri): BackupFile - fun performRestore(filePath: String) - - fun stopRestore() + fun performRestore(uri: Uri) fun getRestoreProgress(): Observable -} \ No newline at end of file + fun stopRestore() + +} diff --git a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt index aeee576a..26bb39fe 100644 --- a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt +++ b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt @@ -20,6 +20,7 @@ package com.moez.QKSMS.util import android.content.Context import android.content.SharedPreferences +import android.net.Uri import android.os.Build import android.provider.Settings import com.f2prateek.rx.preferences2.Preference @@ -85,6 +86,7 @@ class Preferences @Inject constructor( val version = rxPrefs.getInteger("version", context.versionCode) val changelogVersion = rxPrefs.getInteger("changelogVersion", context.versionCode) val hasAskedForNotificationPermission = rxPrefs.getBoolean("hasAskedForNotificationPermission", false) + val backupDirectory = rxPrefs.getObject("backupDirectory", Uri.EMPTY, UriPreferenceConverter()) @Deprecated("This should only be accessed when migrating to @blockingManager") val sia = rxPrefs.getBoolean("sia", false) diff --git a/domain/src/main/java/com/moez/QKSMS/util/UriPreferenceConverter.kt b/domain/src/main/java/com/moez/QKSMS/util/UriPreferenceConverter.kt new file mode 100644 index 00000000..34142595 --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/util/UriPreferenceConverter.kt @@ -0,0 +1,16 @@ +package com.moez.QKSMS.util + +import android.net.Uri +import com.f2prateek.rx.preferences2.Preference.Converter + +class UriPreferenceConverter : Converter { + + override fun deserialize(serialized: String): Uri { + return Uri.parse(serialized) + } + + override fun serialize(value: Uri): String { + return value.toString() + } + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/QkActivityResultContracts.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/QkActivityResultContracts.kt new file mode 100644 index 00000000..f5018c5f --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/QkActivityResultContracts.kt @@ -0,0 +1,40 @@ +package com.moez.QKSMS.common.util + +import android.app.Activity +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.os.Build +import android.provider.DocumentsContract +import androidx.activity.result.contract.ActivityResultContract + +class QkActivityResultContracts { + + data class OpenDocumentParams( + val mimeTypes: List, + val initialUri: Uri? = null + ) + + class OpenDocument : ActivityResultContract() { + override fun createIntent(context: Context, input: OpenDocumentParams): Intent { + val intent = Intent(Intent.ACTION_OPEN_DOCUMENT) + .putExtra(Intent.EXTRA_MIME_TYPES, input.mimeTypes.toTypedArray()) + .setType("*/*") + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, input.initialUri) + } + + return intent + } + + override fun parseResult(resultCode: Int, intent: Intent?): Uri? { + if (intent == null || resultCode != Activity.RESULT_OK) { + return null + } + + return intent.data + } + } + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt index cf8eff10..78e36667 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt @@ -32,4 +32,12 @@ fun AlertDialog.Builder.setNegativeButton(@StringRes textId: Int, subject: Subje fun AlertDialog.Builder.setNeutralButton(@StringRes textId: Int, subject: Subject): AlertDialog.Builder { return setNeutralButton(textId) { _, _ -> subject.onNext(Unit) } -} \ No newline at end of file +} + +fun AlertDialog.setShowing(show: Boolean) { + if (isShowing && !show) { + dismiss() + } else if (!isShowing && show) { + show() + } +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupAdapter.kt deleted file mode 100644 index 038295dc..00000000 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupAdapter.kt +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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.feature.backup - -import android.content.Context -import android.text.format.Formatter -import android.view.LayoutInflater -import android.view.ViewGroup -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.BackupFile -import io.reactivex.subjects.PublishSubject -import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.backup_list_item.* -import javax.inject.Inject - -class BackupAdapter @Inject constructor( - private val context: Context, - private val dateFormatter: DateFormatter -) : FlowableAdapter() { - - val backupSelected: Subject = PublishSubject.create() - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val layoutInflater = LayoutInflater.from(parent.context) - val view = layoutInflater.inflate(R.layout.backup_list_item, parent, false) - - return QkViewHolder(view).apply { - view.setOnClickListener { backupSelected.onNext(getItem(adapterPosition)) } - } - } - - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { - val backup = getItem(position) - - val count = backup.messages - - holder.title.text = dateFormatter.getDetailedTimestamp(backup.date) - holder.messages.text = context.resources.getQuantityString(R.plurals.backup_message_count, count, count) - holder.size.text = Formatter.formatFileSize(context, backup.size) - } - -} \ 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 1439f5f4..b166b358 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,78 +18,112 @@ */ package com.moez.QKSMS.feature.backup -import android.Manifest -import android.app.Activity +import android.content.Context import android.content.res.ColorStateList import android.graphics.Typeface +import android.net.Uri import android.view.View +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts 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 import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkController import com.moez.QKSMS.common.util.DateFormatter +import com.moez.QKSMS.common.util.QkActivityResultContracts import com.moez.QKSMS.common.util.extensions.getLabel import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setNegativeButton import com.moez.QKSMS.common.util.extensions.setPositiveButton +import com.moez.QKSMS.common.util.extensions.setShowing 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.BackupFile import com.moez.QKSMS.repository.BackupRepository import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.backup_controller.* -import kotlinx.android.synthetic.main.backup_list_dialog.view.* import kotlinx.android.synthetic.main.preference_view.view.* import javax.inject.Inject class BackupController : QkController(), BackupView { - @Inject lateinit var adapter: BackupAdapter - @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() + private val selectFolderCancelSubject: Subject = PublishSubject.create() + private val selectFolderConfirmSubject: Subject = PublishSubject.create() - private val backupFilesDialog by lazy { - val view = View.inflate(activity, R.layout.backup_list_dialog, null) - .apply { files.adapter = adapter.apply { emptyView = empty } } + private val restoreErrorConfirmSubject: Subject = PublishSubject.create() - AlertDialog.Builder(activity!!) - .setView(view) - .setCancelable(true) - .create() - } + private val confirmRestoreCancelSubject: Subject = PublishSubject.create() + private val confirmRestoreConfirmSubject: Subject = PublishSubject.create() - private val confirmRestoreDialog by lazy { - AlertDialog.Builder(activity!!) - .setTitle(R.string.backup_restore_confirm_title) - .setMessage(R.string.backup_restore_confirm_message) - .setPositiveButton(R.string.backup_restore_title, confirmRestoreSubject) - .setNegativeButton(R.string.button_cancel, null) - .create() - } + private val stopRestoreConfirmSubject: Subject = PublishSubject.create() + private val stopRestoreCancelSubject: Subject = PublishSubject.create() + + private val documentTreeSelectedSubject: Subject = PublishSubject.create() + private val documentSelectedSubject: Subject = PublishSubject.create() private val stopRestoreDialog by lazy { AlertDialog.Builder(activity!!) .setTitle(R.string.backup_restore_stop_title) .setMessage(R.string.backup_restore_stop_message) - .setPositiveButton(R.string.button_stop, stopRestoreSubject) - .setNegativeButton(R.string.button_cancel, null) + .setPositiveButton(R.string.button_stop, stopRestoreConfirmSubject) + .setNegativeButton(R.string.button_cancel, stopRestoreCancelSubject) + .setCancelable(false) .create() } + private val selectLocationRationaleDialog by lazy { + AlertDialog.Builder(activity!!) + .setTitle(R.string.backup_select_location_rationale_title) + .setMessage(R.string.backup_select_location_rationale_message) + .setPositiveButton(R.string.button_continue, selectFolderConfirmSubject) + .setNegativeButton(R.string.button_cancel, selectFolderCancelSubject) + .setCancelable(false) + .create() + } + + private val selectedBackupErrorDialog by lazy { + AlertDialog.Builder(activity!!) + .setTitle(R.string.backup_selected_backup_error_title) + .setMessage(R.string.backup_selected_backup_error_message) + .setPositiveButton(R.string.button_continue, restoreErrorConfirmSubject) + .setCancelable(false) + .create() + } + + private val selectedBackupDetailsDialog by lazy { + AlertDialog.Builder(activity!!) + .setTitle(R.string.backup_selected_backup_details_title) + .setPositiveButton(R.string.backup_restore_title, confirmRestoreConfirmSubject) + .setNegativeButton(R.string.button_cancel, confirmRestoreCancelSubject) + .setCancelable(false) + .create() + } + + private lateinit var openDirectory: ActivityResultLauncher + private lateinit var openDocument: ActivityResultLauncher + init { appComponent.inject(this) layoutRes = R.layout.backup_controller } + override fun onContextAvailable(context: Context) { + // Init activity result contracts + openDirectory = themedActivity!!.registerForActivityResult( + ActivityResultContracts.OpenDocumentTree(), + documentTreeSelectedSubject::onNext) + + openDocument = themedActivity!!.registerForActivityResult( + QkActivityResultContracts.OpenDocument(), + documentSelectedSubject::onNext) + } + override fun onAttach(view: View) { super.onAttach(view) presenter.bindIntents(this) @@ -115,11 +149,6 @@ 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 -> { @@ -158,9 +187,14 @@ class BackupController : QkController( } } - backup.summary = state.lastBackup + selectLocationRationaleDialog.setShowing(state.showLocationRationale) - adapter.data = state.backups + selectedBackupErrorDialog.setShowing(state.showSelectedBackupError) + + selectedBackupDetailsDialog.setMessage(state.selectedBackupDetails) + selectedBackupDetailsDialog.setShowing(state.selectedBackupDetails != null) + + stopRestoreDialog.setShowing(state.showStopRestoreDialog) fabIcon.setImageResource(when (state.upgraded) { true -> R.drawable.ic_file_upload_black_24dp @@ -173,29 +207,40 @@ class BackupController : QkController( }) } - override fun activityVisible(): Observable<*> = activityVisibleSubject + override fun setBackupLocationClicks(): Observable<*> = location.clicks() override fun restoreClicks(): Observable<*> = restore.clicks() - override fun restoreFileSelected(): Observable = adapter.backupSelected - .doOnNext { backupFilesDialog.dismiss() } + override fun locationRationaleConfirmClicks(): Observable<*> = selectFolderConfirmSubject - override fun restoreConfirmed(): Observable<*> = confirmRestoreSubject + override fun locationRationaleCancelClicks(): Observable<*> = selectFolderCancelSubject + + override fun selectedBackupErrorClicks(): Observable<*> = restoreErrorConfirmSubject + + override fun confirmRestoreBackupConfirmClicks(): Observable<*> = confirmRestoreConfirmSubject + + override fun confirmRestoreBackupCancelClicks(): Observable<*> = confirmRestoreCancelSubject override fun stopRestoreClicks(): Observable<*> = progressCancel.clicks() - override fun stopRestoreConfirmed(): Observable<*> = stopRestoreSubject + override fun stopRestoreConfirmed(): Observable<*> = stopRestoreConfirmSubject - override fun fabClicks(): Observable<*> = fab.clicks() + override fun stopRestoreCancel(): Observable<*> = stopRestoreCancelSubject - override fun requestStoragePermission() { - ActivityCompat.requestPermissions(activity!!, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0) + override fun backupClicks(): Observable<*> = fab.clicks() + + override fun documentTreeSelected(): Observable = documentTreeSelectedSubject + + override fun documentSelected(): Observable = documentSelectedSubject + + override fun selectFolder(initialUri: Uri) { + openDirectory.launch(initialUri) } - override fun selectFile() = backupFilesDialog.show() + override fun selectFile(initialUri: Uri) { + openDocument.launch(QkActivityResultContracts.OpenDocumentParams( + mimeTypes = listOf("application/json"), + initialUri = initialUri)) + } - override fun confirmRestore() = confirmRestoreDialog.show() - - override fun stopRestore() = stopRestoreDialog.show() - -} \ No newline at end of file +} 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 0a89c038..9f394bdd 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,7 @@ package com.moez.QKSMS.feature.backup import android.content.Context +import androidx.core.net.toUri import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkPresenter @@ -26,14 +27,14 @@ import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.interactor.PerformBackup import com.moez.QKSMS.manager.BillingManager -import com.moez.QKSMS.manager.PermissionManager import com.moez.QKSMS.repository.BackupRepository import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable +import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom -import io.reactivex.subjects.BehaviorSubject -import io.reactivex.subjects.Subject +import io.reactivex.schedulers.Schedulers +import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -43,12 +44,9 @@ class BackupPresenter @Inject constructor( private val context: Context, private val dateFormatter: DateFormatter, private val navigator: Navigator, - private val performBackup: PerformBackup, - private val permissionManager: PermissionManager + private val performBackup: PerformBackup ) : QkPresenter(BackupState()) { - private val storagePermissionSubject: Subject = BehaviorSubject.createDefault(permissionManager.hasStorage()) - init { disposables += backupRepo.getBackupProgress() .sample(16, TimeUnit.MILLISECONDS) @@ -60,20 +58,6 @@ class BackupPresenter @Inject constructor( .distinctUntilChanged() .subscribe { progress -> newState { copy(restoreProgress = progress) } } - disposables += storagePermissionSubject - .distinctUntilChanged() - .switchMap { backupRepo.getBackups() } - .doOnNext { backups -> newState { copy(backups = backups) } } - .map { backups -> backups.maxOfOrNull { it.date } ?: 0L } - .map { lastBackup -> - when (lastBackup) { - 0L -> context.getString(R.string.backup_never) - else -> dateFormatter.getDetailedTimestamp(lastBackup) - } - } - .startWith(context.getString(R.string.backup_loading)) - .subscribe { lastBackup -> newState { copy(lastBackup = lastBackup) } } - disposables += billingManager.upgradeStatus .subscribe { upgraded -> newState { copy(upgraded = upgraded) } } } @@ -81,10 +65,10 @@ class BackupPresenter @Inject constructor( override fun bindIntents(view: BackupView) { super.bindIntents(view) - view.activityVisible() - .map { permissionManager.hasStorage() } + view.setBackupLocationClicks() + .observeOn(AndroidSchedulers.mainThread()) .autoDisposable(view.scope()) - .subscribe(storagePermissionSubject) + .subscribe { view.selectFolder(backupRepo.getBackupPathUriForPicker()) } view.restoreClicks() .withLatestFrom( @@ -96,40 +80,80 @@ class BackupPresenter @Inject constructor( !upgraded -> context.makeToast(R.string.backup_restore_error_plus) backupProgress.running -> context.makeToast(R.string.backup_restore_error_backup) restoreProgress.running -> context.makeToast(R.string.backup_restore_error_restore) - !permissionManager.hasStorage() -> view.requestStoragePermission() - else -> view.selectFile() + else -> view.selectFile(backupRepo.getBackupPathUriForPicker()) } } .autoDisposable(view.scope()) .subscribe() - view.restoreFileSelected() - .autoDisposable(view.scope()) - .subscribe { view.confirmRestore() } - - view.restoreConfirmed() - .withLatestFrom(view.restoreFileSelected()) { _, backup -> backup } - .autoDisposable(view.scope()) - .subscribe { backup -> RestoreBackupService.start(context, backup.path) } - - view.stopRestoreClicks() - .autoDisposable(view.scope()) - .subscribe { view.stopRestore() } - - view.stopRestoreConfirmed() - .autoDisposable(view.scope()) - .subscribe { backupRepo.stopRestore() } - - view.fabClicks() + view.backupClicks() .withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded } .autoDisposable(view.scope()) .subscribe { upgraded -> when { + backupRepo.getBackupDocumentTree() == null -> { + newState { copy(showLocationRationale = true) } + } !upgraded -> navigator.showQksmsPlusActivity("backup_fab") - !permissionManager.hasStorage() -> view.requestStoragePermission() upgraded -> performBackup.execute(Unit) } } + + view.locationRationaleConfirmClicks() + .doOnNext { newState { copy(showLocationRationale = false) } } + .autoDisposable(view.scope()) + .subscribe { view.selectFolder(backupRepo.getBackupPathUriForPicker()) } + + view.locationRationaleCancelClicks() + .doOnNext { newState { copy(showLocationRationale = false) } } + .autoDisposable(view.scope()) + .subscribe() + + view.selectedBackupErrorClicks() + .autoDisposable(view.scope()) + .subscribe { newState { copy(showSelectedBackupError = false) } } + + view.confirmRestoreBackupConfirmClicks() + .doOnNext { newState { copy(selectedBackupDetails = null) } } + .withLatestFrom(view.documentSelected()) { _, backup -> backup } + .autoDisposable(view.scope()) + .subscribe { backup -> RestoreBackupService.start(context, backup) } + + view.confirmRestoreBackupCancelClicks() + .doOnNext { newState { copy(selectedBackupDetails = null) } } + .autoDisposable(view.scope()) + .subscribe() + + view.stopRestoreClicks() + .autoDisposable(view.scope()) + .subscribe { newState { copy(showStopRestoreDialog = true) } } + + view.stopRestoreConfirmed() + .doOnNext { newState { copy(showStopRestoreDialog = false) } } + .autoDisposable(view.scope()) + .subscribe { backupRepo.stopRestore() } + + view.stopRestoreCancel() + .autoDisposable(view.scope()) + .subscribe { newState { copy(showStopRestoreDialog = false) } } + + view.documentTreeSelected() + .autoDisposable(view.scope()) + .subscribe { uri -> backupRepo.persistBackupDirectory(uri) } + + view.documentSelected() + .observeOn(Schedulers.io()) + .autoDisposable(view.scope()) + .subscribe { uri -> + try { + val backupFile = backupRepo.parseBackup(uri) + val date = dateFormatter.getDetailedTimestamp(backupFile.date) + val details = context.getString(R.string.backup_details, date, backupFile.messages) + newState { copy(selectedBackupDetails = details) } + } catch (e: Exception) { + newState { copy(showSelectedBackupError = true) } + } + } } } \ No newline at end of file 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 b6585810..c64a1afd 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 @@ -18,13 +18,16 @@ */ package com.moez.QKSMS.feature.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: String = "", - val backups: List = listOf(), + + val showLocationRationale: Boolean = false, + val showSelectedBackupError: Boolean = false, + val selectedBackupDetails: String? = null, + val showStopRestoreDialog: Boolean = false, + val upgraded: Boolean = false -) \ No newline at end of file +) 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 abef9b0e..b19ddf57 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 @@ -18,23 +18,31 @@ */ package com.moez.QKSMS.feature.backup +import android.net.Uri import com.moez.QKSMS.common.base.QkViewContract -import com.moez.QKSMS.model.BackupFile import io.reactivex.Observable interface BackupView : QkViewContract { - - fun activityVisible(): Observable<*> + fun setBackupLocationClicks(): Observable<*> fun restoreClicks(): Observable<*> - fun restoreFileSelected(): Observable - fun restoreConfirmed(): Observable<*> + + fun backupClicks(): Observable<*> + + fun locationRationaleConfirmClicks(): Observable<*> + fun locationRationaleCancelClicks(): Observable<*> + + fun selectedBackupErrorClicks(): Observable<*> + + fun confirmRestoreBackupConfirmClicks(): Observable<*> + fun confirmRestoreBackupCancelClicks(): Observable<*> + fun stopRestoreClicks(): Observable<*> fun stopRestoreConfirmed(): Observable<*> - fun fabClicks(): Observable<*> + fun stopRestoreCancel(): Observable<*> - fun requestStoragePermission() - fun selectFile() - fun confirmRestore() - fun stopRestore() + fun documentTreeSelected(): Observable + fun documentSelected(): Observable -} \ No newline at end of file + fun selectFolder(initialUri: Uri) + fun selectFile(initialUri: Uri) +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt index 49527ef0..a7d059e5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt @@ -22,6 +22,7 @@ import android.annotation.SuppressLint import android.app.Service import android.content.Context import android.content.Intent +import android.net.Uri import android.os.IBinder import androidx.core.app.NotificationManagerCompat import androidx.core.content.ContextCompat @@ -43,12 +44,12 @@ class RestoreBackupService : Service() { private const val ACTION_START = "com.moez.QKSMS.ACTION_START" private const val ACTION_STOP = "com.moez.QKSMS.ACTION_STOP" - private const val EXTRA_FILE_PATH = "com.moez.QKSMS.EXTRA_FILE_PATH" + private const val EXTRA_FILE_URI = "com.moez.QKSMS.EXTRA_FILE_URI" - fun start(context: Context, filePath: String) { + fun start(context: Context, backupFile: Uri) { val intent = Intent(context, RestoreBackupService::class.java) .setAction(ACTION_START) - .putExtra(EXTRA_FILE_PATH, filePath) + .putExtra(EXTRA_FILE_URI, backupFile.toString()) ContextCompat.startForegroundService(context, intent) } @@ -100,7 +101,7 @@ class RestoreBackupService : Service() { // Start the restore Observable.just(intent) - .map { it.getStringExtra(EXTRA_FILE_PATH) } + .map { Uri.parse(it.getStringExtra(EXTRA_FILE_URI)) } .map(backupRepo::performRestore) .subscribeOn(Schedulers.io()) .subscribe({}, Timber::w) diff --git a/presentation/src/main/res/drawable/ic_baseline_folder_24.xml b/presentation/src/main/res/drawable/ic_baseline_folder_24.xml new file mode 100644 index 00000000..5e930a2f --- /dev/null +++ b/presentation/src/main/res/drawable/ic_baseline_folder_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/presentation/src/main/res/layout/backup_controller.xml b/presentation/src/main/res/layout/backup_controller.xml index 88983dbc..692ec037 100644 --- a/presentation/src/main/res/layout/backup_controller.xml +++ b/presentation/src/main/res/layout/backup_controller.xml @@ -119,12 +119,12 @@ + app:icon="@drawable/ic_baseline_folder_24" + app:title="@string/backup_location_title" + app:summary="@string/backup_location_summary" /> Backup and restore Backing up messages Restoring from backup - Last backup Loading… Never + Backup location + Set folder Restore Select a backup Please unlock QKSMS+ to use backup and restore Backup in progress… Restore in progress… Restore from backup - Are you sure you would like to restore your messages from this backup? Stop restore Messages that have already been restored will remain on your device + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Backups /QKSMS/Backups No backups found - - No messages - %d message - %d messages - Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon! Backup now Parsing backup…