Merge remote-tracking branch 'origin/master'

Fixes unable to download some images

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="1.8" />
   </component>
 </project>

.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_3a_API_30_x86.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2021-10-25T00:27:52.904947Z" />
+  </component>
+</project>

.idea/gradle.xml

@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -14,7 +14,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/jarRepositories.xml

@@ -71,5 +71,15 @@
       <option name="name" value="maven3" />
       <option name="url" value="http://dl.bintray.com/piasy/maven" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://guardian.github.io/maven/repo-releases/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:$USER_HOME$/.m2/repository/" />
+    </remote-repository>
   </component>
 </project>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/runConfigurations.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

.idea/shelf/Uncommitted_changes_before_Update_at_10_29_21__4_40_PM__Default_Changelist_.xml

@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Update_at_10_29_21,_4_40_PM_[Default_Changelist]" date="1635493226384" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_10_29_21,_4_40_PM_[Default_Changelist]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 10/29/21, 4:40 PM [Default Changelist]" />
+</changelist>

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.6-hotfix7/Pupil-v5.1.6-hotfix7.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.6-hotfix7/Pupil-v5.1.6-hotfix7.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.1.22/Pupil-v5.1.22.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.22/Pupil-v5.1.22.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)
 
 # Features
@@ -20,7 +20,7 @@ or Build app yourself
 
 # Contribution
 
-Any kind of contribution is appriciated. Feel free to leave PR!
+Any kind of contribution is appreciated. Feel free to leave PR!
 
 ## Tag Translation
 Head over to [tags branch](https://github.com/tom5079/Pupil/tree/tags)

app/build.gradle

@@ -37,8 +37,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 64
+        versionCode 69
-        versionName "5.1.9-hotfix4"
+        versionName "5.1.23"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -108,9 +108,9 @@ dependencies {
 
     //implementation "com.quiph.ui:recyclerviewfastscroller:0.2.1"
 
-    implementation 'com.github.piasy:BigImageViewer:1.8.0'
+    implementation 'com.github.piasy:BigImageViewer:1.8.1'
-    implementation 'com.github.piasy:FrescoImageLoader:1.8.0'
+    implementation 'com.github.piasy:FrescoImageLoader:1.8.1'
-    implementation 'com.github.piasy:FrescoImageViewFactory:1.8.0'
+    implementation 'com.github.piasy:FrescoImageViewFactory:1.8.1'
 
     //noinspection GradleDependency
     implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
@@ -125,8 +125,8 @@ dependencies {
 
     implementation "ru.noties.markwon:core:3.1.0"
 
-    implementation "xyz.quaver:libpupil:2.1.1"
+    implementation "xyz.quaver:libpupil:2.1.14"
-    implementation "xyz.quaver:documentfilex:0.6.1"
+    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": 64,
+      "versionCode": 69,
-      "versionName": "5.1.9-hotfix4",
+      "versionName": "5.1.23",
       "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)
+        val response = chain.proceed(request)
-
-        var retry = 5
-        while (!response.isSuccessful && retry > 0) {
-            response = chain.proceed(request)
-            retry--
-        }
 
         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()
+                        FirebaseCrashlytics.getInstance().recordException(it)
-                        cancel(galleryID)
-                        download(galleryID)
                     }
                 }
+            }.onFailure {
+                FirebaseCrashlytics.getInstance().recordException(it)
             }
         }
     }

app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt

@@ -32,7 +32,6 @@ import android.view.animation.DecelerateInterpolator
 import android.widget.EditText
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
 import androidx.core.view.ViewCompat
@@ -125,7 +124,6 @@ class MainActivity :
         if (Preferences["download_folder", ""].isEmpty())
             DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
 
-        checkUpdate(this)
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
             !Preferences["download_folder_ignore_warning", false] &&
@@ -145,6 +143,12 @@ class MainActivity :
         initView()
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        checkUpdate(this)
+    }
+
     @OptIn(ExperimentalStdlibApi::class)
     override fun onBackPressed() {
         when {
@@ -797,7 +801,7 @@ class MainActivity :
                 }
             } catch (e: Exception) {
 
-                if (e.message != "No result")
+                if (e !is CancellationException)
                     FirebaseCrashlytics.getInstance().recordException(e)
 
                 withContext(Dispatchers.Main) {

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

@@ -18,11 +18,13 @@
 
 package xyz.quaver.pupil.util
 
-import kotlinx.serialization.*
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.serializer
 import java.io.File
-import java.util.*
 
 class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = mutableSetOf()) : MutableSet<T> by set {
 
@@ -46,6 +48,8 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
             Json.decodeFromString(serializer, file.readText())
         }.onSuccess {
             set.addAll(it)
+        }.onFailure {
+            FirebaseCrashlytics.getInstance().recordException(it)
         }
     }
 
@@ -57,8 +61,6 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
 
     @Synchronized
     override fun add(element: T): Boolean {
-        load()
-
         set.remove(element)
 
         return set.add(element).also {
@@ -68,8 +70,6 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
 
     @Synchronized
     override fun addAll(elements: Collection<T>): Boolean {
-        load()
-
         set.removeAll(elements)
 
         return set.addAll(elements).also {
@@ -79,8 +79,6 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
 
     @Synchronized
     override fun remove(element: T): Boolean {
-        load()
-
         return set.remove(element).also {
             save()
         }

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")
         }
     }
 

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
@@ -25,7 +25,7 @@ allprojects {
         mavenCentral()
         jcenter()
         maven { url "https://jitpack.io" }
-        maven { url "https://guardian.github.com/maven/repo-releases" }
+        maven { url "https://guardian.github.io/maven/repo-releases/" }
     }
 }