forked from upstream-mirrors/quik
Parse backup file in restore function
This commit is contained in:
@@ -18,19 +18,18 @@
|
|||||||
*/
|
*/
|
||||||
package com.moez.QKSMS.repository
|
package com.moez.QKSMS.repository
|
||||||
|
|
||||||
import android.animation.ObjectAnimator
|
|
||||||
import android.os.Environment
|
import android.os.Environment
|
||||||
import androidx.core.animation.addListener
|
|
||||||
import com.moez.QKSMS.model.BackupFile
|
import com.moez.QKSMS.model.BackupFile
|
||||||
import com.moez.QKSMS.model.Message
|
import com.moez.QKSMS.model.Message
|
||||||
import com.moez.QKSMS.util.QkFileObserver
|
import com.moez.QKSMS.util.QkFileObserver
|
||||||
import com.squareup.moshi.Moshi
|
import com.squareup.moshi.Moshi
|
||||||
import io.reactivex.Observable
|
import io.reactivex.Observable
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
|
||||||
import io.reactivex.schedulers.Schedulers
|
import io.reactivex.schedulers.Schedulers
|
||||||
import io.reactivex.subjects.BehaviorSubject
|
import io.reactivex.subjects.BehaviorSubject
|
||||||
import io.reactivex.subjects.Subject
|
import io.reactivex.subjects.Subject
|
||||||
import io.realm.Realm
|
import io.realm.Realm
|
||||||
|
import okio.Okio
|
||||||
|
import timber.log.Timber
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.FileOutputStream
|
import java.io.FileOutputStream
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
@@ -38,6 +37,7 @@ import java.util.*
|
|||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
import javax.inject.Singleton
|
import javax.inject.Singleton
|
||||||
|
import kotlin.system.measureTimeMillis
|
||||||
|
|
||||||
|
|
||||||
@Singleton
|
@Singleton
|
||||||
@@ -135,32 +135,28 @@ class BackupRepositoryImpl @Inject constructor(
|
|||||||
.observeOn(Schedulers.computation())
|
.observeOn(Schedulers.computation())
|
||||||
.map { files ->
|
.map { files ->
|
||||||
files.map { file ->
|
files.map { file ->
|
||||||
|
val path = file.path
|
||||||
val date = file.lastModified()
|
val date = file.lastModified()
|
||||||
val messages = 0
|
val messages = 0
|
||||||
val size = file.length()
|
val size = file.length()
|
||||||
BackupFile(date, messages, size)
|
BackupFile(path, date, messages, size)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.map { files -> files.sortedByDescending { file -> file.date } }
|
.map { files -> files.sortedByDescending { file -> file.date } }
|
||||||
|
|
||||||
override fun performRestore() {
|
override fun performRestore(backupFile: BackupFile) {
|
||||||
// If a backup or restore is already running, don't do anything
|
// If a backupFile or restore is already running, don't do anything
|
||||||
if (isBackupOrRestoreRunning()) return
|
if (isBackupOrRestoreRunning()) return
|
||||||
|
|
||||||
restoreProgress.onNext(BackupRepository.Progress.Running(0))
|
restoreProgress.onNext(BackupRepository.Progress.Running(0, "Parsing backup"))
|
||||||
|
|
||||||
Thread.sleep(1000)
|
val file = File(backupFile.path)
|
||||||
|
val source = Okio.buffer(Okio.source(file))
|
||||||
|
|
||||||
val animator = ObjectAnimator.ofInt(0, 100)
|
val parseDuration = measureTimeMillis { moshi.adapter(Backup::class.java).fromJson(source) }
|
||||||
animator.duration = 3000
|
Timber.v("Parsing backup took ${parseDuration}ms")
|
||||||
animator.addUpdateListener {
|
|
||||||
val remaining = TimeUnit.MILLISECONDS.toSeconds(it.duration - it.currentPlayTime) + 1
|
restoreProgress.onNext(BackupRepository.Progress.Idle())
|
||||||
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<BackupRepository.Progress> = restoreProgress
|
override fun getRestoreProgress(): Observable<BackupRepository.Progress> = restoreProgress
|
||||||
|
|||||||
@@ -18,17 +18,18 @@
|
|||||||
*/
|
*/
|
||||||
package com.moez.QKSMS.interactor
|
package com.moez.QKSMS.interactor
|
||||||
|
|
||||||
|
import com.moez.QKSMS.model.BackupFile
|
||||||
import com.moez.QKSMS.repository.BackupRepository
|
import com.moez.QKSMS.repository.BackupRepository
|
||||||
import io.reactivex.Flowable
|
import io.reactivex.Flowable
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class PerformRestore @Inject constructor(
|
class PerformRestore @Inject constructor(
|
||||||
private val backupRepo: BackupRepository
|
private val backupRepo: BackupRepository
|
||||||
) : Interactor<Unit>() {
|
) : Interactor<BackupFile>() {
|
||||||
|
|
||||||
override fun buildObservable(params: Unit): Flowable<*> {
|
override fun buildObservable(params: BackupFile): Flowable<*> {
|
||||||
return Flowable.just(params)
|
return Flowable.just(params)
|
||||||
.doOnNext { backupRepo.performRestore() }
|
.doOnNext(backupRepo::performRestore)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -19,6 +19,7 @@
|
|||||||
package com.moez.QKSMS.model
|
package com.moez.QKSMS.model
|
||||||
|
|
||||||
data class BackupFile(
|
data class BackupFile(
|
||||||
|
val path: String,
|
||||||
val date: Long,
|
val date: Long,
|
||||||
val messages: Int,
|
val messages: Int,
|
||||||
val size: Long
|
val size: Long
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ interface BackupRepository {
|
|||||||
*/
|
*/
|
||||||
fun getBackups(): Observable<List<BackupFile>>
|
fun getBackups(): Observable<List<BackupFile>>
|
||||||
|
|
||||||
fun performRestore()
|
fun performRestore(backupFile: BackupFile)
|
||||||
|
|
||||||
fun getRestoreProgress(): Observable<Progress>
|
fun getRestoreProgress(): Observable<Progress>
|
||||||
|
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ class BackupPresenter @Inject constructor(
|
|||||||
|
|
||||||
view.restoreFileSelected()
|
view.restoreFileSelected()
|
||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe { performRestore.execute(Unit) }
|
.subscribe { backup -> performRestore.execute(backup) }
|
||||||
|
|
||||||
view.fabClicks()
|
view.fabClicks()
|
||||||
.withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded }
|
.withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded }
|
||||||
|
|||||||
Reference in New Issue
Block a user