Merge pull request #67 from tom5079/dev

Version 4.6

README.md

@@ -1,7 +1,10 @@
 # Pupil
 
 ![Banner](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/pupil-banner.png?raw=true)
-*Pupil, Hitomi.la viewer for Android*
+*Pupil, Hitomi.la viewer for Android*  
+
+[![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)  
+I can speak English, Japanese and Korean. If you have any questions, head over to my discord server or DM me!
 
 # Screenshot
 ![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.png?raw=true)

app/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlinx-serialization'
 
-if (file("src/google-services.json").exists() && file("src/debug/google-services.json").exists()) {
+if (file("google-services.json").exists() && file("src/debug/google-services.json").exists()) {
     logger.lifecycle("Firebase Enabled")
     apply plugin: 'com.google.gms.google-services'
     apply plugin: 'io.fabric'
@@ -20,7 +20,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
         versionCode 42
-        versionName "4.6-beta1"
+        versionName "4.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -68,7 +68,7 @@ dependencies {
     implementation "androidx.biometric:biometric:1.0.1"
     implementation 'com.android.support:multidex:1.0.3'
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
-    implementation 'com.google.android.material:material:1.2.0-alpha04'
+    implementation 'com.google.android.material:material:1.2.0-alpha05'
     implementation 'com.google.firebase:firebase-core:17.2.2'
     implementation 'com.google.firebase:firebase-perf:19.0.5'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":42,"versionName":"4.6-beta1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":42,"versionName":"4.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

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
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:name=".Pupil"
@@ -18,7 +18,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:replace="android:theme">
+        tools:replace="android:theme"
+        android:requestLegacyExternalStorage="true">
 
         <provider
             android:authorities="${applicationId}.provider"

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

@@ -31,7 +31,9 @@ import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.android.gms.common.GooglePlayServicesRepairableException
 import com.google.android.gms.security.ProviderInstaller
 import com.google.firebase.analytics.FirebaseAnalytics
+import xyz.quaver.proxy
 import xyz.quaver.pupil.util.Histories
+import xyz.quaver.pupil.util.getProxy
 import java.io.File
 
 class Pupil : MultiDexApplication() {
@@ -46,8 +48,10 @@ class Pupil : MultiDexApplication() {
     override fun onCreate() {
         val preference = PreferenceManager.getDefaultSharedPreferences(this)
 
+        proxy = getProxy(this)
+
         try {
-            PreferenceManager.getDefaultSharedPreferences(this).getInt("dl_location", 0)
+            preference.getString("dl_location", null)
         } catch (e: Exception) {
             preference.edit().remove("dl_location").apply()
         }
@@ -58,11 +62,6 @@ class Pupil : MultiDexApplication() {
         if (BuildConfig.DEBUG)
             FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)
 
-        val file = preference.getString("dl_location", null)
-
-        if (file?.startsWith("content") == true)
-            preference.edit().remove("dl_location").apply()
-
         try {
             ProviderInstaller.installIfNeeded(this)
         } catch (e: GooglePlayServicesRepairableException) {

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

@@ -90,7 +90,7 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
 
                     if (visibility == View.GONE) {
                         visibility = View.VISIBLE
-                        max = reader.galleryInfo.size
+                        max = reader.galleryInfo.files.size
                     }
 
                     if (progress == max) {
@@ -160,7 +160,7 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
                     } ?: 0
 
                     with(galleryblock_progressbar) {
-                        max = reader.galleryInfo.size
+                        max = reader.galleryInfo.files.size
                         progress = count
 
                         visibility = View.VISIBLE

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

@@ -52,13 +52,13 @@ class ReaderAdapter(private val context: Context,
 
     //region Glide.RecyclerView
     val sizeProvider = ListPreloader.PreloadSizeProvider<File> { _, _, position ->
-        Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.getOrNull(position)?.let {
+        Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.files?.getOrNull(position)?.let {
             arrayOf(it.width, it.height).toIntArray()
         }
     }
     val modelProvider = object: ListPreloader.PreloadModelProvider<File> {
         override fun getPreloadItems(position: Int): MutableList<File> {
-            return listOf(Cache(context).getImages(galleryID)?.get(position)).filterNotNullTo(mutableListOf())
+            return listOf(Cache(context).getImages(galleryID)?.getOrNull(position)).filterNotNullTo(mutableListOf())
         }
 
         override fun getPreloadRequestBuilder(item: File): RequestBuilder<*>? {
@@ -83,15 +83,6 @@ class ReaderAdapter(private val context: Context,
 
     var onItemClickListener : ((Int) -> (Unit))? = null
 
-    init {
-        CoroutineScope(Dispatchers.IO).launch {
-            reader = Cache(context).getReader(galleryID)
-            launch(Dispatchers.Main) {
-                notifyDataSetChanged()
-            }
-        }
-    }
-
     class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -123,19 +114,18 @@ class ReaderAdapter(private val context: Context,
 
         if (!isFullScreen)
             (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
-                .dimensionRatio = "${reader!!.galleryInfo[position].width}:${reader!!.galleryInfo[position].height}"
+                .dimensionRatio = "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
 
         holder.view.reader_index.text = (position+1).toString()
 
-        val images = Cache(context).getImages(galleryID)
+        val images = Cache(context).getImage(galleryID, position)
 
-        if (images?.get(position) != null) {
+        if (images != null) {
             glide
-                .load(images[position])
+                .load(images)
                 .diskCacheStrategy(DiskCacheStrategy.NONE)
                 .skipMemoryCache(true)
                 .error(R.drawable.image_broken_variant)
-                .dontTransform()
                 .apply {
                     if (BuildConfig.CENSOR)
                         override(5, 8)
@@ -171,6 +161,6 @@ class ReaderAdapter(private val context: Context,
         }
     }
 
-    override fun getItemCount() = reader?.galleryInfo?.size ?: 0
+    override fun getItemCount() = reader?.galleryInfo?.files?.size ?: 0
 
 }

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

@@ -25,7 +25,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.text.*
 import android.text.style.AlignmentSpan
-import android.util.Log
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
@@ -120,7 +119,6 @@ class MainActivity : AppCompatActivity() {
         val lockManager = try {
             LockManager(this)
         } catch (e: Exception) {
-            Log.i("PUPILD", e.toString())
             android.app.AlertDialog.Builder(this).apply {
                 setTitle(R.string.warning)
                 setMessage(R.string.lock_corrupted)
@@ -937,26 +935,26 @@ class MainActivity : AppCompatActivity() {
                             when(sortMode) {
                                 SortMode.POPULAR -> getGalleryIDsFromNozomi(null, "popular", "all")
                                 else -> getGalleryIDsFromNozomi(null, "index", "all")
-                            }.apply {
-                                totalItems = size
+                            }.also {
+                                totalItems = it.size
                             }
                         }
-                        else -> doSearch("$defaultQuery $query", sortMode == SortMode.POPULAR).apply {
-                            totalItems = size
+                        else -> doSearch("$defaultQuery $query", sortMode == SortMode.POPULAR).also {
+                            totalItems = it.size
                         }
                     }
                 }
                 Mode.HISTORY -> {
                     when {
                         query.isEmpty() -> {
-                            histories.toList().apply {
-                                totalItems = size
+                            histories.toList().also {
+                                totalItems = it.size
                             }
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            histories.filter { result.binarySearch(it) >= 0 }.apply {
-                                totalItems = size
+                            histories.filter { result.binarySearch(it) >= 0 }.also {
+                                totalItems = it.size
                             }
                         }
                     }
@@ -969,26 +967,26 @@ class MainActivity : AppCompatActivity() {
                     } ?: emptyList()
 
                     when {
-                        query.isEmpty() -> downloads.apply {
-                            totalItems = size
+                        query.isEmpty() -> downloads.also {
+                            totalItems = it.size
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            downloads.filter { result.binarySearch(it) >= 0 }.apply {
-                                totalItems = size
+                            downloads.filter { result.binarySearch(it) >= 0 }.also {
+                                totalItems = it.size
                             }
                         }
                     }
                 }
                 Mode.FAVORITE -> {
                     when {
-                        query.isEmpty() -> favorites.toList().apply {
-                            totalItems = size
+                        query.isEmpty() -> favorites.toList().also {
+                            totalItems = it.size
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            favorites.filter { result.binarySearch(it) >= 0 }.apply {
-                                totalItems = size
+                            favorites.filter { result.binarySearch(it) >= 0 }.also {
+                                totalItems = it.size
                             }
                         }
                     }
@@ -1003,10 +1001,13 @@ class MainActivity : AppCompatActivity() {
 
         loadingJob = CoroutineScope(Dispatchers.IO).launch {
             val galleryIDs = try {
-                galleryIDs!!.await()
+                galleryIDs!!.await().also {
+                    if (it.isEmpty())
+                        throw Exception("No result")
+                }
             } catch (e: Exception) {
 
-                if (Fabric.isInitialized())
+                if (Fabric.isInitialized() && e.message != "No result")
                     Crashlytics.logException(e)
 
                 withContext(Dispatchers.Main) {

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

@@ -254,11 +254,17 @@ class ReaderActivity : AppCompatActivity() {
                 reader_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
 
                 if (title == getString(R.string.reader_loading)) {
-                    val reader = (reader_recyclerview.adapter as ReaderAdapter).reader
+                    val reader = Cache(this@ReaderActivity).getReaderOrNull(galleryID)
 
                     if (reader != null) {
-                        title = reader.title
-                        menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.size}"
+
+                        with (reader_recyclerview.adapter as ReaderAdapter) {
+                            this.reader = reader
+                            notifyDataSetChanged()
+                        }
+
+                        title = reader.galleryInfo.title
+                        menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.files.size}"
 
                         menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity,
                             when (reader.code) {
@@ -294,7 +300,7 @@ class ReaderActivity : AppCompatActivity() {
                 }
             }
 
-            //addOnScrollListener((adapter as ReaderAdapter).preloader)
+            addOnScrollListener((adapter as ReaderAdapter).preloader)
             addOnScrollListener(object: RecyclerView.OnScrollListener() {
                 override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                     super.onScrolled(recyclerView, dx, dy)

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

@@ -46,16 +46,12 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
     private val excludeBL = "-male:yaoi"
     private val excludeGuro = listOf("-female:guro", "-male:guro")
 
-    private lateinit var dialogView : View
-
     var onPositiveButtonClickListener : ((Tags) -> (Unit))? = null
 
     @SuppressLint("InflateParams")
     override fun onCreate(savedInstanceState: Bundle?) {
-        initDialog()
-
         setTitle(R.string.default_query_dialog_title)
-        setView(dialogView)
+        setView(build())
         setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ ->
             val newTags = Tags.parse(default_query_dialog_edittext.text.toString())
 
@@ -79,15 +75,15 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
     }
 
     @SuppressLint("InflateParams")
-    private fun initDialog() {
+    private fun build() : View {
         val preferences = PreferenceManager.getDefaultSharedPreferences(context)
         val tags = Tags.parse(
             preferences.getString("default_query", "") ?: ""
         )
 
-        dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
 
-        with(dialogView.default_query_dialog_language_selector) {
+        with(view.default_query_dialog_language_selector) {
             adapter =
                 ArrayAdapter(
                     context,
@@ -110,13 +106,13 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
             }
         }
 
-        with(dialogView.default_query_dialog_BL_checkbox) {
+        with(view.default_query_dialog_BL_checkbox) {
             isChecked = tags.contains(excludeBL)
             if (tags.contains(excludeBL))
                 tags.remove(excludeBL)
         }
 
-        with(dialogView.default_query_dialog_guro_checkbox) {
+        with(view.default_query_dialog_guro_checkbox) {
             isChecked = excludeGuro.all { tags.contains(it) }
             if (excludeGuro.all { tags.contains(it) })
                 excludeGuro.forEach {
@@ -124,7 +120,7 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
                 }
         }
 
-        with(dialogView.default_query_dialog_edittext) {
+        with(view.default_query_dialog_edittext) {
             setText(tags.toString(), android.widget.TextView.BufferType.EDITABLE)
             addTextChangedListener(object : TextWatcher {
                 override fun beforeTextChanged(
@@ -149,6 +145,8 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
                 }
             })
         }
+
+        return view
     }
 
 }

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

@@ -26,6 +26,7 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
+import android.view.View
 import android.widget.LinearLayout
 import android.widget.RadioButton
 import androidx.appcompat.app.AlertDialog
@@ -46,6 +47,16 @@ class DownloadLocationDialog(val activity: Activity) : AlertDialog(activity) {
     private val buttons = mutableListOf<Pair<RadioButton, File?>>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        setTitle(R.string.settings_dl_location)
+
+        setView(build())
+
+        setButton(Dialog.BUTTON_POSITIVE, context.getText(android.R.string.ok)) { _, _ -> }
+
+        super.onCreate(savedInstanceState)
+    }
+
+    private fun build() : View {
         val view = layoutInflater.inflate(R.layout.dialog_dl_location, null) as LinearLayout
 
         val externalFilesDirs = ContextCompat.getExternalFilesDirs(context, null)
@@ -115,18 +126,13 @@ class DownloadLocationDialog(val activity: Activity) : AlertDialog(activity) {
         externalFilesDirs.indexOfFirst {
             it.canonicalPath == getDownloadDirectory(context).canonicalPath
         }.let { index ->
-            buttons[index].first.isChecked = true
+            if (index < 0)
+                buttons.first().first.isChecked = true
+            else
+                buttons[index].first.isChecked = true
         }
 
-        setTitle(R.string.settings_dl_location)
-
-        setView(view)
-
-        setButton(Dialog.BUTTON_POSITIVE, context.getText(android.R.string.ok)) { _, _ ->
-            dismiss()
-        }
-
-        super.onCreate(savedInstanceState)
+        return view
     }
 
 }

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

@@ -22,6 +22,7 @@ import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
+import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -56,21 +57,17 @@ class MirrorDialog(context: Context) : AlertDialog(context) {
         }
     }
 
-    private lateinit var recyclerView: RecyclerView
-
     @SuppressLint("InflateParams")
     override fun onCreate(savedInstanceState: Bundle?) {
-        initDialog()
-
         setTitle(R.string.settings_mirror_title)
-        setView(recyclerView)
+        setView(build())
         setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ -> }
 
         super.onCreate(savedInstanceState)
     }
 
-    private fun initDialog() {
-        recyclerView = RecyclerView(context).apply recyclerview@{
+    private fun build() : View {
+        return RecyclerView(context).apply recyclerview@{
             addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
             layoutManager = LinearLayoutManager(context)
             adapter = MirrorAdapter(context).apply adapter@{

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

@@ -0,0 +1,133 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.ui.dialog
+
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import androidx.preference.PreferenceManager
+import kotlinx.android.synthetic.main.dialog_proxy.view.*
+import xyz.quaver.proxy
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.util.ProxyInfo
+import xyz.quaver.pupil.util.getProxyInfo
+import xyz.quaver.pupil.util.json
+import java.net.Proxy
+
+class ProxyDialog(context: Context) : Dialog(context) {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        val view = build()
+
+        setTitle(R.string.settings_proxy_title)
+        setContentView(view)
+
+        window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
+
+        super.onCreate(savedInstanceState)
+    }
+
+    @SuppressLint("InflateParams")
+    private fun build() : View {
+        val proxyInfo = getProxyInfo(context)
+
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_proxy, null)
+
+        val enabler = { enable: Boolean ->
+            view?.proxy_addr?.isEnabled = enable
+            view?.proxy_port?.isEnabled = enable
+            view?.proxy_username?.isEnabled = enable
+            view?.proxy_password?.isEnabled = enable
+
+            if (!enable) {
+                view?.proxy_addr?.text = null
+                view?.proxy_port?.text = null
+                view?.proxy_username?.text = null
+                view?.proxy_password?.text = null
+            }
+        }
+
+        with(view.proxy_type_selector) {
+            adapter = ArrayAdapter(
+                context,
+                android.R.layout.simple_spinner_dropdown_item,
+                context.resources.getStringArray(R.array.proxy_type)
+            )
+
+            setSelection(proxyInfo.type.ordinal)
+
+            onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                    enabler.invoke(position != 0)
+                }
+
+                override fun onNothingSelected(parent: AdapterView<*>?) {}
+            }
+        }
+
+        view.proxy_addr.setText(proxyInfo.host)
+        view.proxy_port.setText(proxyInfo.port?.toString())
+        view.proxy_username.setText(proxyInfo.username)
+        view.proxy_password.setText(proxyInfo.password)
+
+        enabler.invoke(proxyInfo.type != Proxy.Type.DIRECT)
+
+        view.proxy_cancel.setOnClickListener {
+            dismiss()
+        }
+
+        view.proxy_ok.setOnClickListener {
+            val type = Proxy.Type.values()[view.proxy_type_selector.selectedItemPosition]
+            val addr = view.proxy_addr.text?.toString()
+            val port = view.proxy_port.text?.toString()?.toIntOrNull()
+            val username = view.proxy_username.text?.toString()
+            val password = view.proxy_password.text?.toString()
+
+            if (type != Proxy.Type.DIRECT) {
+                if (addr == null || addr.isEmpty())
+                    view.proxy_addr.error = context.getText(R.string.proxy_dialog_error)
+                if (port == null)
+                    view.proxy_port.error = context.getText(R.string.proxy_dialog_error)
+
+                if (addr == null || addr.isEmpty() || port == null)
+                    return@setOnClickListener
+            }
+
+            ProxyInfo(type, addr, port, username, password).let {
+
+                PreferenceManager.getDefaultSharedPreferences(context).edit().putString("proxy",
+                    json.stringify(ProxyInfo.serializer(), it)
+                ).apply()
+
+                proxy = it.proxy()
+            }
+
+            dismiss()
+        }
+
+        return view
+    }
+
+}

app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt

@@ -36,6 +36,7 @@ import xyz.quaver.pupil.ui.SettingsActivity
 import xyz.quaver.pupil.ui.dialog.DefaultQueryDialog
 import xyz.quaver.pupil.ui.dialog.DownloadLocationDialog
 import xyz.quaver.pupil.ui.dialog.MirrorDialog
+import xyz.quaver.pupil.ui.dialog.ProxyDialog
 import xyz.quaver.pupil.util.*
 import java.io.File
 
@@ -146,6 +147,10 @@ class SettingsFragment :
                     MirrorDialog(context)
                         .show()
                 }
+                "proxy" -> {
+                    ProxyDialog(context)
+                        .show()
+                }
                 "backup" -> {
                     File(ContextCompat.getDataDir(context), "favorites.json").copyTo(
                         File(getDownloadDirectory(context), "favorites.json"),
@@ -189,9 +194,18 @@ class SettingsFragment :
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        when (key) {
-            "dl_location" -> {
-                findPreference<Preference>(key)?.summary = getDownloadDirectory(context!!).canonicalPath
+        key ?: return
+
+        with(findPreference<Preference>(key)) {
+            this ?: return
+
+            when (key) {
+                "proxy" -> {
+                    summary = getProxyInfo(context).type.name
+                }
+                "dl_location" -> {
+                    summary = getDownloadDirectory(context!!).canonicalPath
+                }
             }
         }
     }
@@ -245,8 +259,7 @@ class SettingsFragment :
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "default_query" -> {
-                            val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-                            summary = preferences.getString("default_query", "") ?: ""
+                            summary = PreferenceManager.getDefaultSharedPreferences(context).getString("default_query", "") ?: ""
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
@@ -270,6 +283,11 @@ class SettingsFragment :
                         "mirrors" -> {
                             onPreferenceClickListener = this@SettingsFragment
                         }
+                        "proxy" -> {
+                            summary = getProxyInfo(context).type.name
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
                         "dark_mode" -> {
                             onPreferenceChangeListener = this@SettingsFragment
                         }

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

@@ -22,6 +22,7 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.util.Base64
 import androidx.preference.PreferenceManager
+import com.crashlytics.android.Crashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -106,9 +107,11 @@ class Cache(context: Context) : ContextWrapper(context) {
                 var galleryBlock: GalleryBlock? = null
 
                 for (source in sources) {
-                    galleryBlock = kotlin.runCatching {
+                    galleryBlock = try {
                         source.invoke()
-                    }.getOrNull()
+                    } catch (e: Exception) {
+                        null
+                    }
 
                     if (galleryBlock != null)
                         break
@@ -155,9 +158,12 @@ class Cache(context: Context) : ContextWrapper(context) {
                 var retval: Reader? = null
 
                 for (source in sources) {
-                    retval = kotlin.runCatching {
+                    retval = try {
                         source.value.invoke()
-                    }.getOrNull()
+                    } catch (e: Exception) {
+                        Crashlytics.logException(e)
+                        null
+                    }
 
                     if (retval != null)
                         break
@@ -176,16 +182,36 @@ class Cache(context: Context) : ContextWrapper(context) {
         return reader
     }
 
+    val imageNameRegex = Regex("""^\d+\..+$""")
     fun getImages(galleryID: Int): List<File?>? {
         val gallery = getCachedGallery(galleryID)
-        val reader = getReaderOrNull(galleryID) ?: return null
-        val images = gallery.listFiles() ?: return null
 
-        return reader.galleryInfo.indices.map { index ->
-            images.firstOrNull { file -> file.name.startsWith("%05d".format(index)) }
+        return gallery.list { _, name ->
+            imageNameRegex.matches(name)
+        }?.map {
+            File(gallery, it)
         }
     }
 
+    val imageExtensions = listOf(
+        "png",
+        "jpg",
+        "webp",
+        "gif"
+    )
+    fun getImage(galleryID: Int, index: Int): File? {
+        val gallery = getCachedGallery(galleryID)
+
+        for (ext in imageExtensions) {
+            File(gallery, "%05d.$ext".format(index)).let {
+                if (it.exists())
+                    return it
+            }
+        }
+
+        return null
+    }
+
     fun putImage(galleryID: Int, name: String, data: ByteArray) {
         val cache = File(getCachedGallery(galleryID), name).also {
             if (!it.exists())

app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt

@@ -40,6 +40,7 @@ import xyz.quaver.hitomi.urlFromUrlFromHash
 import xyz.quaver.hiyobi.cookie
 import xyz.quaver.hiyobi.createImgList
 import xyz.quaver.hiyobi.user_agent
+import xyz.quaver.proxy
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.ui.ReaderActivity
 import java.io.IOException
@@ -159,6 +160,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         OkHttpClient.Builder()
             .addInterceptor(interceptor)
             .dispatcher(Dispatcher(Executors.newFixedThreadPool(4)))
+            .proxy(proxy)
             .build()
 
     fun stop() {
@@ -187,14 +189,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         queue.remove(galleryID)
         worker[galleryID]?.cancel()
 
-        clients[galleryID]?.dispatcher()?.queuedCalls()
-            ?.filter {
-                @Suppress("UNCHECKED_CAST")
-                (it.request().tag() as? Pair<Int, Int>)?.first == galleryID
-            }
-            ?.forEach {
-                it.cancel()
-            }
+        clients[galleryID]?.dispatcher()?.cancelAll()
         clients.remove(galleryID)
 
         progress.remove(galleryID)
@@ -218,7 +213,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
                     url(
                         urlFromUrlFromHash(
                             galleryID,
-                            reader.galleryInfo[index],
+                            reader.galleryInfo.files[index],
                             if (lowQuality) "webp" else null
                         )
                     )
@@ -236,7 +231,10 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
             tag(galleryID to index)
         }.build()
 
-        clients[galleryID].newCall(request).enqueue(callback)
+        if (clients.get(galleryID) == null)
+            clients.put(galleryID, buildClient())
+
+        clients[galleryID]?.newCall(request)?.enqueue(callback)
     }
 
     private fun download(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
@@ -253,18 +251,18 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
 
         val cache = Cache(this@DownloadWorker).getImages(galleryID)
 
-        progress.put(galleryID, reader.galleryInfo.indices.map { index ->
-            if (cache?.get(index) != null)
+        progress.put(galleryID, reader.galleryInfo.files.indices.map { index ->
+            if (cache?.getOrNull(index) != null)
                 Float.POSITIVE_INFINITY
             else
                 0F
         }.toMutableList())
-        exception.put(galleryID, reader.galleryInfo.map { null }.toMutableList())
+        exception.put(galleryID, reader.galleryInfo.files.map { null }.toMutableList())
 
         if (notification[galleryID] == null)
             initNotification(galleryID)
 
-        notification[galleryID].setContentTitle(reader.title)
+        notification[galleryID].setContentTitle(reader.galleryInfo.title)
         notify(galleryID)
 
         if (isCompleted(galleryID)) {
@@ -278,12 +276,10 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
             return@launch
         }
 
-        clients.put(galleryID, buildClient())
-
-        for (i in reader.galleryInfo.indices) {
+        for (i in reader.galleryInfo.files.indices) {
             val callback = object : Callback {
                 override fun onFailure(call: Call, e: IOException) {
-                    if (Fabric.isInitialized())
+                    if (Fabric.isInitialized() && e.message != "Canceled")
                         Crashlytics.logException(e)
 
                     progress[galleryID]?.set(i, Float.NaN)

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

@@ -0,0 +1,63 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.util
+
+import android.content.Context
+import androidx.preference.PreferenceManager
+import kotlinx.serialization.Serializable
+import okhttp3.Authenticator
+import okhttp3.Credentials
+import java.net.InetSocketAddress
+import java.net.Proxy
+
+@Serializable
+data class ProxyInfo(
+    val type: Proxy.Type,
+    val host: String? = null,
+    val port: Int? = null,
+    val username: String? = null,
+    val password: String? = null
+) {
+    fun proxy() : Proxy {
+        return if (host == null || port == null)
+            return Proxy.NO_PROXY
+        else
+            Proxy(type, InetSocketAddress.createUnresolved(host, port))
+    }
+
+    fun authenticator() = Authenticator { _, response ->
+        val credential = Credentials.basic(username, password)
+
+        response.request().newBuilder()
+            .header("Proxy-Authorization", credential)
+            .build()
+    }
+
+}
+
+fun getProxy(context: Context) =
+    getProxyInfo(context).proxy()
+
+fun getProxyInfo(context: Context) =
+    PreferenceManager.getDefaultSharedPreferences(context).getString("proxy", null).let {
+        if (it == null)
+            ProxyInfo(Proxy.Type.DIRECT)
+        else
+            json.parse(ProxyInfo.serializer(), it)
+    }

app/src/main/res/layout/dialog_proxy.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/proxy_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="16dp"
+        style="@style/TextAppearance.AppCompat.Large"
+        android:text="@string/settings_proxy_title"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"/>
+
+    <TextView
+        android:id="@+id/proxy_type_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/proxy_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:text="@string/proxy_dialog_type"
+        android:textAppearance="?android:attr/listSeparatorTextViewStyle"/>
+
+    <Spinner
+        android:id="@+id/proxy_type_selector"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/proxy_type_text"/>
+
+    <TextView
+        android:id="@+id/proxy_server_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/proxy_type_selector"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:text="@string/proxy_dialog_server"
+        android:textAppearance="?android:attr/listSeparatorTextViewStyle"/>
+
+    <LinearLayout
+        android:id="@+id/proxy_address_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/proxy_server_text">
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/proxy_addr"
+            android:layout_width="0dp"
+            android:layout_weight="2"
+            android:layout_height="wrap_content"
+            android:hint="@string/proxy_dialog_addr_hint"/>
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/proxy_port"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:hint="@string/proxy_dialog_port_hint"/>
+
+    </LinearLayout>
+
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/proxy_username"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/proxy_address_layout"
+        android:hint="@string/proxy_dialog_username_hint"
+        android:enabled="false"/>
+
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/proxy_password"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/proxy_username"
+        android:hint="@string/proxy_dialog_password_hint"
+        android:enabled="false"/>
+
+    <Button
+        android:id="@+id/proxy_cancel"
+        style="?borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@android:string/cancel"
+        app:layout_constraintTop_toBottomOf="@id/proxy_password"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/proxy_ok"
+        app:layout_constraintRight_toLeftOf="@id/proxy_ok"/>
+
+    <Button
+        android:id="@+id/proxy_ok"
+        style="?borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@android:string/ok"
+        app:layout_constraintTop_toBottomOf="@id/proxy_password"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintRight_toRightOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values-ja/arrays.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <string-array name="proxy_type">
+        <item>ダイレクト</item>
+        <item>HTTP</item>
+        <item>SOCKS</item>
+    </string-array>
+</resources>

app/src/main/res/values-ja/strings.xml

@@ -122,4 +122,12 @@
     <string name="settings_low_quality_summary">ロード速度とデータ使用料を改善するため低解像度イメージをロード</string>
     <string name="settings_dl_location_custom">手動で設定</string>
     <string name="settings_dl_location_not_writable">このフォルダにアクセスできません。他のフォルダを選択してください。</string>
+    <string name="settings_proxy_title">プロクシ</string>
+    <string name="proxy_dialog_username_hint">ID</string>
+    <string name="proxy_dialog_type">プロクシタイプ</string>
+    <string name="proxy_dialog_port_hint">ポート</string>
+    <string name="proxy_dialog_password_hint">パスワード</string>
+    <string name="proxy_dialog_error">エラー</string>
+    <string name="proxy_dialog_addr_hint">サーバーアドレス</string>
+    <string name="proxy_dialog_server">サーバー</string>
 </resources>

app/src/main/res/values-ko/arrays.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <string-array name="proxy_type">
+        <item>다이렉트</item>
+        <item>HTTP</item>
+        <item>SOCKS</item>
+    </string-array>
+</resources>

app/src/main/res/values-ko/strings.xml

@@ -122,4 +122,12 @@
     <string name="settings_mirror_title">미러 설정</string>
     <string name="settings_dl_location_custom">직접 설정</string>
     <string name="settings_dl_location_not_writable">이 폴더에 접근할 수 없습니다. 다른 폴더를 선택해주세요.</string>
+    <string name="settings_proxy_title">프록시</string>
+    <string name="proxy_dialog_username_hint">ID</string>
+    <string name="proxy_dialog_type">프록시 타입</string>
+    <string name="proxy_dialog_port_hint">포트</string>
+    <string name="proxy_dialog_password_hint">비밀번호</string>
+    <string name="proxy_dialog_error">잘못된 값</string>
+    <string name="proxy_dialog_addr_hint">서버 주소</string>
+    <string name="proxy_dialog_server">서버</string>
 </resources>

app/src/main/res/values/arrays.xml

@@ -62,4 +62,10 @@
         <item>HIYOBI|hiyobi.me</item>
     </string-array>
 
+    <string-array name="proxy_type">
+        <item>Direct</item>
+        <item>HTTP</item>
+        <item>SOCKS</item>
+    </string-array>
+
 </resources>

app/src/main/res/values/dimen.xml

@@ -10,4 +10,7 @@
 	<dimen name="nav_header_height">176dp</dimen>
 
 	<dimen name="thumbnail_margin">8dp</dimen>
+
+	<dimen name="galleryblock_thumbnail_thin">50dp</dimen>
+	<dimen name="galleryblock_thumbnail_normal">150dp</dimen>
 </resources>

app/src/main/res/values/strings.xml

@@ -154,6 +154,7 @@
 
     <string name="settings_miscellaneous_title">Miscellaneous</string>
     <string name="settings_mirror_summary">Load images from mirrors</string>
+    <string name="settings_proxy_title">Proxy</string>
     <string name="settings_security_mode_title">Enable security mode</string>
     <string name="settings_security_mode_summary">Enable security mode to make the screen invisible on recent app window</string>
     <string name="settings_dark_mode_title">Dark mode</string>
@@ -189,4 +190,13 @@
     <string name="default_query_dialog_language_selector_none">Any</string>
     <string name="settings_mirror_title">Mirrors</string>
 
+    <!-- PROXY DIALOG -->
+    <string name="proxy_dialog_type">type</string>
+    <string name="proxy_dialog_addr_hint">address</string>
+    <string name="proxy_dialog_port_hint">port</string>
+    <string name="proxy_dialog_username_hint">username</string>
+    <string name="proxy_dialog_password_hint">password</string>
+    <string name="proxy_dialog_error">Wrong value</string>
+    <string name="proxy_dialog_server">server</string>
+
 </resources>

app/src/main/res/xml/root_preferences.xml

@@ -48,7 +48,7 @@
             app:title="@string/settings_dl_location"/>
 
         <SwitchPreferenceCompat
-            app:key="dl_low_quality"
+            app:key="low_quality"
             app:title="@string/settings_low_quality"
             app:summary="@string/settings_low_quality_summary"/>
 
@@ -71,6 +71,10 @@
             app:title="@string/settings_mirror_title"
             app:summary="@string/settings_mirror_summary"/>
 
+        <Preference
+            app:key="proxy"
+            app:title="@string/settings_proxy_title"/>
+
         <SwitchPreferenceCompat
             app:key="security_mode"
             app:title="@string/settings_security_mode_title"

libpupil/src/main/java/xyz/quaver/Utils.kt

@@ -16,6 +16,10 @@
 
 package xyz.quaver
 
+import java.net.Proxy
+
+var proxy = Proxy.NO_PROXY
+
 fun availableInHiyobi(galleryID: Int) : Boolean {
     return try {
         xyz.quaver.hiyobi.getReader(galleryID)

libpupil/src/main/java/xyz/quaver/hitomi/common.kt

@@ -17,7 +17,7 @@
 package xyz.quaver.hitomi
 
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.list
+import xyz.quaver.proxy
 import java.net.URL
 
 const val protocol = "https:"
@@ -25,10 +25,10 @@ const val protocol = "https:"
 @Suppress("EXPERIMENTAL_API_USAGE")
 fun getGalleryInfo(galleryID: Int) =
     Json.nonstrict.parse(
-        GalleryInfo.serializer().list,
-        Regex("""\[.+]""").find(
-            URL("$protocol//$domain/galleries/$galleryID.js").readText()
-        )?.value ?: "[]"
+        GalleryInfo.serializer(),
+        URL("$protocol//$domain/galleries/$galleryID.js").openConnection(proxy).getInputStream().use {
+            it.reader().readText()
+        }.replace("var galleryinfo = ", "")
     )
 
 //common.js
@@ -68,6 +68,7 @@ fun urlFromURL(url: String, base: String? = null) : String {
     return url.replace(Regex("""//..?\.hitomi\.la/"""), "//${subdomainFromURL(url, base)}.hitomi.la/")
 }
 
+
 fun fullPathFromHash(hash: String?) : String? {
     return when {
         (hash?.length ?: 0) < 3 -> hash
@@ -76,11 +77,20 @@ fun fullPathFromHash(hash: String?) : String? {
 }
 
 @Suppress("NAME_SHADOWING", "UNUSED_PARAMETER")
-fun urlFromHash(galleryID: Int, image: GalleryInfo, dir: String? = null, ext: String? = null) : String {
+fun urlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null) : String {
     val ext = ext ?: dir ?: image.name.split('.').last()
     val dir = dir ?: "images"
     return "$protocol//a.hitomi.la/$dir/${fullPathFromHash(image.hash)}.$ext"
 }
 
-fun urlFromUrlFromHash(galleryID: Int, image: GalleryInfo, dir: String? = null, ext: String? = null, base: String? = null) =
-    urlFromURL(urlFromHash(galleryID, image, dir, ext), base)
+fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null) =
+    urlFromURL(urlFromHash(galleryID, image, dir, ext), base)
+
+fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean) : String {
+    val webp = if (image.hash != null && image.haswebp != 0 && !noWebp)
+        "webp"
+    else
+        null
+
+    return urlFromUrlFromHash(galleryID, image, webp)
+}

libpupil/src/main/java/xyz/quaver/hitomi/galleries.kt

@@ -18,6 +18,7 @@ package xyz.quaver.hitomi
 
 import kotlinx.serialization.Serializable
 import org.jsoup.Jsoup
+import xyz.quaver.proxy
 import java.net.URLDecoder
 
 @Serializable
@@ -36,7 +37,7 @@ data class Gallery(
     val thumbnails: List<String>
 )
 fun getGallery(galleryID: Int) : Gallery {
-    val url = Jsoup.connect("https://hitomi.la/galleries/$galleryID.html").get()
+    val url = Jsoup.connect("https://hitomi.la/galleries/$galleryID.html").proxy(proxy).get()
         .select("a").attr("href")
 
     val doc = Jsoup.connect(url).get()
@@ -70,7 +71,7 @@ fun getGallery(galleryID: Int) : Gallery {
         href.slice(5 until href.indexOf('-'))
     }
 
-    val thumbnails = getGalleryInfo(galleryID).map { galleryInfo ->
+    val thumbnails = getGalleryInfo(galleryID).files.map { galleryInfo ->
         urlFromUrlFromHash(galleryID, galleryInfo, "smalltn", "jpg", "tn")
     }
 

libpupil/src/main/java/xyz/quaver/hitomi/galleryblock.kt

@@ -19,6 +19,7 @@ package xyz.quaver.hitomi
 import kotlinx.serialization.Serializable
 import org.jsoup.Jsoup
 import xyz.quaver.Code
+import xyz.quaver.proxy
 import java.net.URL
 import java.net.URLDecoder
 import java.nio.ByteBuffer
@@ -78,7 +79,7 @@ data class GalleryBlock(
 fun getGalleryBlock(galleryID: Int) : GalleryBlock? {
     val url = "$protocol//$domain/$galleryblockdir/$galleryID$extension"
 
-    val doc = Jsoup.connect(url).get()
+    val doc = Jsoup.connect(url).proxy(proxy).get()
 
     val galleryUrl = doc.selectFirst(".lillie").attr("href")
 

libpupil/src/main/java/xyz/quaver/hitomi/reader.kt

@@ -17,28 +17,35 @@
 package xyz.quaver.hitomi
 
 import kotlinx.serialization.Serializable
-import org.jsoup.Jsoup
 import xyz.quaver.Code
 
 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? = null,
     val haswebp: Int = 0,
     val name: String,
-    val height: Int
+    val height: Int,
+    val hasavif: Int = 0
 )
 
 @Serializable
-data class Reader(val code: Code, val title: String, val galleryInfo: List<GalleryInfo>)
+data class Reader(val code: Code, val galleryInfo: GalleryInfo)
 
 //Set header `Referer` to reader url to avoid 403 error
 fun getReader(galleryID: Int) : Reader {
-    val readerUrl = "https://hitomi.la/reader/$galleryID.html"
-
-    val doc = Jsoup.connect(readerUrl).get()
-
-   return Reader(Code.HITOMI, doc.title(), getGalleryInfo(galleryID))
+   return Reader(Code.HITOMI, getGalleryInfo(galleryID))
 }

libpupil/src/main/java/xyz/quaver/hitomi/search.kt

@@ -16,6 +16,7 @@
 
 package xyz.quaver.hitomi
 
+import xyz.quaver.proxy
 import java.net.URL
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
@@ -49,8 +50,9 @@ fun sanitize(input: String) : String {
 
 fun getIndexVersion(name: String) : String {
     return try {
-        URL("$protocol//$domain/$name/version?_=${System.currentTimeMillis()}")
-            .readText()
+        URL("$protocol//$domain/$name/version?_=${System.currentTimeMillis()}").openConnection(proxy).getInputStream().use {
+            it.reader().readText()
+        }
     } catch (e: Exception) {
         ""
     }
@@ -173,7 +175,9 @@ fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : List
                 else -> "$protocol//$domain/$compressed_nozomi_prefix/$area/$tag-$language$nozomiextension"
             }
 
-    val bytes = URL(nozomiAddress).readBytes()
+    val bytes = URL(nozomiAddress).openConnection(proxy).getInputStream().use {
+        it.readBytes()
+    }
 
     val nozomi = ArrayList<Int>()
 
@@ -238,7 +242,7 @@ fun getNodeAtAddress(field: String, address: Long) : Node? {
 
 fun getURLAtRange(url: String, range: LongRange) : ByteArray? {
     try {
-        with (URL(url).openConnection() as HttpsURLConnection) {
+        with (URL(url).openConnection(proxy) as HttpsURLConnection) {
             requestMethod = "GET"
 
             setRequestProperty("Range", "bytes=${range.first}-${range.last}")

libpupil/src/main/java/xyz/quaver/hiyobi/galleryblock.kt

@@ -20,11 +20,12 @@ import org.jsoup.Jsoup
 import xyz.quaver.Code
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.protocol
+import xyz.quaver.proxy
 
 fun getGalleryBlock(galleryID: Int) : GalleryBlock? {
     val url = "$protocol//$hiyobi/info/$galleryID"
 
-    val doc = Jsoup.connect(url).get()
+    val doc = Jsoup.connect(url).proxy(proxy).get()
 
     val galleryBlock = doc.selectFirst(".gallery-content")
 

libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt

@@ -16,13 +16,16 @@
 
 package xyz.quaver.hiyobi
 
+import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.list
 import org.jsoup.Jsoup
 import xyz.quaver.Code
+import xyz.quaver.hitomi.GalleryFiles
 import xyz.quaver.hitomi.GalleryInfo
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.hitomi.protocol
+import xyz.quaver.proxy
 import java.net.URL
 import javax.net.ssl.HttpsURLConnection
 
@@ -47,7 +50,7 @@ fun renewCookie() : String {
     val url = "https://$hiyobi/"
 
     try {
-        with(URL(url).openConnection() as HttpsURLConnection) {
+        with(URL(url).openConnection(proxy) as HttpsURLConnection) {
             setRequestProperty("User-Agent", user_agent)
             connectTimeout = 2000
             connect()
@@ -58,16 +61,16 @@ fun renewCookie() : String {
     }
 }
 
+@UseExperimental(UnstableDefault::class)
 fun getReader(galleryID: Int) : Reader {
     val reader = "https://$hiyobi/reader/$galleryID"
-    val url = "https://$hiyobi/data/json/${galleryID}_list.json"
+    val url = "https://cdn.hiyobi.me/data/json/${galleryID}_list.json"
 
-    val title = Jsoup.connect(reader).get().title()
+    val title = Jsoup.connect(reader).proxy(proxy).get().title()
 
-    @Suppress("EXPERIMENTAL_API_USAGE")
-    val galleryInfo = Json.parse(
-        GalleryInfo.serializer().list,
-        with(URL(url).openConnection() as HttpsURLConnection) {
+    val galleryFiles = Json.nonstrict.parse(
+        GalleryFiles.serializer().list,
+        with(URL(url).openConnection(proxy) as HttpsURLConnection) {
             setRequestProperty("User-Agent", user_agent)
             setRequestProperty("Cookie", cookie)
             connectTimeout = 2000
@@ -77,14 +80,14 @@ fun getReader(galleryID: Int) : Reader {
         }
     )
 
-    return Reader(Code.HIYOBI, title, galleryInfo)
+    return Reader(Code.HIYOBI, GalleryInfo(title = title, files = galleryFiles))
 }
 
 fun createImgList(galleryID: Int, reader: Reader, lowQuality: Boolean = false) =
     if (lowQuality)
-        reader.galleryInfo.map {
-            val name = it.name.replace(Regex("/.[^/.]+$"), "") + ".jpg"
-            Images("$protocol//$hiyobi/data/$galleryID/$name.jpg", galleryID, it.name)
+        reader.galleryInfo.files.map {
+            val name = it.name.replace(Regex("""\.[^/.]+$"""), "")
+            Images("$protocol//$hiyobi/data_r/$galleryID/$name.jpg", galleryID, it.name)
         }
     else
-        reader.galleryInfo.map { Images("$protocol//$hiyobi/data/$galleryID/${it.name}", galleryID, it.name) }
+        reader.galleryInfo.files.map { Images("$protocol//$hiyobi/data/$galleryID/${it.name}", galleryID, it.name) }

libpupil/src/test/java/xyz/quaver/hitomi/UnitTest.kt

@@ -82,14 +82,14 @@ class UnitTest {
 
     @Test
     fun test_hiyobi() {
-        val reader = xyz.quaver.hiyobi.getReader(10000062)
+        val reader = xyz.quaver.hiyobi.getReader(1574736)
 
         print(reader)
     }
 
     @Test
     fun test_urlFromUrlFromHash() {
-        val url = urlFromUrlFromHash(1531795, GalleryInfo(
+        val url = urlFromUrlFromHash(1531795, GalleryFiles(
             212, "719d46a7556be0d0021c5105878507129b5b3308b02cf67f18901b69dbb3b5ef", 1, "00.jpg", 300
         ), "webp")