From d32a0d6b7f2766c336fd18f220c85028de2b2dc0 Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 3 Jul 2023 18:32:20 +0800 Subject: [PATCH] Cleanup DownloadManager --- .../ehviewer/download/DownloadManager.kt | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) 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 3cd39d429..74ec99d9f 100644 --- a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt +++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt @@ -41,7 +41,6 @@ import kotlinx.coroutines.launch import splitties.init.appCtx import splitties.preferences.edit import java.util.LinkedList -import kotlin.contracts.contract object DownloadManager : OnSpiderListener { // All download info list @@ -84,15 +83,10 @@ object DownloadManager : OnSpiderListener { } } - private fun getInfoListForLabel(label: String?): LinkedList? { - contract { - returns(null) implies (label != null) - } - return if (label == null) { - defaultInfoList - } else { - map[label] - } + private fun getInfoListForLabel(label: String?) = if (label == null) { + defaultInfoList + } else { + map[label] } fun containLabel(label: String?): Boolean { @@ -107,17 +101,11 @@ object DownloadManager : OnSpiderListener { return false } - fun containDownloadInfo(gid: Long): Boolean { - return mAllInfoMap.containsKey(gid) - } + fun containDownloadInfo(gid: Long) = mAllInfoMap.containsKey(gid) - fun getLabelDownloadInfoList(label: String?): List? { - return map[label] - } + fun getLabelDownloadInfoList(label: String?) = map[label] - fun getDownloadInfo(gid: Long): DownloadInfo? { - return mAllInfoMap[gid] - } + fun getDownloadInfo(gid: Long) = mAllInfoMap[gid] fun getDownloadState(gid: Long): Int { val info = mAllInfoMap[gid]