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

Fixed images not loading

Browse Source
This commit is contained in:
tom5079
2022-01-01 08:34:47 +09:00
parent 42cc026acc
commit 1c40575665
20 changed files with 908 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
View File

@@ -32,11 +32,13 @@ import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import okhttp3.Request
import xyz.quaver.hitomi.GalleryBlock
import xyz.quaver.hitomi.GalleryInfo
import xyz.quaver.io.FileX
import xyz.quaver.io.util.*
import xyz.quaver.pupil.client
import xyz.quaver.pupil.hitomi.GalleryBlock
import xyz.quaver.pupil.hitomi.GalleryInfo
import xyz.quaver.pupil.hitomi.getGalleryBlock
import xyz.quaver.pupil.hitomi.getGalleryInfo
import java.io.File
import java.io.IOException
import java.util.concurrent.ConcurrentHashMap
@@ -155,7 +157,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
return metadata.galleryBlock
?: withContext(Dispatchers.IO) {
try {
xyz.quaver.hitomi.getGalleryBlock(galleryID).also {
getGalleryBlock(galleryID).also {
setMetadata { metadata -> metadata.galleryBlock = it }
}
} catch (e: Exception) { return@withContext null }
@@ -187,7 +189,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
return metadata.galleryInfo
?: withContext(Dispatchers.IO) {
try {
xyz.quaver.hitomi.getGalleryInfo(galleryID).also {
getGalleryInfo(galleryID).also {
setMetadata { metadata ->
metadata.galleryInfo = it

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

@@ -22,10 +22,10 @@ import android.annotation.SuppressLint
import kotlinx.serialization.json.*
import okhttp3.OkHttpClient
import okhttp3.Request
import xyz.quaver.hitomi.GalleryBlock
import xyz.quaver.hitomi.GalleryInfo
import xyz.quaver.hitomi.getReferer
import xyz.quaver.hitomi.imageUrlFromImage
import xyz.quaver.pupil.hitomi.GalleryBlock
import xyz.quaver.pupil.hitomi.GalleryInfo
import xyz.quaver.pupil.hitomi.getReferer
import xyz.quaver.pupil.hitomi.imageUrlFromImage
import java.util.*
import kotlin.collections.ArrayList