Update README.md

Fixed images not loading

.idea/deploymentTargetDropDown.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_2_API_31.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-01-11T07:37:11.839392Z" />
-  </component>
-</project>

README.md

@@ -2,7 +2,7 @@
 *Pupil, Hitomi.la viewer for Android*  
 
 ![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
-[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.2.11/Pupil-v5.2.11.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.11/Pupil-v5.2.11.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.2.1/Pupil-v5.2.14.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.14/Pupil-v5.2.14.apk)
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)
 
 # Features

app/build.gradle

@@ -38,7 +38,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 69
-        versionName "5.2.12"
+        versionName "5.2.14"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 69,
-      "versionName": "5.2.12",
+      "versionName": "5.2.14",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/AndroidManifest.xml

@@ -6,8 +6,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission-sdk-23 android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission-sdk-23 android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.VIBRATE"/>

app/src/main/java/xyz/quaver/pupil/Pupil.kt

@@ -53,6 +53,7 @@ import xyz.quaver.pupil.util.*
 import java.io.File
 import java.net.URL
 import java.util.*
+import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import kotlin.reflect.KClass

app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt

@@ -128,10 +128,7 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                         setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
                         setImageLoaderCallback(object: ImageLoader.Callback {
                             override fun onFail(error: Exception?) {
-                                Cache.getInstance(context, galleryID).let { cache ->
-                                    cache.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
-                                    cache.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
-                                }
+                                Cache.delete(context, galleryID)
                             }
 
                             override fun onCacheHit(imageType: Int, image: File?) {}

app/src/main/java/xyz/quaver/pupil/hitomi/galleryblock.kt

@@ -58,7 +58,7 @@ suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock {
 
     val galleryUrl = doc.selectFirst("h1 > a")!!.attr("href")
 
-    val thumbnails = doc.select(".dj-img-cont img").map { protocol + it.attr("src") }
+    val thumbnails = doc.select(".dj-img-cont img").map { protocol + it.attr("data-src") }
 
     val title = doc.selectFirst("h1 > a")!!.text()
     val artists = doc.select(".artist-list a").map{ it.text() }

app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt

@@ -172,18 +172,16 @@ class DownloadService : Service() {
     private val interceptor: PupilInterceptor = { chain ->
         val request = chain.request()
 
-        if (rateLimitHost.matches(request.url().host()))
-            rateLimiter.acquire()
-
         var response = chain.proceed(request)
         var limit = 5
 
-        if (!response.isSuccessful && limit > 0) {
-            Thread.sleep(10000)
-            if (rateLimitHost.matches(request.url().host()))
-                rateLimiter.acquire()
+        while (!response.isSuccessful) {
+            if (response.code() == 503) {
+                Thread.sleep(200)
+            } else if (--limit > 0)
+                break
+
             response = chain.proceed(request)
-            limit -= 1
         }
 
         response.newBuilder()
@@ -247,6 +245,7 @@ class DownloadService : Service() {
                     }
                 }
             }.onFailure {
+                it.printStackTrace()
                 FirebaseCrashlytics.getInstance().recordException(it)
             }
         }

app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt

@@ -87,7 +87,7 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
 
     @Synchronized
     fun isDownloading(galleryID: Int): Boolean {
-        val isThisGallery: (Call) -> Boolean = { (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }
+        val isThisGallery: (Call) -> Boolean = { !it.isCanceled && (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }
 
         return downloadFolderMap.containsKey(galleryID)
                 && client.dispatcher().let { it.queuedCalls().any(isThisGallery) || it.runningCalls().any(isThisGallery) }