Merge remote-tracking branch 'origin/master'

Fixes unable to download some images

.github/workflows/watchdiff.yml

@@ -0,0 +1,23 @@
+# This is a basic workflow that is manually triggered
+
+name: Watch hitomi.la file changes
+
+on:
+  schedule:
+    - cron: "*/10 * * * *"
+
+jobs:
+  watchdiff:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: watchdiff
+      - name: Download files
+        run: ./fetch.sh
+      - name: Commit and Push
+        id: push
+        run: |
+            git config --global user.name 'Watchdiff bot'
+            git config --global user.email 'tom5079@naver.com'
+            { git add . && git commit -m "File update" && git push; } | tail -1 | grep -q "nothing to commit"

.idea/compiler.xml

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

.idea/deploymentTargetDropDown.xml

@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_3a_API_30_x86.avd" />
+            <value value="$USER_HOME$/.android/avd/Pixel_2_API_30.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-10-25T00:27:52.904947Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-01-04T14:31:24.587053Z" />
   </component>
 </project>

.idea/gradle.xml

@@ -7,6 +7,8 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/usr/share/java/gradle" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/jarRepositories.xml

@@ -81,5 +81,10 @@
       <option name="name" value="MavenLocal" />
       <option name="url" value="file:$USER_HOME$/.m2/repository/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots" />
+    </remote-repository>
   </component>
 </project>

.idea/misc.xml

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/layout/reader_activity.xml" value="0.14351851851851852" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

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

app/build.gradle

@@ -32,13 +32,13 @@ configurations {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
-        versionCode 67
+        versionCode 69
-        versionName "5.1.14"
+        versionName "5.2.8-BETA01"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -79,30 +79,30 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
     
-    implementation "androidx.appcompat:appcompat:1.3.0"
+    implementation "androidx.appcompat:appcompat:1.4.0"
-    implementation "androidx.activity:activity-ktx:1.3.0-beta01"
+    implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.fragment:fragment-ktx:1.3.4"
+    implementation "androidx.fragment:fragment-ktx:1.4.0"
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.2"
     implementation "androidx.gridlayout:gridlayout:1.0.0"
     implementation "androidx.biometric:biometric:1.1.0"
-    implementation "androidx.work:work-runtime-ktx:2.6.0-beta01"
+    implementation "androidx.work:work-runtime-ktx:2.7.1"
 
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
 
-    implementation "com.google.android.material:material:1.3.0"
+    implementation "com.google.android.material:material:1.4.0"
 
-    implementation platform('com.google.firebase:firebase-bom:26.5.0')
+    implementation platform('com.google.firebase:firebase-bom:29.0.3')
     implementation "com.google.firebase:firebase-analytics-ktx"
     implementation "com.google.firebase:firebase-crashlytics-ktx"
     implementation "com.google.firebase:firebase-perf-ktx"
 
     implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
-    implementation "com.google.android.gms:play-services-mlkit-face-detection:16.1.7"
+    implementation "com.google.android.gms:play-services-mlkit-face-detection:16.2.1"
 
     implementation "com.github.clans:fab:1.6.4"
 
@@ -125,13 +125,17 @@ dependencies {
 
     implementation "ru.noties.markwon:core:3.1.0"
 
-    implementation "xyz.quaver:libpupil:2.1.7-DEV"
+    implementation "org.jsoup:jsoup:1.14.3"
-    implementation "xyz.quaver:documentfilex:0.6.1"
+
+    implementation "com.google.guava:guava:31.0.1-android"
+
+    implementation "xyz.quaver:documentfilex:0.7.2"
     implementation "xyz.quaver:floatingsearchview:1.1.7"
 
-    testImplementation "junit:junit:4.13.1"
+    testImplementation "junit:junit:4.13.2"
-    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
-    androidTestImplementation "androidx.test:rules:1.3.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "androidx.test:runner:1.3.0"
+    androidTestImplementation "androidx.test:rules:1.4.0"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
+    androidTestImplementation "androidx.test:runner:1.4.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
 }

app/proguard-rules.pro

@@ -33,3 +33,4 @@
 }
 -keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
 -keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
+-keep class com.hippo.quickjs.** { *; }

app/release/output-metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 3,
   "artifactType": {
     "type": "APK",
     "kind": "Directory"
@@ -10,9 +10,11 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 67,
+      "attributes": [],
-      "versionName": "5.1.14",
+      "versionCode": 69,
+      "versionName": "5.2.8-BETA01",
       "outputFile": "app-release.apk"
     }
-  ]
+  ],
+  "elementType": "File"
 }

app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt

@@ -20,10 +20,15 @@
 
 package xyz.quaver.pupil
 
+import android.util.Log
+import android.webkit.*
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.*
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import xyz.quaver.pupil.hitomi.*
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -32,10 +37,95 @@ import org.junit.runner.RunWith
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
+    @Before
+    fun init() {
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+
+        runBlocking {
+            withContext(Dispatchers.Main) {
+                webView = WebView(appContext).apply {
+                    settings.javaScriptEnabled = true
+
+                    addJavascriptInterface(object {
+                        @JavascriptInterface
+                        fun onResult(uid: String, result: String) {
+                            _webViewFlow.tryEmit(uid to result)
+                        }
+                    }, "Callback")
+
+                    loadDataWithBaseURL(
+                        "https://hitomi.la/",
+                        """
+                            <script src="https://ltn.hitomi.la/jquery.min.js"></script>
+                            <script src="https://ltn.hitomi.la/common.js"></script>
+                            <script src="https://ltn.hitomi.la/search.js"></script>
+                            <script src="https://ltn.hitomi.la/searchlib.js"></script>
+                            <script src="https://ltn.hitomi.la/results.js></script>
+                        """.trimIndent(),
+                        "text/html",
+                        null,
+                        null
+                    )
+                }
+            }
+        }
+    }
 
     @Test
-    fun useAppContext() {
+    fun test_getGalleryIDsFromNozomi() {
-        // Context of the app under test.
+        runBlocking {
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+            val result = getGalleryIDsFromNozomi(null, "index", "all")
+
+            Log.d("PUPILD", "getGalleryIDsFromNozomi: ${result.size}")
+        }
+    }
+
+    @Test
+    fun test_getGalleryIDsForQuery() {
+        runBlocking {
+            val result = getGalleryIDsForQuery("female:crotch tattoo")
+
+            Log.d("PUPILD", "getGalleryIDsForQuery: ${result.size}")
+        }
+    }
+
+    @Test
+    fun test_getSuggestionsForQuery() {
+        runBlocking {
+            val result = getSuggestionsForQuery("fem")
+
+            Log.d("PUPILD", "getSuggestionsForQuery: ${result.size}")
+        }
+    }
+
+    @Test
+    fun test_urlFromUrlFromHash() {
+        runBlocking {
+            val galleryInfo = getGalleryInfo(2102416)
+
+            val result = galleryInfo.files.map {
+                imageUrlFromImage(2102416, it, false)
+            }
+
+            Log.d("PUPILD", result.toString())
+        }
+    }
+
+    @Test
+    fun test_getGalleryInfo() {
+        runBlocking {
+            val galleryInfo = getGalleryInfo(2102416)
+
+            Log.d("PUPILD", galleryInfo.toString())
+        }
+    }
+
+    @Test
+    fun test_getGalleryBlock() {
+        runBlocking {
+            val block = getGalleryBlock(2102731)
+
+            Log.d("PUPILD", block.toString())
+        }
     }
 }

app/src/main/AndroidManifest.xml

@@ -59,7 +59,8 @@
         <activity
             android:name=".ui.ReaderActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:parentActivityName=".ui.MainActivity">
+            android:parentActivityName=".ui.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -223,7 +224,8 @@
         <activity
             android:name=".ui.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/NoActionBarAppTheme">
+            android:theme="@style/NoActionBarAppTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />

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

@@ -18,15 +18,19 @@
 
 package xyz.quaver.pupil
 
+import android.annotation.SuppressLint
 import android.app.Application
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ApplicationInfo
 import android.net.Uri
 import android.os.Build
 import android.util.Log
+import android.webkit.*
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
@@ -35,18 +39,21 @@ import com.github.piasy.biv.loader.fresco.FrescoImageLoader
 import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.android.gms.common.GooglePlayServicesRepairableException
 import com.google.android.gms.security.ProviderInstaller
+import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import okhttp3.Dispatcher
+import kotlinx.coroutines.*
-import okhttp3.Interceptor
+import kotlinx.coroutines.channels.BufferOverflow
-import okhttp3.OkHttpClient
+import kotlinx.coroutines.flow.MutableSharedFlow
-import okhttp3.Response
+import kotlinx.coroutines.flow.asSharedFlow
+import okhttp3.*
 import xyz.quaver.io.FileX
+import xyz.quaver.pupil.hitomi.evaluations
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.*
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.setClient
 import java.io.File
+import java.net.URL
 import java.util.*
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import kotlin.reflect.KClass
@@ -70,12 +77,152 @@ var clientHolder: OkHttpClient? = null
 val client: OkHttpClient
     get() = clientHolder ?: clientBuilder.build().also {
         clientHolder = it
-        setClient(it)
     }
 
+@SuppressLint("StaticFieldLeak")
+lateinit var webView: WebView
+val _webViewFlow = MutableSharedFlow<Pair<String, String?>>(
+    extraBufferCapacity = 2,
+    onBufferOverflow = BufferOverflow.DROP_OLDEST
+)
+val webViewFlow = _webViewFlow.asSharedFlow()
+var webViewReady = false
+    private set
+var webViewFailed = false
+    private set
+private var reloadJob: Job? = null
+
+fun reloadWebView() {
+    if (reloadJob?.isActive == true) return
+
+    reloadJob = CoroutineScope(Dispatchers.IO).launch {
+        if (evaluations.isEmpty()) {
+            webViewReady = false
+            webViewFailed = false
+
+            while (evaluations.isNotEmpty()) yield()
+
+            runCatching {
+                URL(
+                    if (isDebugBuild)
+                        "https://tom5079.github.io/Pupil/hitomi-dev.html"
+                    else
+                        "https://tom5079.github.io/Pupil/hitomi.html"
+                ).readText()
+            }.onFailure {
+                webViewFailed = true
+            }.getOrNull()?.let { html ->
+                launch(Dispatchers.Main) {
+                    webView.loadDataWithBaseURL(
+                        "https://hitomi.la/",
+                        html,
+                        "text/html",
+                        null,
+                        null
+                    )
+                }
+            }
+        }
+    }
+}
+
+private var htmlVersion: String = ""
+fun reloadWhenFailedOrUpdate() = CoroutineScope(Dispatchers.Default).launch {
+    while (true) {
+        if (
+            webViewFailed ||
+            runCatching {
+                URL(
+                    if (isDebugBuild)
+                        "https://tom5079.github.io/Pupil/hitomi-dev.html.ver"
+                    else
+                        "https://tom5079.github.io/Pupil/hitomi.html.ver"
+                ).readText()
+            }.getOrNull().let { version ->
+                (!version.isNullOrEmpty() && version != htmlVersion).also {
+                    if (it) htmlVersion = version!!
+                }
+            }
+        ) {
+            reloadWebView()
+        }
+
+        delay(if (webViewReady && !webViewFailed) 10000 else 1000)
+    }
+}
+
+var isDebugBuild: Boolean = false
+private lateinit var userAgent: String
+
 class Pupil : Application() {
 
+    companion object {
+        lateinit var instance: Pupil
+            private set
+    }
+
+    @SuppressLint("SetJavaScriptEnabled")
     override fun onCreate() {
+        instance = this
+        isDebugBuild = applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0
+
+        if (isDebugBuild) WebView.setWebContentsDebuggingEnabled(true)
+
+        webView = WebView(this).apply {
+            with (settings) {
+                javaScriptEnabled = true
+                domStorageEnabled = true
+            }
+
+            userAgent = settings.userAgentString
+
+            webViewClient = object: WebViewClient() {
+                override fun onPageFinished(view: WebView?, url: String?) {
+                    webViewReady = true
+                }
+
+                override fun onReceivedError(
+                    view: WebView?,
+                    request: WebResourceRequest?,
+                    error: WebResourceError?
+                ) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        FirebaseCrashlytics.getInstance().log(
+                            "onReceivedError: ${error?.description}"
+                        )
+                    }
+                    webViewFailed = true
+                }
+            }
+
+            webChromeClient = object: WebChromeClient() {
+                override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
+                    FirebaseCrashlytics.getInstance().log(
+                        "onConsoleMessage: ${consoleMessage?.message()} (${consoleMessage?.sourceId()}:${consoleMessage?.lineNumber()})"
+                    )
+
+                    return super.onConsoleMessage(consoleMessage)
+                }
+            }
+
+            addJavascriptInterface(object {
+                @JavascriptInterface
+                fun onResult(uid: String, result: String) {
+                    _webViewFlow.tryEmit(uid to result)
+                }
+                @JavascriptInterface
+                fun onError(uid: String, message: String) {
+                    _webViewFlow.tryEmit(uid to null)
+                    Toast.makeText(this@Pupil, message, Toast.LENGTH_LONG).show()
+                    FirebaseCrashlytics.getInstance().recordException(
+                        Exception(message)
+                    )
+                }
+            }, "Callback")
+        }
+
+        reloadWhenFailedOrUpdate()
+
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
 
         preferences = PreferenceManager.getDefaultSharedPreferences(this)
@@ -94,7 +241,10 @@ class Pupil : Application() {
             .readTimeout(0, TimeUnit.SECONDS)
             .proxyInfo(proxyInfo)
             .addInterceptor { chain ->
-                val request = chain.request()
+                val request = chain.request().newBuilder()
+                    .header("User-Agent", userAgent)
+                    .build()
+
                 val tag = request.tag() ?: return@addInterceptor chain.proceed(request)
 
                 interceptors[tag::class]?.invoke(chain) ?: chain.proceed(request)
@@ -107,11 +257,10 @@ class Pupil : Application() {
 
         try {
             Preferences.get<String>("download_folder").also {
-                if (it.startsWith("content") && Build.VERSION.SDK_INT > 19)
+                contentResolver.takePersistableUriPermission(
-                    contentResolver.takePersistableUriPermission(
+                    Uri.parse(it),
-                        Uri.parse(it),
+                    Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-                        Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                )
-                    )
 
                 if (!FileX(this, it).canWrite())
                     throw Exception()

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

@@ -35,14 +35,13 @@ import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface
 import com.github.piasy.biv.loader.ImageLoader
 import kotlinx.coroutines.*
-import xyz.quaver.hitomi.getGallery
-import xyz.quaver.hitomi.getGalleryInfo
-import xyz.quaver.hitomi.getReader
 import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.databinding.GalleryblockItemBinding
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.favorites
+import xyz.quaver.pupil.hitomi.getGallery
+import xyz.quaver.pupil.hitomi.getGalleryInfo
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.ui.view.ProgressCard
 import xyz.quaver.pupil.util.Preferences

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

@@ -40,9 +40,9 @@ import com.github.piasy.biv.view.BigImageView
 import com.github.piasy.biv.view.ImageShownCallback
 import com.github.piasy.biv.view.ImageViewFactory
 import kotlinx.coroutines.*
-import xyz.quaver.hitomi.GalleryInfo
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.databinding.ReaderItemBinding
+import xyz.quaver.pupil.hitomi.GalleryInfo
 import xyz.quaver.pupil.ui.ReaderActivity
 import xyz.quaver.pupil.util.downloader.Cache
 import java.io.File

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

@@ -0,0 +1,56 @@
+/*
+ *    Copyright 2019 tom5079
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package xyz.quaver
+
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.modules.SerializersModule
+import kotlinx.serialization.modules.plus
+import kotlinx.serialization.modules.polymorphic
+import kotlinx.serialization.modules.subclass
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import xyz.quaver.pupil.client
+import java.io.IOException
+import java.net.URL
+import java.util.concurrent.TimeUnit
+import kotlin.time.Duration
+
+/**
+ * kotlinx.serialization.json.Json object for global use  
+ * properties should not be changed
+ *
+ * @see [https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-core/kotlinx-serialization-core/kotlinx.serialization.json/-json/index.html]
+ */
+val json = Json {
+    isLenient = true
+    ignoreUnknownKeys = true
+    allowSpecialFloatingPointValues = true
+    useArrayPolymorphism = true
+}
+
+typealias HeaderSetter = (Request.Builder) -> Request.Builder
+fun URL.readText(settings: HeaderSetter? = null): String {
+    val request = Request.Builder()
+        .url(this).let { 
+            settings?.invoke(it) ?: it
+        }.build()
+    
+    return client.newCall(request).execute().also{ if (it.code() != 200) throw IOException() }.body()?.use { it.string() } ?: throw IOException()
+}

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

@@ -0,0 +1,135 @@
+/*
+ *    Copyright 2019 tom5079
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package xyz.quaver.pupil.hitomi
+
+import android.webkit.WebView
+import android.widget.Toast
+import com.google.common.collect.ConcurrentHashMultiset
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.transformWhile
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import xyz.quaver.json
+import xyz.quaver.pupil.*
+import java.util.*
+import java.util.concurrent.ConcurrentHashMap
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+const val protocol = "https:"
+
+val evaluations = Collections.newSetFromMap<String>(ConcurrentHashMap())
+
+suspend fun WebView.evaluate(script: String): String = withContext(Dispatchers.Main) {
+    val result: String = withTimeout(10000) {
+        while (webViewFailed || !webViewReady) yield()
+
+        val uid = UUID.randomUUID().toString()
+
+        evaluations.add(uid)
+
+        suspendCoroutine { continuation ->
+            evaluateJavascript(script) {
+                evaluations.remove(uid)
+                continuation.resume(it)
+            }
+        }
+    }
+
+    result
+}
+
+@OptIn(ExperimentalCoroutinesApi::class)
+suspend fun WebView.evaluatePromise(script: String, then: String = ".then(result => Callback.onResult(%uid, JSON.stringify(result))).catch(err => Callback.onError(%uid, JSON.stringify(error)))"): String? = withContext(Dispatchers.Main) {
+    val flow: Flow<Pair<String, String?>> = withTimeout(10000) {
+        while (webViewFailed || !webViewReady) yield()
+
+        val uid = UUID.randomUUID().toString()
+
+        evaluations.add(uid)
+
+        evaluateJavascript((script+then).replace("%uid", "'$uid'"), null)
+
+        webViewFlow.transformWhile { (currentUid, result) ->
+            if (currentUid == uid) {
+                evaluations.remove(uid)
+                emit(currentUid to result)
+            }
+            currentUid != uid
+        }
+    }
+
+    flow.first().second
+}
+
+@Suppress("EXPERIMENTAL_API_USAGE")
+suspend fun getGalleryInfo(galleryID: Int): GalleryInfo {
+    val result = webView.evaluatePromise("get_gallery_info($galleryID)")
+
+    return json.decodeFromString(result!!)
+}
+
+//common.js
+const val domain = "ltn.hitomi.la"
+const val galleryblockdir = "galleryblock"
+const val nozomiextension = ".nozomi"
+
+val String?.js: String
+    get() = if (this == null) "null" else "'$this'"
+
+@OptIn(ExperimentalSerializationApi::class)
+suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null): String {
+    val result = webView.evaluate(
+        """
+        url_from_url_from_hash(
+            ${galleryID.toString().js},
+            ${Json.encodeToString(image)},
+            ${dir.js}, ${ext.js}, ${base.js}
+        )
+        """.trimIndent()
+    )
+
+
+    FirebaseCrashlytics.getInstance().log(
+        """
+        url_from_url_from_hash(
+            ${galleryID.toString().js},
+            ${Json.encodeToString(image)},
+            ${dir.js}, ${ext.js}, ${base.js}
+        )
+        """.trimIndent()
+    )
+    return Json.decodeFromString(result)
+}
+
+suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean) : String {
+    return when {
+        noWebp ->
+            urlFromUrlFromHash(galleryID, image)
+//        image.hasavif != 0 ->
+//            urlFromUrlFromHash(galleryID, image, "avif", null, "a")
+        image.haswebp != 0 ->
+            urlFromUrlFromHash(galleryID, image, "webp", null, "a")
+        else ->
+            urlFromUrlFromHash(galleryID, image)
+    }
+}

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

@@ -0,0 +1,80 @@
+/*
+ *    Copyright 2019 tom5079
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package xyz.quaver.pupil.hitomi
+
+import kotlinx.serialization.Serializable
+import org.jsoup.Jsoup
+import xyz.quaver.readText
+import java.net.URL
+import java.net.URLDecoder
+
+@Serializable
+data class Gallery(
+    val related: List<Int>,
+    val langList: List<Pair<String, String>>,
+    val cover: String,
+    val title: String,
+    val artists: List<String>,
+    val groups: List<String>,
+    val type: String,
+    val language: String,
+    val series: List<String>,
+    val characters: List<String>,
+    val tags: List<String>,
+    val thumbnails: List<String>
+)
+suspend fun getGallery(galleryID: Int) : Gallery {
+    val url = Jsoup.parse(URL("https://hitomi.la/galleries/$galleryID.html").readText())
+        .select("link").attr("href")
+
+    val doc = Jsoup.parse(URL(url).readText())
+
+    val related = Regex("\\d+")
+        .findAll(doc.select("script").first()!!.html())
+        .map {
+            it.value.toInt()
+        }.toList()
+
+    val langList = doc.select("#lang-list a").map {
+            Pair(it.text(), "$protocol//hitomi.la${it.attr("href")}")
+        }
+
+    val cover = protocol + doc.selectFirst(".cover img")!!.attr("src")
+    val title = doc.selectFirst(".gallery h1 a")!!.text()
+    val artists = doc.select(".gallery h2 a").map { it.text() }
+    val groups = doc.select(".gallery-info a[href~=^/group/]").map { it.text() }
+    val type = doc.selectFirst(".gallery-info a[href~=^/type/]")!!.text()
+
+    val language = run {
+        val href = doc.select(".gallery-info a[href~=^/index.+\\.html\$]").attr("href")
+        Regex("""index-([^-]+)(-.+)?\.html""").find(href)?.groupValues?.getOrNull(1) ?: ""
+    }
+
+    val series = doc.select(".gallery-info a[href~=^/series/]").map { it.text() }
+    val characters = doc.select(".gallery-info a[href~=^/character/]").map { it.text() }
+
+    val tags = doc.select(".gallery-info a[href~=^/tag/]").map {
+        val href = URLDecoder.decode(it.attr("href"), "UTF-8")
+        href.slice(5 until href.indexOf('-'))
+    }
+
+    val thumbnails = getGalleryInfo(galleryID).files.map { galleryInfo ->
+        urlFromUrlFromHash(galleryID, galleryInfo, "smalltn", "jpg", "tn")
+    }
+
+    return Gallery(related, langList, cover, title, artists, groups, type, language, series, characters, tags, thumbnails)
+}

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

@@ -0,0 +1,79 @@
+/*
+ *    Copyright 2019 tom5079
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package xyz.quaver.pupil.hitomi
+
+import kotlinx.serialization.Serializable
+import org.jsoup.Jsoup
+import xyz.quaver.pupil.webView
+import xyz.quaver.readText
+import java.net.URL
+import java.net.URLDecoder
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.util.*
+import javax.net.ssl.HttpsURLConnection
+
+@Serializable
+data class GalleryBlock(
+    val id: Int,
+    val galleryUrl: String,
+    val thumbnails: List<String>,
+    val title: String,
+    val artists: List<String>,
+    val series: List<String>,
+    val type: String,
+    val language: String,
+    val relatedTags: List<String>
+)
+
+suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock {
+    val url = "$protocol//$domain/$galleryblockdir/$galleryID$extension"
+
+    val html: String = webView.evaluatePromise(
+        """
+        $.get('$url').always(function(data, status) {
+            if (status === 'success') {
+                Callback.onResult(%uid, data);
+            }
+        }); 
+        """.trimIndent(),
+        then = ""
+    )!!
+
+    val doc = Jsoup.parse(html)
+
+    val galleryUrl = doc.selectFirst("h1 > a")!!.attr("href")
+
+    val thumbnails = doc.select(".dj-img-cont img").map { protocol + it.attr("src") }
+
+    val title = doc.selectFirst("h1 > a")!!.text()
+    val artists = doc.select(".artist-list a").map{ it.text() }
+    val series = doc.select(".dj-content a[href~=^/series/]").map { it.text() }
+    val type = doc.selectFirst("a[href~=^/type/]")!!.text()
+
+    val language = run {
+        val href = doc.select("a[href~=^/index.+\\.html\$]").attr("href")
+        Regex("""index-([^-]+)(-.+)?\.html""").find(href)?.groupValues?.getOrNull(1) ?: ""
+    }
+
+    val relatedTags = doc.select(".relatedtags a").map {
+        val href = URLDecoder.decode(it.attr("href"), "UTF-8")
+        href.slice(5 until href.indexOf("-all"))
+    }
+
+    return GalleryBlock(galleryID, galleryUrl, thumbnails, title, artists, series, type, language, relatedTags)
+}

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

@@ -0,0 +1,49 @@
+/*
+ *    Copyright 2019 tom5079
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package xyz.quaver.pupil.hitomi
+
+import kotlinx.serialization.Serializable
+
+fun getReferer(galleryID: Int) = "https://hitomi.la/reader/$galleryID.html"
+
+@Serializable
+data class GalleryInfo(
+    val language_localname: String? = null,
+    val language: String? = null,
+    val date: String? = null,
+    val files: List<GalleryFiles>,
+    val id: Int? = null,
+    val type: String? = null,
+    val title: String? = null
+)
+
+@Serializable
+data class GalleryFiles(
+    val width: Int,
+    val hash: String,
+    val haswebp: Int = 0,
+    val name: String,
+    val height: Int,
+    val hasavif: Int = 0,
+    val hasavifsmalltn: Int? = 0
+)
+
+//Set header `Referer` to reader url to avoid 403 error
+@Deprecated("", replaceWith = ReplaceWith("getGalleryInfo"))
+suspend fun getReader(galleryID: Int) : GalleryInfo {
+   return getGalleryInfo(galleryID)
+}

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

@@ -0,0 +1,86 @@
+/*
+ *    Copyright 2019 tom5079
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package xyz.quaver.pupil.hitomi
+
+import kotlinx.coroutines.*
+import java.util.*
+
+suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int> = coroutineScope {
+    val terms = query
+        .trim()
+        .replace(Regex("""^\?"""), "")
+        .lowercase()
+        .split(Regex("\\s+"))
+        .map {
+            it.replace('_', ' ')
+        }
+
+    val positiveTerms = LinkedList<String>()
+    val negativeTerms = LinkedList<String>()
+
+    for (term in terms) {
+        if (term.matches(Regex("^-.+")))
+            negativeTerms.push(term.replace(Regex("^-"), ""))
+        else if (term.isNotBlank())
+            positiveTerms.push(term)
+    }
+
+    val positiveResults = positiveTerms.map {
+        async {
+            runCatching {
+                getGalleryIDsForQuery(it)
+            }.getOrElse { emptySet() }
+        }
+    }
+
+    val negativeResults = negativeTerms.map {
+        async {
+            runCatching {
+                getGalleryIDsForQuery(it)
+            }.getOrElse { emptySet() }
+        }
+    }
+
+    var results = when {
+        sortByPopularity -> getGalleryIDsFromNozomi(null, "popular", "all")
+        positiveTerms.isEmpty() -> getGalleryIDsFromNozomi(null, "index", "all")
+        else -> emptySet()
+    }
+
+    fun filterPositive(newResults: Set<Int>) {
+        results = when {
+            results.isEmpty() -> newResults
+            else -> results intersect newResults
+        }
+    }
+
+    fun filterNegative(newResults: Set<Int>) {
+        results = results subtract newResults
+    }
+
+    //positive results
+    positiveResults.forEach {
+        filterPositive(it.await())
+    }
+
+    //negative results
+    negativeResults.forEach {
+        filterNegative(it.await())
+    }
+
+    results
+}

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

@@ -0,0 +1,50 @@
+/*
+ *    Copyright 2019 tom5079
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package xyz.quaver.pupil.hitomi
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import xyz.quaver.pupil.webView
+
+//searchlib.js
+const val extension = ".html"
+
+@OptIn(ExperimentalSerializationApi::class)
+suspend fun getGalleryIDsForQuery(query: String) : Set<Int> {
+    val result = webView.evaluatePromise("get_galleryids_for_query('$query')") ?: return emptySet()
+
+    return Json.decodeFromString(result)
+}
+
+@Serializable
+data class Suggestion(val s: String, val t: Int, val u: String, val n: String)
+
+@OptIn(ExperimentalSerializationApi::class)
+suspend fun getSuggestionsForQuery(query: String) : List<Suggestion> {
+    val result = webView.evaluatePromise("get_suggestions_for_query('$query')") ?: return emptyList()
+
+    return Json.decodeFromString<List<List<Suggestion>?>>(result)[0] ?: return emptyList()
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+suspend fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : Set<Int> {
+    val jsArea = if (area == null) "null" else "'$area'"
+
+    return Json.decodeFromString(webView.evaluatePromise("""get_galleryids_from_nozomi($jsArea, '$tag', '$language')""") ?: return emptySet())
+}

app/src/main/java/xyz/quaver/pupil/receiver/UpdateBroadcastReceiver.kt

@@ -24,6 +24,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.webkit.MimeTypeMap
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -76,7 +77,7 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {
                 val pendingIntent = PendingIntent.getActivity(context, 0, Intent(Intent.ACTION_VIEW).apply {
                     flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
                     setDataAndType(uri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
-                }, 0)
+                }, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_IMMUTABLE else 0)
 
                 val notification = NotificationCompat.Builder(context, "update")
                     .setSmallIcon(android.R.drawable.stat_sys_download_done)

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

@@ -23,10 +23,14 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.os.Build
+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.common.util.concurrent.RateLimiter
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -38,12 +42,9 @@ import okhttp3.ResponseBody
 import okio.*
 import xyz.quaver.pupil.*
 import xyz.quaver.pupil.ui.ReaderActivity
-import xyz.quaver.pupil.util.cleanCache
+import xyz.quaver.pupil.util.*
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.pupil.util.ellipsize
-import xyz.quaver.pupil.util.normalizeID
-import xyz.quaver.pupil.util.requestBuilders
 import java.io.IOException
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.ceil
@@ -74,7 +75,7 @@ class DownloadService : Service() {
 
         val pendingIntent = TaskStackBuilder.create(this).run {
             addNextIntentWithParentStack(intent)
-            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT)
+            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0)
         }
         val action =
             NotificationCompat.Action.Builder(0, getText(android.R.string.cancel),
@@ -84,7 +85,7 @@ class DownloadService : Service() {
                     Intent(this, DownloadService::class.java)
                         .putExtra(KEY_COMMAND, COMMAND_CANCEL)
                         .putExtra(KEY_ID, galleryID),
-                    PendingIntent.FLAG_UPDATE_CURRENT),
+                    PendingIntent.FLAG_UPDATE_CURRENT or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0),
             ).build()
 
         notification[galleryID] = NotificationCompat.Builder(this, "download").apply {
@@ -165,14 +166,24 @@ class DownloadService : Service() {
         }
     }
 
+    private val rateLimiter = RateLimiter.create(2.0)
+    private val rateLimitHost = Regex("..?\\.hitomi.la")
+
     private val interceptor: PupilInterceptor = { chain ->
         val request = chain.request()
-        var response = chain.proceed(request)
 
-        var retry = 5
+        if (rateLimitHost.matches(request.url().host()))
-        while (!response.isSuccessful && retry > 0) {
+            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()
             response = chain.proceed(request)
-            retry--
+            limit -= 1
         }
 
         response.newBuilder()
@@ -202,14 +213,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 +225,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 +243,11 @@ class DownloadService : Service() {
                             startId?.let { stopSelf(it) }
                         }
                     }.onFailure {
-                        it.printStackTrace()
+                        FirebaseCrashlytics.getInstance().recordException(it)
-                        cancel(galleryID)
-                        download(galleryID)
                     }
                 }
+            }.onFailure {
+                FirebaseCrashlytics.getInstance().recordException(it)
             }
         }
     }
@@ -348,7 +355,7 @@ class DownloadService : Service() {
             }
         }
 
-        galleryInfo.requestBuilders.forEachIndexed { index, it ->
+        galleryInfo.getRequestBuilders().forEachIndexed { index, it ->
             if (progress[galleryID]?.get(index)?.isInfinite() == false) {
                 val request = it.tag(Tag(galleryID, index, startId)).build()
                 client.newCall(request).enqueue(callback)

app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt

@@ -21,7 +21,7 @@ package xyz.quaver.pupil.types
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
-import xyz.quaver.hitomi.Suggestion
+import xyz.quaver.pupil.hitomi.Suggestion
 import xyz.quaver.pupil.util.translations
 
 @Parcelize

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

@@ -25,6 +25,7 @@ import android.os.Build
 import android.os.Bundle
 import android.text.InputType
 import android.text.util.Linkify
+import android.util.Log
 import android.view.KeyEvent
 import android.view.MenuItem
 import android.view.View
@@ -44,9 +45,9 @@ import xyz.quaver.floatingsearchview.FloatingSearchView
 import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
 import xyz.quaver.floatingsearchview.util.view.MenuView
 import xyz.quaver.floatingsearchview.util.view.SearchInputView
-import xyz.quaver.hitomi.doSearch
+import xyz.quaver.pupil.hitomi.doSearch
-import xyz.quaver.hitomi.getGalleryIDsFromNozomi
+import xyz.quaver.pupil.hitomi.getGalleryIDsFromNozomi
-import xyz.quaver.hitomi.getSuggestionsForQuery
+import xyz.quaver.pupil.hitomi.getSuggestionsForQuery
 import xyz.quaver.pupil.*
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.databinding.MainActivityBinding

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

@@ -161,12 +161,10 @@ class ReaderActivity : BaseActivity() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.reader, menu)
 
-        with(menu?.findItem(R.id.reader_menu_favorite)) {
+        with(menu.findItem(R.id.reader_menu_favorite)) {
-            this ?: return@with
-
             if (favorites.contains(galleryID))
                 (icon as Animatable).start()
         }

app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt

@@ -35,8 +35,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import xyz.quaver.hitomi.Gallery
+import xyz.quaver.pupil.hitomi.Gallery
-import xyz.quaver.hitomi.getGallery
+import xyz.quaver.pupil.hitomi.getGallery
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.adapters.ThumbnailPageAdapter

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

@@ -21,6 +21,7 @@ package xyz.quaver.pupil.util.downloader
 import android.content.Context
 import android.content.ContextWrapper
 import android.net.Uri
+import android.util.Log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -32,11 +33,13 @@ import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.Request
-import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.GalleryInfo
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.*
 import xyz.quaver.pupil.client
+import xyz.quaver.pupil.hitomi.GalleryBlock
+import xyz.quaver.pupil.hitomi.GalleryInfo
+import xyz.quaver.pupil.hitomi.getGalleryBlock
+import xyz.quaver.pupil.hitomi.getGalleryInfo
 import java.io.File
 import java.io.IOException
 import java.util.concurrent.ConcurrentHashMap
@@ -155,7 +158,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
         return metadata.galleryBlock
             ?: withContext(Dispatchers.IO) {
                 try {
-                    xyz.quaver.hitomi.getGalleryBlock(galleryID).also {
+                    getGalleryBlock(galleryID).also {
                         setMetadata { metadata -> metadata.galleryBlock = it }
                     }
                 } catch (e: Exception) { return@withContext null }
@@ -187,7 +190,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
         return metadata.galleryInfo
             ?: withContext(Dispatchers.IO) {
                 try {
-                    xyz.quaver.hitomi.getGalleryInfo(galleryID).also {
+                    getGalleryInfo(galleryID).also {
                         setMetadata { metadata ->
                             metadata.galleryInfo = it
 

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

@@ -19,13 +19,14 @@
 package xyz.quaver.pupil.util
 
 import android.annotation.SuppressLint
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.serialization.json.*
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.pupil.hitomi.GalleryBlock
-import xyz.quaver.hitomi.GalleryInfo
+import xyz.quaver.pupil.hitomi.GalleryInfo
-import xyz.quaver.hitomi.getReferer
+import xyz.quaver.pupil.hitomi.getReferer
-import xyz.quaver.hitomi.imageUrlFromImage
+import xyz.quaver.pupil.hitomi.imageUrlFromImage
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -97,17 +98,25 @@ fun GalleryBlock.formatDownloadFolderTest(format: String): String =
         }
     }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)
 
-val GalleryInfo.requestBuilders: List<Request.Builder>
+suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
-    get() {
+    val galleryID = this.id ?: 0
-        val galleryID = this.id ?: 0
+    val lowQuality = Preferences["low_quality", true]
-        val lowQuality = Preferences["low_quality", true]
 
-        return this.files.map {
+    return this.files.map {
-            Request.Builder()
+        Request.Builder()
-                .url(imageUrlFromImage(galleryID, it, !lowQuality))
+            .url(
-                .header("Referer", getReferer(galleryID))
+                runCatching {
-        }
+                    imageUrlFromImage(galleryID, it, !lowQuality)
+                }
+                .onFailure {
+                    FirebaseCrashlytics.getInstance().recordException(it)
+                }
+                .getOrDefault("https://a/")
+            )
+            .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")
     }
+}
 
 fun String.ellipsize(n: Int): String =
     if (this.length > n)

app/src/test/java/xyz/quaver/pupil/ExampleUnitTest.kt

@@ -26,21 +26,21 @@ package xyz.quaver.pupil
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 
-import kotlinx.serialization.*
+import okhttp3.OkHttpClient
-import kotlinx.serialization.json.Json
+import okhttp3.Request
+import org.junit.Assert.assertEquals
+import org.junit.Before
 import org.junit.Test
+import xyz.quaver.pupil.hitomi.getGalleryInfo
+import xyz.quaver.pupil.hitomi.imageUrlFromImage
 import java.lang.reflect.ParameterizedType
-import kotlin.reflect.KClass
+import java.util.concurrent.TimeUnit
-import kotlin.reflect.KType
-import kotlin.reflect.typeOf
 
 class ExampleUnitTest {
-
     @Test
     fun test() {
         val a = mutableSetOf<Int>()
 
         print(a::class.java.methods.firstOrNull { it.name == "add" }?.genericParameterTypes?.firstOrNull() as? ParameterizedType)
     }
-
 }

build.gradle

@@ -6,14 +6,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         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"
-        classpath "com.google.gms:google-services:4.3.8"
+        classpath "com.google.gms:google-services:4.3.10"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath "com.google.firebase:firebase-crashlytics-gradle:2.7.0"
+        classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
         classpath "com.google.firebase:perf-plugin:1.4.0"
         classpath "com.google.android.gms:oss-licenses-plugin:0.10.4"
     }
@@ -24,7 +24,6 @@ allprojects {
         google()
         mavenCentral()
         jcenter()
-        mavenLocal()
         maven { url "https://jitpack.io" }
         maven { url "https://guardian.github.io/maven/repo-releases/" }
     }

gradle.properties

@@ -20,4 +20,4 @@ kotlin.code.style=official
 android.enableJetifier=true
 android.useAndroidX=true
 
-kotlin_version=1.5.10
+kotlin_version=1.6.10

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip