Merge remote-tracking branch 'origin/master'

Fixes unable to download some images

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.1.16/Pupil-v5.1.16.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.16/Pupil-v5.1.16.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.1.24/Pupil-v5.1.24.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.24/Pupil-v5.1.24.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)
 
 # Features

app/build.gradle

@@ -37,8 +37,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 67
-        versionName "5.1.17"
+        versionCode 69
+        versionName "5.1.24"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -125,8 +125,8 @@ dependencies {
 
     implementation "ru.noties.markwon:core:3.1.0"
 
-    implementation "xyz.quaver:libpupil:2.1.10"
-    implementation "xyz.quaver:documentfilex:0.6.1"
+    implementation "xyz.quaver:libpupil:2.1.15"
+    implementation "xyz.quaver:documentfilex:0.7.1"
     implementation "xyz.quaver:floatingsearchview:1.1.7"
 
     testImplementation "junit:junit:4.13.1"

app/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 67,
-      "versionName": "5.1.17",
+      "versionCode": 69,
+      "versionName": "5.1.24",
       "outputFile": "app-release.apk"
     }
   ]

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

@@ -23,10 +23,12 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -167,13 +169,7 @@ class DownloadService : Service() {
 
     private val interceptor: PupilInterceptor = { chain ->
         val request = chain.request()
-        var response = chain.proceed(request)
-
-        var retry = 5
-        while (!response.isSuccessful && retry > 0) {
-            response = chain.proceed(request)
-            retry--
-        }
+        val response = chain.proceed(request)
 
         response.newBuilder()
             .body(response.body()?.let {
@@ -202,14 +198,10 @@ class DownloadService : Service() {
     private val callback = object: Callback {
 
         override fun onFailure(call: Call, e: IOException) {
-            e.printStackTrace()
+            FirebaseCrashlytics.getInstance().recordException(e)
 
             if (e.message?.contains("cancel", true) == false) {
                 val galleryID = (call.request().tag() as Tag).galleryID
-
-                // Retry
-                cancel(galleryID)
-                download(galleryID)
             }
         }
 
@@ -218,7 +210,7 @@ class DownloadService : Service() {
             val ext = call.request().url().encodedPath().split('.').last()
 
             kotlin.runCatching {
-                val image = response.also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() } ?: throw Exception()
+                val image = response.also { if (it.code() != 200) throw IOException("$galleryID $index ${response.request().url()} CODE ${it.code()}") }.body()?.use { it.bytes() } ?: throw Exception("Response null")
                 val padding = ceil(progress[galleryID]?.size?.let { log10(it.toFloat()) } ?: 0F).toInt()
 
                 CoroutineScope(Dispatchers.IO).launch {
@@ -236,11 +228,11 @@ class DownloadService : Service() {
                             startId?.let { stopSelf(it) }
                         }
                     }.onFailure {
-                        it.printStackTrace()
-                        cancel(galleryID)
-                        download(galleryID)
+                        FirebaseCrashlytics.getInstance().recordException(it)
                     }
                 }
+            }.onFailure {
+                FirebaseCrashlytics.getInstance().recordException(it)
             }
         }
     }

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

@@ -105,7 +105,8 @@ val GalleryInfo.requestBuilders: List<Request.Builder>
         return this.files.map {
             Request.Builder()
                 .url(imageUrlFromImage(galleryID, it, !lowQuality))
-                .header("Referer", getReferer(galleryID))
+                .header("Referer", "https://hitomi.la/")
+                .header("User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36")
         }
     }