From d445db9f0cf3c1f9c015a597795ec59a089da101 Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 3 Feb 2023 20:37:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/ui/main/MainActivity.kt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt index 09f3d17d0..cdf799461 100644 --- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt @@ -198,6 +198,9 @@ class MainActivity : VMBaseActivity(), } } + /** + * 检测通知权限 + */ private suspend fun checkNotificationPermission() = suspendCoroutine { block -> PermissionsCompat.Builder(this) .addPermissions(Permissions.POST_NOTIFICATIONS) @@ -217,13 +220,10 @@ class MainActivity : VMBaseActivity(), /** * 备份同步 */ - private suspend fun backupSync() = suspendCoroutine { block -> + private fun backupSync() { launch { - val lastBackupFile = withContext(IO) { AppWebDav.lastBackUp().getOrNull() } - if (lastBackupFile == null) { - block.resume(null) - return@launch - } + val lastBackupFile = + withContext(IO) { AppWebDav.lastBackUp().getOrNull() } ?: return@launch if (lastBackupFile.lastModify - LocalConfig.lastBackup > DateUtils.MINUTE_IN_MILLIS) { LocalConfig.lastBackup = lastBackupFile.lastModify alert("恢复", "webDav书源比本地新,是否恢复") { @@ -231,12 +231,7 @@ class MainActivity : VMBaseActivity(), okButton { viewModel.restoreWebDav(lastBackupFile.displayName) } - onDismiss { - block.resume(null) - } } - } else { - block.resume(null) } } }