From 55ee841bd03a340eb87293cf6ac883c79d5bac1c Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Wed, 11 Dec 2019 20:03:55 +0900
Subject: [PATCH] resolves #31

---
 .../xyz/quaver/pupil/util/GalleryDownloader.kt     | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
index e942f0c8..07538401 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
@@ -186,15 +186,11 @@ class GalleryDownloader(
                     async(Dispatchers.IO) {
                         val url = when(useHiyobi) {
                             true -> createImgList(galleryID, reader)[index].path
-                            false -> when (galleryInfo.haswebp) {
-                                1 -> webpUrlFromUrl(
-                                    urlFromUrlFromHash(
-                                        galleryID,
-                                        galleryInfo,
-                                        true
-                                    )
-                                )
-                                else -> urlFromUrlFromHash(galleryID, galleryInfo)
+                            false -> when {
+                                (!galleryInfo.hash.isNullOrBlank()) and (galleryInfo.haswebp == 1) ->
+                                    urlFromUrlFromHash(galleryID, galleryInfo, "webp")
+                                else ->
+                                    urlFromUrlFromHash(galleryID, galleryInfo)
                             }
                         }