From 9a36c02202a374e0738aabaa5071a269fa4552d4 Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 22 Nov 2019 19:56:59 +0800 Subject: [PATCH] up --- .../app/ui/config/WebDavConfigFragment.kt | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/config/WebDavConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/WebDavConfigFragment.kt index 104bf4326..0d685c407 100644 --- a/app/src/main/java/io/legado/app/ui/config/WebDavConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/WebDavConfigFragment.kt @@ -7,9 +7,7 @@ import androidx.preference.EditTextPreference import androidx.preference.ListPreference import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import io.legado.app.App import io.legado.app.R -import io.legado.app.help.coroutine.Coroutine import io.legado.app.help.permission.Permissions import io.legado.app.help.permission.PermissionsCompat import io.legado.app.help.storage.Backup @@ -22,8 +20,6 @@ import io.legado.app.lib.theme.ATH import io.legado.app.lib.theme.accentColor import io.legado.app.utils.applyTint import io.legado.app.utils.getPrefString -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext class WebDavConfigFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener { @@ -103,24 +99,20 @@ class WebDavConfigFragment : PreferenceFragmentCompat(), Preference.OnPreference } private fun importOld() { - Coroutine.async { - if (withContext(Dispatchers.IO) { App.db.bookDao().allBookCount == 0 }) { - alert(title = "导入") { - message = "是否导入旧版本数据" - yesButton { - PermissionsCompat.Builder(this@WebDavConfigFragment) - .addPermissions(*Permissions.Group.STORAGE) - .rationale(R.string.tip_perm_request_storage) - .onGranted { - Restore.importYueDuData(requireContext()) - } - .request() + alert(title = "导入") { + message = "是否导入旧版本数据" + yesButton { + PermissionsCompat.Builder(this@WebDavConfigFragment) + .addPermissions(*Permissions.Group.STORAGE) + .rationale(R.string.tip_perm_request_storage) + .onGranted { + Restore.importYueDuData(requireContext()) } - noButton { - } - }.show().applyTint() + .request() } - } + noButton { + } + }.show().applyTint() } } \ No newline at end of file