From 2d9ffadcbaab21c0b1a2a5a880b2c0224ac4e71d Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 1 May 2022 10:16:27 +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 --- app/src/main/java/io/legado/app/constant/PreferKey.kt | 1 - app/src/main/java/io/legado/app/help/config/LocalConfig.kt | 7 +++++++ app/src/main/java/io/legado/app/help/storage/Backup.kt | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt index 98b0bc7d6..bf53e23a8 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -61,7 +61,6 @@ object PreferKey { const val chineseConverterType = "chineseConverterType" const val launcherIcon = "launcherIcon" const val textSelectAble = "selectText" - const val lastBackup = "lastBackup" const val shareLayout = "shareLayout" const val readStyleSelect = "readStyleSelect" const val systemTypefaces = "system_typefaces" diff --git a/app/src/main/java/io/legado/app/help/config/LocalConfig.kt b/app/src/main/java/io/legado/app/help/config/LocalConfig.kt index c52e55df6..729fff6c1 100644 --- a/app/src/main/java/io/legado/app/help/config/LocalConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/LocalConfig.kt @@ -3,12 +3,19 @@ package io.legado.app.help.config import android.content.Context import android.content.SharedPreferences import androidx.core.content.edit +import io.legado.app.utils.putLong import splitties.init.appCtx object LocalConfig : SharedPreferences by appCtx.getSharedPreferences("local", Context.MODE_PRIVATE) { private const val versionCodeKey = "appVersionCode" + var lastBackup: Long + get() = getLong("lastBackup", 0) + set(value) { + putLong("lastBackup", value) + } + val readHelpVersionIsLast: Boolean get() = isLastVersion(1, "readHelpVersion", "firstRead") diff --git a/app/src/main/java/io/legado/app/help/storage/Backup.kt b/app/src/main/java/io/legado/app/help/storage/Backup.kt index 4dd40c4f2..6cfe2a562 100644 --- a/app/src/main/java/io/legado/app/help/storage/Backup.kt +++ b/app/src/main/java/io/legado/app/help/storage/Backup.kt @@ -48,13 +48,13 @@ object Backup { } fun autoBack(context: Context) { - val lastBackup = LocalConfig.getLong(PreferKey.lastBackup, 0) + val lastBackup = LocalConfig.lastBackup if (lastBackup + TimeUnit.DAYS.toMillis(1) < System.currentTimeMillis()) { Coroutine.async { if (!AppWebDav.hasBackUp()) { backup(context, context.getPrefString(PreferKey.backupPath), true) } else { - LocalConfig.putLong(PreferKey.lastBackup, System.currentTimeMillis()) + LocalConfig.lastBackup = System.currentTimeMillis() } }.onError { AppLog.put("自动备份失败\n${it.localizedMessage}") @@ -63,7 +63,6 @@ object Backup { } suspend fun backup(context: Context, path: String?, isAuto: Boolean = false) { - context.putPrefLong(PreferKey.lastBackup, System.currentTimeMillis()) withContext(IO) { FileUtils.delete(backupPath) writeListToJson(appDb.bookDao.all, "bookshelf.json", backupPath) @@ -119,6 +118,7 @@ object Backup { } AppWebDav.backUpWebDav(backupPath) } + LocalConfig.lastBackup = System.currentTimeMillis() } private fun writeListToJson(list: List, fileName: String, path: String) {