From 7f3f17d08eabb7d1898cb2c2313c6a7ed2ea6f63 Mon Sep 17 00:00:00 2001 From: tom5079 <7948651+tom5079@users.noreply.github.com> Date: Sun, 23 Mar 2025 10:43:17 -0700 Subject: [PATCH] image fix --- app/build.gradle.kts | 2 +- app/release/baselineProfiles/0/app-release.dm | Bin 3993 -> 3993 bytes app/release/baselineProfiles/1/app-release.dm | Bin 3938 -> 3938 bytes app/release/output-metadata.json | 2 +- .../java/xyz/quaver/pupil/hitomi/common.kt | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e63a8f55..701291b5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -19,7 +19,7 @@ android { minSdk = 21 targetSdk = 35 versionCode = 70 - versionName = "5.3.21" + versionName = "5.3.22" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm index 165edcde1fa0495ed1f140804da9ae8d19ea9a7f..33deac9ea39417b8b1f2d596badfdc1ab272dff7 100644 GIT binary patch delta 79 zcmbO!KU1D3z?+#xgn@&DgCQw&B2OaAwhv7AHx};Vkzff}IqfeG1H%s>Mpm@hnfE#) WM^b2c6iCHnC4M8Oq|nJ>{LTPRmKB%) delta 79 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 K0^w7W9}hz#9jBQ9 diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 32745f3a..3a74e09e 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "attributes": [], "versionCode": 70, - "versionName": "5.3.21", + "versionName": "5.3.22", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt b/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt index 27da2fff..fc17790a 100644 --- a/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt +++ b/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt @@ -221,7 +221,7 @@ object gg { suspend fun subdomainFromURL(url: String, base: String? = null, dir: String? = null): String { var retval = "" - if (!base.isNullOrBlank()) { + if (base.isNullOrBlank()) { when { dir == "webp" -> retval = "w" dir == "avif" -> retval = "a" @@ -294,7 +294,7 @@ suspend fun urlFromUrlFromHash( urlFromUrl(urlFromHash(galleryID, image, dir, ext), base, dir) suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean): String { - return urlFromUrlFromHash(galleryID, image, "webp", null, "a") + return urlFromUrlFromHash(galleryID, image, "webp") // return when { // noWebp -> // urlFromUrlFromHash(galleryID, image)