user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved galleryBlock loading logic

Browse Source
This commit is contained in:
Pupil
2020-02-13 20:15:17 +09:00
parent d05c1e4d08
commit 04c500f3d8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt
View File

@@ -102,9 +102,9 @@ class Cache(context: Context) : ContextWrapper(context) {
suspend fun getGalleryBlock(galleryID: Int): GalleryBlock? { suspend fun getGalleryBlock(galleryID: Int): GalleryBlock? {
val metadata = Cache(this).getCachedMetadata(galleryID) val metadata = Cache(this).getCachedMetadata(galleryID)
val sources = mapOf( val sources = listOf(
Code.HITOMI to { xyz.quaver.hitomi.getGalleryBlock(galleryID) }, { xyz.quaver.hitomi.getGalleryBlock(galleryID) },
Code.HIYOBI to { xyz.quaver.hiyobi.getGalleryBlock(galleryID) } { xyz.quaver.hiyobi.getGalleryBlock(galleryID) }
) )
val galleryBlock = if (metadata?.galleryBlock == null) { val galleryBlock = if (metadata?.galleryBlock == null) {
@@ -113,7 +113,7 @@ class Cache(context: Context) : ContextWrapper(context) {
for (source in sources) { for (source in sources) {
galleryBlock = kotlin.runCatching { galleryBlock = kotlin.runCatching {
source.value.invoke() source.invoke()
}.getOrNull() }.getOrNull()
if (galleryBlock != null) if (galleryBlock != null)