From 5c6716bd9866f3ec2e4a5f5bc61c9e3d48cfbce0 Mon Sep 17 00:00:00 2001 From: tarsin Date: Tue, 21 Feb 2023 22:48:02 +0800 Subject: [PATCH] Migrate to new downloadManager accessor --- app/src/main/java/com/hippo/ehviewer/EhApplication.kt | 5 +---- app/src/main/java/com/hippo/ehviewer/EhDB.java | 2 +- .../java/com/hippo/ehviewer/download/DownloadService.kt | 3 +-- .../hippo/ehviewer/preference/CleanRedundancyPreference.kt | 2 +- .../hippo/ehviewer/preference/RestoreDownloadPreference.kt | 2 +- .../main/java/com/hippo/ehviewer/ui/CommonOperations.kt | 2 +- .../java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt | 2 +- .../java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt | 2 +- .../java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt | 4 ++-- .../java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt | 2 +- .../main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt | 7 ++++--- .../java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt | 4 ++-- .../com/hippo/ehviewer/ui/widget/GalleryListOperation.kt | 4 ++-- 13 files changed, 19 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt index abcf8f5e9..4f67d407c 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt @@ -95,7 +95,7 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor ehDatabase } launchIO { - downloadManager + DownloadManager } launchIO { cleanupDownload() @@ -233,9 +233,6 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor } } - @JvmStatic - val downloadManager by lazy { DownloadManager } - @JvmStatic val hosts by lazy { Hosts(application, "hosts.db") } diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.java b/app/src/main/java/com/hippo/ehviewer/EhDB.java index 0c4919fac..b7a27aece 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhDB.java +++ b/app/src/main/java/com/hippo/ehviewer/EhDB.java @@ -501,7 +501,7 @@ public class EhDB { .createFromFile(file).allowMainThreadQueries().build(); // Download label - DownloadManager manager = EhApplication.getDownloadManager(); + DownloadManager manager = DownloadManager.INSTANCE; try { List downloadLabelList = oldRoomDatabase.downloadLabelDao().list(); manager.addDownloadLabel(downloadLabelList); diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt index e06c60ea5..2801b376a 100644 --- a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt +++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt @@ -30,7 +30,6 @@ import androidx.core.app.ActivityCompat import androidx.core.app.NotificationChannelCompat import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat -import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhUtils import com.hippo.ehviewer.client.data.GalleryInfo @@ -66,7 +65,7 @@ class DownloadService : Service(), DownloadManager.DownloadListener { .setName(getString(R.string.download_service)) .build() ) - mDownloadManager = EhApplication.downloadManager + mDownloadManager = DownloadManager mDownloadManager!!.setDownloadListener(this) ensureDownloadingBuilder() mDownloadingBuilder!!.setContentTitle(getString(R.string.download_service)) diff --git a/app/src/main/java/com/hippo/ehviewer/preference/CleanRedundancyPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/CleanRedundancyPreference.kt index 75bbb2d08..cbd97487f 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/CleanRedundancyPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/preference/CleanRedundancyPreference.kt @@ -17,7 +17,7 @@ package com.hippo.ehviewer.preference import android.content.Context import android.util.AttributeSet -import com.hippo.ehviewer.EhApplication.Companion.downloadManager +import com.hippo.ehviewer.download.DownloadManager as downloadManager import com.hippo.ehviewer.GetText import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings diff --git a/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.kt index d15da6e0c..6c0aca96a 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.kt @@ -17,7 +17,7 @@ package com.hippo.ehviewer.preference import android.content.Context import android.util.AttributeSet -import com.hippo.ehviewer.EhApplication.Companion.downloadManager +import com.hippo.ehviewer.download.DownloadManager as downloadManager import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.GetText import com.hippo.ehviewer.R diff --git a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt index 4405e11ae..d5bf889fc 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt @@ -22,7 +22,7 @@ import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat import com.hippo.app.ListCheckBoxDialogBuilder import com.hippo.ehviewer.EhApplication.Companion.application -import com.hippo.ehviewer.EhApplication.Companion.downloadManager +import com.hippo.ehviewer.download.DownloadManager as downloadManager import com.hippo.ehviewer.EhApplication.Companion.favouriteStatusRouter import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.R diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt index 7918c4d11..2488991d4 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt @@ -51,7 +51,7 @@ import com.hippo.easyrecyclerview.FastScroller import com.hippo.easyrecyclerview.FastScroller.OnDragHandlerListener import com.hippo.easyrecyclerview.HandlerDrawable import com.hippo.easyrecyclerview.MarginItemDecoration -import com.hippo.ehviewer.EhApplication.Companion.downloadManager +import com.hippo.ehviewer.download.DownloadManager as downloadManager import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt index e43c371e7..7a29c29b8 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt @@ -26,7 +26,7 @@ import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager import com.hippo.drawable.TriangleDrawable import com.hippo.easyrecyclerview.MarginItemDecoration -import com.hippo.ehviewer.EhApplication.Companion.downloadManager +import com.hippo.ehviewer.download.DownloadManager as downloadManager import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings import com.hippo.ehviewer.client.EhUtils diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt index b1f9fe0e6..3f4a93a27 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt @@ -56,7 +56,7 @@ import com.hippo.app.BaseDialogBuilder import com.hippo.app.CheckBoxDialogBuilder import com.hippo.app.EditTextDialogBuilder import com.hippo.ehviewer.EhApplication -import com.hippo.ehviewer.EhApplication.Companion.downloadManager +import com.hippo.ehviewer.download.DownloadManager as downloadManager import com.hippo.ehviewer.EhApplication.Companion.ehCookieStore import com.hippo.ehviewer.EhApplication.Companion.galleryDetailCache import com.hippo.ehviewer.EhDB @@ -1193,7 +1193,7 @@ class GalleryDetailScene : CollapsingToolbarScene(), View.OnClickListener, Downl if (null == context || -1L == gid) { return } - val downloadState = downloadManager.getDownloadState(gid) + val downloadState = com.hippo.ehviewer.download.DownloadManager.getDownloadState(gid) if (downloadState == mDownloadState) { return } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt index fea5e9981..01ef08840 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt @@ -62,7 +62,7 @@ import com.hippo.app.EditTextDialogBuilder import com.hippo.drawable.AddDeleteDrawable import com.hippo.easyrecyclerview.EasyRecyclerView import com.hippo.easyrecyclerview.FastScroller.OnDragHandlerListener -import com.hippo.ehviewer.EhApplication.Companion.downloadManager +import com.hippo.ehviewer.download.DownloadManager as downloadManager import com.hippo.ehviewer.EhApplication.Companion.favouriteStatusRouter import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.FavouriteStatusRouter diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt index 83d3beb39..c9398a016 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt @@ -43,6 +43,7 @@ import com.hippo.ehviewer.client.data.GalleryInfo import com.hippo.ehviewer.dao.DownloadInfo import com.hippo.ehviewer.dao.HistoryInfo import com.hippo.ehviewer.databinding.SceneHistoryBinding +import com.hippo.ehviewer.download.DownloadManager import com.hippo.ehviewer.download.DownloadManager.DownloadInfoListener import com.hippo.ehviewer.ui.CommonOperations import com.hippo.ehviewer.ui.dialog.SelectItemWithIconAdapter @@ -73,7 +74,7 @@ class HistoryScene : BaseToolbarScene() { } }) } - private val mDownloadManager = EhApplication.downloadManager + private val mDownloadManager = DownloadManager private val mDownloadInfoListener: DownloadInfoListener by lazy { object : DownloadInfoListener { override fun onAdd(info: DownloadInfo, list: List, position: Int) { @@ -296,7 +297,7 @@ class HistoryScene : BaseToolbarScene() { } 3 -> { - val labelRawList = EhApplication.downloadManager.labelList + val labelRawList = DownloadManager.labelList val labelList: MutableList = ArrayList(labelRawList.size + 1) labelList.add(getString(R.string.default_download_label_name)) var i = 0 @@ -362,7 +363,7 @@ class HistoryScene : BaseToolbarScene() { private val mGi: GalleryInfo ) : DialogInterface.OnClickListener { override fun onClick(dialog: DialogInterface, which: Int) { - val downloadManager = EhApplication.downloadManager + val downloadManager = DownloadManager val downloadInfo = downloadManager.getDownloadInfo(mGi.gid) ?: return val label = if (which == 0) null else mLabels[which] downloadManager.changeLabel(listOf(downloadInfo), label) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt index 9e7998caa..8d8573052 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt @@ -27,15 +27,15 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import coil.compose.AsyncImage -import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings import com.hippo.ehviewer.client.EhUtils import com.hippo.ehviewer.client.data.GalleryInfo +import com.hippo.ehviewer.download.DownloadManager import eu.kanade.tachiyomi.util.system.pxToDp import java.util.Locale -private val downloadManager = EhApplication.downloadManager +private val downloadManager = DownloadManager @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryListOperation.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryListOperation.kt index 132f5980e..1f40407dd 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryListOperation.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryListOperation.kt @@ -25,18 +25,18 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat.startActivity -import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings import com.hippo.ehviewer.client.EhEngine import com.hippo.ehviewer.client.EhUtils import com.hippo.ehviewer.client.data.GalleryInfo +import com.hippo.ehviewer.download.DownloadManager import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.util.lang.launchIO import kotlinx.coroutines.DelicateCoroutinesApi -private val downloadManager = EhApplication.downloadManager +private val downloadManager = DownloadManager @Composable private fun DialogSelectorItem(