diff --git a/app/build.gradle b/app/build.gradle index 24c2f33e..28714094 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ android { minSdkVersion 16 targetSdkVersion 30 versionCode 61 - versionName "5.1.1-hotfix2" + versionName "5.1.1-hotfix3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 14671273..5557886d 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "properties": [], "versionCode": 61, - "versionName": "5.1.1-hotfix2", + "versionName": "5.1.1-hotfix3", "enabled": true, "outputFile": "app-release.apk" } diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt index 246fdf36..c95849af 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt @@ -20,7 +20,6 @@ package xyz.quaver.pupil.adapters import android.content.Context import android.graphics.drawable.Drawable -import android.net.Uri import android.util.SparseBooleanArray import android.view.LayoutInflater import android.view.View @@ -36,7 +35,6 @@ import com.daimajia.swipe.adapters.RecyclerSwipeAdapter import com.daimajia.swipe.interfaces.SwipeAdapterInterface import com.github.piasy.biv.loader.ImageLoader import kotlinx.android.synthetic.main.item_galleryblock.view.* -import kotlinx.android.synthetic.main.item_reader.view.* import kotlinx.coroutines.* import xyz.quaver.hitomi.getReader import xyz.quaver.io.util.getChild @@ -158,7 +156,9 @@ class GalleryBlockAdapter(private val galleries: List) : RecyclerSwipeAdapt }) ssiv?.recycle() CoroutineScope(Dispatchers.IO).launch { - showImage(cache.getThumbnail() ?: Uri.EMPTY) + cache.getThumbnail().let { launch(Dispatchers.Main) { + showImage(it) + } } } } diff --git a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt index ffcfc76d..cb586e3c 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt @@ -122,6 +122,8 @@ class MainActivity : checkUpdate(this) + + initView() } diff --git a/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt b/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt index 9205f87b..f2e4cc70 100644 --- a/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt +++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt @@ -132,7 +132,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW } @Suppress("BlockingMethodInNonBlockingContext") - suspend fun getThumbnail(): Uri? = + suspend fun getThumbnail(): Uri = findFile(".thumbnail")?.uri ?: getGalleryBlock()?.thumbnails?.firstOrNull()?.let { withContext(Dispatchers.IO) { kotlin.runCatching { @@ -144,7 +144,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW }.getOrNull()?.let { thumbnail -> kotlin.runCatching { cacheFolder.getChild(".thumbnail").also { it.writeBytes(thumbnail) } }.getOrNull()?.uri } - } } + } } ?: Uri.EMPTY suspend fun getReader(): Reader? { val mirrors = Preferences.get("mirrors").let { if (it.isEmpty()) emptyList() else it.split('>') } diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 3c4522be..2331da30 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -12,7 +12,7 @@ 한 번에 로드할 갤러리 수 검색 설정 설정 - apk 다운로드중… + 업데이트 다운로드중… 업데이트가 있습니다! 경고 결과 없음