From 89a108574a6ddf13c1b90dabc1525aae8ca03a1f Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 12 Jul 2023 10:05:24 +0800 Subject: [PATCH] Suspend DownloadLabelDao delete --- app/src/main/java/com/hippo/ehviewer/EhDB.kt | 5 ++--- app/src/main/java/com/hippo/ehviewer/dao/DownloadLabelDao.kt | 2 +- .../main/java/com/hippo/ehviewer/download/DownloadManager.kt | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.kt b/app/src/main/java/com/hippo/ehviewer/EhDB.kt index d54542e34..8f592db85 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhDB.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhDB.kt @@ -141,10 +141,9 @@ object EhDB { dao.update(list) } - @Synchronized - fun removeDownloadLabel(raw: DownloadLabel?) { + suspend fun removeDownloadLabel(raw: DownloadLabel) { val dao = db.downloadLabelDao() - dao.delete(raw!!) + dao.delete(raw) } suspend fun removeLocalFavorites(gid: Long) { diff --git a/app/src/main/java/com/hippo/ehviewer/dao/DownloadLabelDao.kt b/app/src/main/java/com/hippo/ehviewer/dao/DownloadLabelDao.kt index 41f39e6b8..cc280168b 100644 --- a/app/src/main/java/com/hippo/ehviewer/dao/DownloadLabelDao.kt +++ b/app/src/main/java/com/hippo/ehviewer/dao/DownloadLabelDao.kt @@ -24,5 +24,5 @@ interface DownloadLabelDao { fun insert(t: DownloadLabel): Long @Delete - fun delete(downloadLabel: DownloadLabel) + suspend fun delete(downloadLabel: DownloadLabel) } diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt index 47f201489..cb2f821b5 100644 --- a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt +++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt @@ -769,7 +769,7 @@ object DownloadManager : OnSpiderListener { } } - fun deleteLabel(label: String) { + suspend fun deleteLabel(label: String) { // Find in label list and remove var found = false val iterator = labelList.iterator()