up

app/src/main/java/io/legado/app/data/AppDatabase.kt

@@ -7,7 +7,10 @@ import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
 import io.legado.app.data.dao.*
 import io.legado.app.data.entities.*
+import io.legado.app.help.storage.Backup
 import io.legado.app.help.storage.Restore
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 
 
 @Database(
@@ -28,7 +31,7 @@ abstract class AppDatabase : RoomDatabase() {
                 .fallbackToDestructiveMigration()
                 .addCallback(object : Callback() {
                     override fun onDestructiveMigration(db: SupportSQLiteDatabase) {
-                        Restore.restore()
+                        GlobalScope.launch { Restore.restore(Backup.defaultPath) }
                     }
                 })
                 .build()

app/src/main/java/io/legado/app/help/storage/Backup.kt

@@ -15,7 +15,7 @@ import java.io.File
 
 object Backup {
 
-    private val backupPath = App.INSTANCE.filesDir.absolutePath + File.separator + "backup"
+    val backupPath = App.INSTANCE.filesDir.absolutePath + File.separator + "backup"
 
     val defaultPath by lazy {
         FileUtils.getSdCardPath() + File.separator + "YueDu"
@@ -29,7 +29,7 @@ object Backup {
         legadoPath + File.separator + "Export"
     }
 
-    private val backupFileNames by lazy {
+    val backupFileNames by lazy {
         arrayOf(
             "bookshelf.json",
             "bookGroup.json",

app/src/main/java/io/legado/app/help/storage/Restore.kt

@@ -3,12 +3,12 @@ package io.legado.app.help.storage
 import android.content.Context
 import android.net.Uri
 import android.util.Log
+import androidx.documentfile.provider.DocumentFile
 import com.jayway.jsonpath.Configuration
 import com.jayway.jsonpath.JsonPath
 import com.jayway.jsonpath.Option
 import com.jayway.jsonpath.ParseContext
 import io.legado.app.App
-import io.legado.app.R
 import io.legado.app.constant.AppConst
 import io.legado.app.data.entities.*
 import io.legado.app.help.FileHelp
@@ -20,9 +20,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.jetbrains.anko.defaultSharedPreferences
-import org.jetbrains.anko.doAsync
 import org.jetbrains.anko.toast
-import org.jetbrains.anko.uiThread
 import java.io.File
 
 object Restore {
@@ -34,12 +32,24 @@ object Restore {
         )
     }
 
-    fun restore(context: Context, uri: Uri) {
+    suspend fun restore(context: Context, uri: Uri) {
-
+        withContext(IO) {
+            DocumentFile.fromTreeUri(context, uri)?.listFiles()?.forEach { doc ->
+                for (fileName in Backup.backupFileNames) {
+                    if (doc.name == fileName) {
+                        DocumentUtils.readText(context, doc.uri)?.let {
+                            FileHelp.getFile(Backup.backupPath + File.separator + fileName)
+                                .writeText(it)
+                        }
+                    }
+                }
+            }
+        }
+        restore(Backup.defaultPath)
     }
 
-    fun restore(path: String = Backup.defaultPath) {
+    suspend fun restore(path: String) {
-        doAsync {
+        withContext(IO) {
             try {
                 val file = FileHelp.getFile(path + File.separator + "bookshelf.json")
                 val json = file.readText()
@@ -109,7 +119,6 @@ object Restore {
                 }
                 edit.commit()
             }
-            uiThread { App.INSTANCE.toast(R.string.restore_success) }
         }
     }
 

app/src/main/java/io/legado/app/help/storage/WebDavHelp.kt

@@ -4,13 +4,13 @@ import android.content.Context
 import io.legado.app.App
 import io.legado.app.help.FileHelp
 import io.legado.app.help.ReadBookConfig
+import io.legado.app.help.coroutine.Coroutine
 import io.legado.app.lib.webdav.WebDav
 import io.legado.app.lib.webdav.http.HttpAuth
 import io.legado.app.utils.ZipUtils
 import io.legado.app.utils.getPrefString
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.withContext
-import org.jetbrains.anko.doAsync
 import org.jetbrains.anko.selector
 import java.io.File
 import java.text.SimpleDateFormat
@@ -70,10 +70,11 @@ object WebDavHelp {
     }
 
     private fun restoreWebDav(name: String) {
-        doAsync {
+        Coroutine.async {
             getWebDavUrl()?.let {
                 val file = WebDav(it + "legado/" + name)
                 file.downloadTo(zipFilePath, true)
+                @Suppress("BlockingMethodInNonBlockingContext")
                 ZipUtils.unzipFile(zipFilePath, unzipFilesPath)
                 Restore.restore(unzipFilesPath)
             }

app/src/main/java/io/legado/app/ui/config/WebDavConfigFragment.kt

@@ -162,6 +162,7 @@ class WebDavConfigFragment : PreferenceFragmentCompat(),
                     val doc = DocumentFile.fromTreeUri(requireContext(), uri)
                     if (doc?.canWrite() == true) {
                         Restore.restore(requireContext(), uri)
+                        toast(R.string.restore_success)
                     } else {
                         selectBackupFolder()
                     }
@@ -179,7 +180,12 @@ class WebDavConfigFragment : PreferenceFragmentCompat(),
             PermissionsCompat.Builder(this)
                 .addPermissions(*Permissions.Group.STORAGE)
                 .rationale(R.string.tip_perm_request_storage)
-                .onGranted { Restore.restore(Backup.legadoPath) }
+                .onGranted {
+                    launch {
+                        Restore.restore(Backup.legadoPath)
+                        toast(R.string.restore_success)
+                    }
+                }
                 .request()
         }
     }
@@ -304,7 +310,10 @@ class WebDavConfigFragment : PreferenceFragmentCompat(),
                         Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
                     )
                     putPrefString(PreferKey.backupPath, uri.toString())
+                    launch {
                         Restore.restore(requireContext(), uri)
+                        toast(R.string.restore_success)
+                    }
                 }
             }
         }

app/src/main/java/io/legado/app/ui/main/MainActivity.kt

@@ -36,6 +36,7 @@ import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.jetbrains.anko.toast
 
 class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
     BottomNavigationView.OnNavigationItemSelectedListener,
@@ -182,6 +183,7 @@ class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
                     val doc = DocumentFile.fromTreeUri(this@MainActivity, uri)
                     if (doc?.canWrite() == true) {
                         Restore.restore(this@MainActivity, uri)
+                        toast(R.string.restore_success)
                     } else {
                         selectBackupFolder()
                     }
@@ -213,7 +215,12 @@ class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
             PermissionsCompat.Builder(this)
                 .addPermissions(*Permissions.Group.STORAGE)
                 .rationale(R.string.tip_perm_request_storage)
-                .onGranted { Restore.restore(Backup.legadoPath) }
+                .onGranted {
+                    launch {
+                        Restore.restore(Backup.legadoPath)
+                        toast(R.string.restore_success)
+                    }
+                }
                 .request()
         }
     }
@@ -238,7 +245,10 @@ class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
                         Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
                     )
                     putPrefString(PreferKey.backupPath, uri.toString())
-                    Restore.restore(this, uri)
+                    launch {
+                        Restore.restore(this@MainActivity, uri)
+                        toast(R.string.restore_success)
+                    }
                 }
             }
         }