pull/293/head
gedoor 5 years ago
parent 5848181f6f
commit 9c0f2ecd0b
  1. 6
      app/src/main/java/io/legado/app/help/storage/Restore.kt
  2. 5
      app/src/main/java/io/legado/app/ui/config/BackupRestoreUi.kt

@ -22,6 +22,7 @@ import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import org.jetbrains.anko.defaultSharedPreferences import org.jetbrains.anko.defaultSharedPreferences
import org.jetbrains.anko.toast
import java.io.File import java.io.File
object Restore { object Restore {
@ -173,11 +174,12 @@ object Restore {
ReadBook.loadContent(resetPageOffset = false) ReadBook.loadContent(resetPageOffset = false)
} }
withContext(Main) { withContext(Main) {
App.INSTANCE.applyDayNight() App.INSTANCE.toast(R.string.restore_success)
postEvent(EventBus.RECREATE, "true")
if (!BuildConfig.DEBUG) { if (!BuildConfig.DEBUG) {
LauncherIconHelp.changeIcon(App.INSTANCE.getPrefString(PreferKey.launcherIcon)) LauncherIconHelp.changeIcon(App.INSTANCE.getPrefString(PreferKey.launcherIcon))
} }
App.INSTANCE.applyDayNight()
postEvent(EventBus.RECREATE, "true")
} }
} }

@ -87,7 +87,6 @@ object BackupRestoreUi {
val doc = DocumentFile.fromTreeUri(fragment.requireContext(), uri) val doc = DocumentFile.fromTreeUri(fragment.requireContext(), uri)
if (doc?.canWrite() == true) { if (doc?.canWrite() == true) {
Restore.restore(fragment.requireContext(), backupPath) Restore.restore(fragment.requireContext(), backupPath)
fragment.toast(R.string.restore_success)
} else { } else {
selectBackupFolder(fragment, restoreSelectRequestCode) selectBackupFolder(fragment, restoreSelectRequestCode)
} }
@ -135,8 +134,6 @@ object BackupRestoreUi {
AppConfig.backupPath = currentPath AppConfig.backupPath = currentPath
Coroutine.async { Coroutine.async {
Restore.restore(App.INSTANCE, currentPath) Restore.restore(App.INSTANCE, currentPath)
}.onSuccess {
App.INSTANCE.toast(R.string.restore_success)
} }
} }
selectFolderRequestCode -> { selectFolderRequestCode -> {
@ -175,8 +172,6 @@ object BackupRestoreUi {
AppConfig.backupPath = uri.toString() AppConfig.backupPath = uri.toString()
Coroutine.async { Coroutine.async {
Restore.restore(App.INSTANCE, uri.toString()) Restore.restore(App.INSTANCE, uri.toString())
}.onSuccess {
App.INSTANCE.toast(R.string.restore_success)
} }
} }
} }

Loading…
Cancel
Save