diff --git a/app/src/main/java/com/hippo/ehviewer/dao/DownloadInfo.kt b/app/src/main/java/com/hippo/ehviewer/dao/DownloadInfo.kt index 3cc4e826e..bb6694769 100644 --- a/app/src/main/java/com/hippo/ehviewer/dao/DownloadInfo.kt +++ b/app/src/main/java/com/hippo/ehviewer/dao/DownloadInfo.kt @@ -44,21 +44,23 @@ data class DownloadEntity( @ColumnInfo(name = "POSITION") override var position: Int = 0, + + @Ignore + override var speed: Long = 0, + + @Ignore + override var remaining: Long = 0, + + @Ignore + override var finished: Int = 0, + + @Ignore + override var downloaded: Int = 0, + + @Ignore + override var total: Int = 0, ) : AbstractDownloadInfo { - @Ignore - override var speed: Long = 0 - - @Ignore - override var remaining: Long = 0 - - @Ignore - override var finished = 0 - - @Ignore - override var downloaded = 0 - - @Ignore - override var total = 0 + constructor() : this(0) } data class DownloadInfo( 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 370f869eb..cc6c3cf46 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 @@ -202,7 +202,7 @@ class DownloadsScene : getString(R.string.default_download_label_name) -> DownloadManager.defaultInfoList else -> DownloadManager.getLabelDownloadInfoList(mLabel) ?: DownloadManager.allInfoList.also { mLabel = null } - }.filter(::filter) + }.mapNotNull { it.takeIf(::filter)?.copy(downloadInfo = it.downloadInfo.copy()) } submitList(list) { if (mGid != -1L) { val position = list.indexOfFirst { it.gid == mGid }