Merge pull request #67 from tom5079/dev

Version 4.6

.idea/codeStyles/Project.xml

@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <option name="RIGHT_MARGIN" value="120" />
     <AndroidXmlCodeStyleSettings>
       <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
     </AndroidXmlCodeStyleSettings>

.idea/kotlinCodeInsightSettings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinCodeInsightWorkspaceSettings">
+    <option name="addUnambiguousImportsOnTheFly" value="true" />
+    <option name="optimizeImportsOnTheFly" value="true" />
+  </component>
+</project>

.idea/kotlinc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="1.8" />
+  </component>
+</project>

.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/gh-pages" vcs="Git" />
   </component>
 </project>

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("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'
@@ -19,19 +19,27 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 32
+        versionCode 42
-        versionName "4.3-hotfix1"
+        versionName "4.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
-        release {
+        debug {
-            minifyEnabled false
+            debuggable true
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-DEBUG"
+
+            buildConfigField('Boolean', 'CENSOR', 'false')
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
-        buildTypes.each {
+        release {
-            it.buildConfigField('boolean', 'CENSOR', 'false')
+            minifyEnabled true
+            shrinkResources true
+
+            buildConfigField('Boolean', 'CENSOR', 'false')
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     kotlinOptions {
@@ -57,26 +65,27 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     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'
     implementation 'com.github.arimorty:floatingsearchview:2.1.1'
     implementation 'com.github.clans:fab:1.6.4'
-    implementation 'com.github.bumptech.glide:glide:4.10.0'
+
-    implementation ("com.github.bumptech.glide:recyclerview-integration:4.10.0") {
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
+    implementation ("com.github.bumptech.glide:recyclerview-integration:4.11.0") {
         transitive = false
     }
+
+    implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
     implementation "ru.noties.markwon:core:${markwonVersion}"
-    kapt 'com.github.bumptech.glide:compiler:4.10.0'
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:rules:1.2.0'

app/proguard-rules.pro

@@ -18,4 +18,13 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-dontobfuscate
+
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":32,"versionName":"4.3-hotfix1","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/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt

@@ -25,11 +25,7 @@ import androidx.core.content.ContextCompat
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
-import kotlinx.serialization.ImplicitReflectionSerializer
+import kotlinx.coroutines.runBlocking
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.json.JsonObject
-import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 import xyz.quaver.hiyobi.cookie
@@ -37,9 +33,8 @@ import xyz.quaver.hiyobi.createImgList
 import xyz.quaver.hiyobi.getReader
 import xyz.quaver.hiyobi.user_agent
 import xyz.quaver.pupil.ui.LockActivity
-import xyz.quaver.pupil.util.getDownloadDirectory
+import xyz.quaver.pupil.util.download.Cache
-import xyz.quaver.pupil.util.updateOldReaderGalleries
+import xyz.quaver.pupil.util.download.DownloadWorker
-import java.io.File
 import java.net.URL
 import javax.net.ssl.HttpsURLConnection
 
@@ -55,8 +50,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        Log.i("PUPILD", getDownloadDirectory(appContext).absolutePath ?: "")
-        assertEquals("xyz.quaver.pupil", appContext.packageName)
     }
 
     @Test
@@ -85,37 +78,36 @@ class ExampleInstrumentedTest {
         Log.d("Pupil", data.size.toString())
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     @Test
-    fun test_deleteCodeFromReader() {
+    fun test_downloadWorker() {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
 
-        val json = Json(JsonConfiguration.Stable)
+        val galleryID = 515515
 
-        listOf(
+        val worker = DownloadWorker.getInstance(context)
-            getDownloadDirectory(context),
-            File(context.cacheDir, "imageCache")
-        ).forEach { root ->
-            root.listFiles()?.forEach gallery@{ gallery ->
-                val reader = json.parseJson(File(gallery, "reader.json").apply {
-                    if (!exists())
-                        return@gallery
-                }.readText())
-                    .jsonObject.toMutableMap()
 
-                Log.d("PUPILD", gallery.name)
+        worker.queue.add(galleryID)
 
-                reader.remove("code")
+        while(worker.progress.indexOfKey(galleryID) < 0 || worker.progress[galleryID] != null) {
+            Log.i("PUPILD", worker.progress[galleryID]?.joinToString(" ") ?: "null")
 
-                File(gallery, "reader.json").writeText(JsonObject(reader).toString())
+            if (worker.progress[galleryID]?.all { !it.isFinite() } == true)
-            }
+                break
         }
+
+        Log.i("PUPILD", "DONE!!")
     }
 
     @Test
-    fun test_updateOldReader() {
+    fun test_getReaderOrNull() {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
 
-        updateOldReaderGalleries(context)
+        val galleryID = 1561552
+
+        runBlocking {
+            Log.i("PUPILD", Cache(context).getReader(galleryID)?.title ?: "null")
+        }
+
+        Log.i("PUPILD", Cache(context).getReaderOrNull(galleryID)?.title ?: "null")
     }
 }

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

@@ -0,0 +1,22 @@
+<?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 xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name" translatable="false" tools:override="true">Pupil-Debug</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -6,6 +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.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:name=".Pupil"
@@ -16,10 +18,11 @@
         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}.fileprovider"
+            android:authorities="${applicationId}.provider"
             android:name="androidx.core.content.FileProvider"
             android:exported="false"
             android:grantUriPermissions="true">
@@ -116,6 +119,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name="net.rdrei.android.dirchooser.DirectoryChooserActivity" />
     </application>
 
 </manifest>

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

@@ -30,17 +30,15 @@ import androidx.preference.PreferenceManager
 import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.android.gms.common.GooglePlayServicesRepairableException
 import com.google.android.gms.security.ProviderInstaller
-import kotlinx.coroutines.CoroutineScope
+import com.google.firebase.analytics.FirebaseAnalytics
-import kotlinx.coroutines.Dispatchers
+import xyz.quaver.proxy
-import kotlinx.coroutines.launch
 import xyz.quaver.pupil.util.Histories
-import xyz.quaver.pupil.util.updateOldReaderGalleries
+import xyz.quaver.pupil.util.getProxy
 import java.io.File
 
 class Pupil : MultiDexApplication() {
 
     lateinit var histories: Histories
-    lateinit var downloads: Histories
     lateinit var favorites: Histories
 
     init {
@@ -50,10 +48,20 @@ class Pupil : MultiDexApplication() {
     override fun onCreate() {
         val preference = PreferenceManager.getDefaultSharedPreferences(this)
 
+        proxy = getProxy(this)
+
+        try {
+            preference.getString("dl_location", null)
+        } catch (e: Exception) {
+            preference.edit().remove("dl_location").apply()
+        }
+
         histories = Histories(File(ContextCompat.getDataDir(this), "histories.json"))
-        downloads = Histories(File(ContextCompat.getDataDir(this), "downloads.json"))
         favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json"))
 
+        if (BuildConfig.DEBUG)
+            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)
+
         try {
             ProviderInstaller.installIfNeeded(this)
         } catch (e: GooglePlayServicesRepairableException) {
@@ -64,7 +72,7 @@ class Pupil : MultiDexApplication() {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-            val channel = NotificationChannel("download", getString(R.string.channel_download), NotificationManager.IMPORTANCE_LOW).apply {
+            val channel = NotificationChannel("download", getString(R.string.channel_download), NotificationManager.IMPORTANCE_MIN).apply {
                 description = getString(R.string.channel_download_description)
                 enableLights(false)
                 enableVibration(false)
@@ -73,15 +81,12 @@ class Pupil : MultiDexApplication() {
             manager.createNotificationChannel(channel)
         }
 
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         AppCompatDelegate.setDefaultNightMode(when (preference.getBoolean("dark_mode", false)) {
             true -> AppCompatDelegate.MODE_NIGHT_YES
             false -> AppCompatDelegate.MODE_NIGHT_NO
         })
 
-        CoroutineScope(Dispatchers.IO).launch {
-            updateOldReaderGalleries(this@Pupil)
-        }
-
         super.onCreate()
     }
 

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

@@ -18,7 +18,9 @@
 
 package xyz.quaver.pupil.adapters
 
+import android.content.Context
 import android.graphics.drawable.Drawable
+import android.util.Base64
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.View
@@ -27,9 +29,10 @@ import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.bumptech.glide.RequestManager
+import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.daimajia.swipe.SwipeLayout
 import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
@@ -37,28 +40,22 @@ import com.daimajia.swipe.interfaces.SwipeAdapterInterface
 import com.google.android.material.chip.Chip
 import kotlinx.android.synthetic.main.item_galleryblock.view.*
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
 import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.Reader
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.util.GalleryDownloader
 import xyz.quaver.pupil.util.Histories
-import xyz.quaver.pupil.util.getCachedGallery
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.DownloadWorker
 import xyz.quaver.pupil.util.wordCapitalize
-import java.io.File
 import java.util.*
 import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
 import kotlin.concurrent.schedule
 
-class GalleryBlockAdapter(private val glide: RequestManager, private val galleries: List<Pair<GalleryBlock, Deferred<String>>>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
+class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryBlock>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
 
     enum class ViewType {
         NEXT,
@@ -66,10 +63,58 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
         PREV
     }
 
+    private val glide = Glide.with(context)
     private lateinit var favorites: Histories
 
+    val timer = Timer()
+
     inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
-        fun bind(item: Pair<GalleryBlock, Deferred<String>>) {
+        var timerTask: TimerTask? = null
+
+        private fun updateProgress(context: Context, galleryID: Int) {
+            val cache = Cache(context).getCachedGallery(galleryID)
+            val reader = Cache(context).getReaderOrNull(galleryID)
+
+            CoroutineScope(Dispatchers.Main).launch {
+                if (reader == null) {
+                    view.galleryblock_progressbar.visibility = View.GONE
+                    view.galleryblock_progress_complete.visibility = View.GONE
+                    return@launch
+                }
+
+                with(view.galleryblock_progressbar) {
+
+                    progress = cache.listFiles()?.count { file ->
+                        Regex("^[0-9]+.+\$").matches(file.name)
+                    } ?: 0
+
+                    if (visibility == View.GONE) {
+                        visibility = View.VISIBLE
+                        max = reader.galleryInfo.files.size
+                    }
+
+                    if (progress == max) {
+                        if (completeFlag.get(galleryID, false)) {
+                            with(view.galleryblock_progress_complete) {
+                                setImageResource(R.drawable.ic_progressbar)
+                                visibility = View.VISIBLE
+                            }
+                        } else {
+                            with(view.galleryblock_progress_complete) {
+                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete).apply {
+                                    this?.start()
+                                })
+                                visibility = View.VISIBLE
+                            }
+                            completeFlag.put(galleryID, true)
+                        }
+                    } else
+                        view.galleryblock_progress_complete.visibility = View.INVISIBLE
+                }
+            }
+        }
+
+        fun bind(galleryBlock: GalleryBlock) {
             with(view) {
                 val resources = context.resources
                 val languages = resources.getStringArray(R.array.languages).map {
@@ -78,16 +123,23 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                     }
                 }.toMap()
 
-                val (galleryBlock: GalleryBlock, thumbnail: Deferred<String>) = item
-
                 val artists = galleryBlock.artists
                 val series = galleryBlock.series
 
+                galleryblock_thumbnail.setImageDrawable(CircularProgressDrawable(context).also {
+                    it.start()
+                })
+
                 CoroutineScope(Dispatchers.Main).launch {
-                    val cache = thumbnail.await()
+                    val thumbnail = Cache(context).getThumbnail(galleryBlock.id).let {
+                        if (it != null)
+                            Base64.decode(it, Base64.DEFAULT)
+                        else
+                            null
+                    }
 
                     glide
-                        .load(cache)
+                        .load(thumbnail)
                         .skipMemoryCache(true)
                         .diskCacheStrategy(DiskCacheStrategy.NONE)
                         .error(R.drawable.image_broken_variant)
@@ -99,75 +151,28 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                 }
 
                 //Check cache
-                val readerCache = { File(getCachedGallery(context, galleryBlock.id), "reader.json") }
+                val cache = Cache(context).getCachedGallery(galleryBlock.id)
-                val imageCache = { File(getCachedGallery(context, galleryBlock.id), "images") }
+                val reader = Cache(context).getReaderOrNull(galleryBlock.id)
 
-                try {
+                if (reader != null) {
-                   Json(JsonConfiguration.Stable)
+                    val count = cache.listFiles()?.count {
-                        .parse(Reader.serializer(), readerCache.invoke().readText())
+                        Regex("^[0-9]+.+\$").matches(it.name)
-                } catch(e: Exception) {
+                    } ?: 0
-                    readerCache.invoke().delete()
-                }
-
-                if (readerCache.invoke().exists()) {
-                    val reader = Json(JsonConfiguration.Stable)
-                        .parse(Reader.serializer(), readerCache.invoke().readText())
 
                     with(galleryblock_progressbar) {
-                        max = reader.galleryInfo.size
+                        max = reader.galleryInfo.files.size
-                        progress = imageCache.invoke().list()?.size ?: 0
+                        progress = count
 
                         visibility = View.VISIBLE
                     }
-                } else {
+                } else
                     galleryblock_progressbar.visibility = View.GONE
-                }
 
-                if (refreshTasks[this@GalleryViewHolder] == null) {
+                if (timerTask == null)
-                    val refresh = Timer(false).schedule(0, 1000) {
+                    timerTask = timer.schedule(0, 1000) {
-                        post {
+                        updateProgress(context, galleryBlock.id)
-                            with(view.galleryblock_progressbar) {
-                                progress = imageCache.invoke().list()?.size ?: 0
-
-                                if (!readerCache.invoke().exists()) {
-                                    visibility = View.GONE
-                                    max = 0
-                                    progress = 0
-
-                                    view.galleryblock_progress_complete.visibility = View.INVISIBLE
-                                } else {
-                                    if (visibility == View.GONE) {
-                                        val reader = Json(JsonConfiguration.Stable)
-                                            .parse(Reader.serializer(), readerCache.invoke().readText())
-                                        max = reader.galleryInfo.size
-                                        visibility = View.VISIBLE
-                                    }
-
-                                    if (progress == max) {
-                                        if (completeFlag.get(galleryBlock.id, false)) {
-                                            with(view.galleryblock_progress_complete) {
-                                                setImageResource(R.drawable.ic_progressbar)
-                                                visibility = View.VISIBLE
-                                            }
-                                        } else {
-                                            with(view.galleryblock_progress_complete) {
-                                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete).apply {
-                                                    this?.start()
-                                                })
-                                                visibility = View.VISIBLE
-                                            }
-                                            completeFlag.put(galleryBlock.id, true)
-                                        }
-                                    } else
-                                        view.galleryblock_progress_complete.visibility = View.INVISIBLE
-                                }
-                            }
-                        }
                     }
 
-                    refreshTasks[this@GalleryViewHolder] = refresh
-                }
-
                 galleryblock_title.text = galleryBlock.title
                 with(galleryblock_artist) {
                     text = artists.joinToString(", ") { it.wordCapitalize() }
@@ -277,7 +282,6 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
         }
     }
 
-    private val refreshTasks = HashMap<GalleryViewHolder, TimerTask>()
     val completeFlag = SparseBooleanArray()
 
     val onChipClickedHandler = ArrayList<((Tag) -> Unit)>()
@@ -336,10 +340,11 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                 override fun onStartOpen(layout: SwipeLayout?) {
                     mItemManger.closeAllExcept(layout)
 
-                    holder.view.galleryblock_download.text = when(GalleryDownloader.get(gallery.first.id)) {
+                    holder.view.galleryblock_download.text =
-                        null -> holder.view.context.getString(R.string.main_download)
+                        if (DownloadWorker.getInstance(holder.view.context).progress.indexOfKey(gallery.id) < 0)
-                        else -> holder.view.context.getString(android.R.string.cancel)
+                            holder.view.context.getString(R.string.main_download)
-                    }
+                        else
+                            holder.view.context.getString(android.R.string.cancel)
                 }
 
                 override fun onClose(layout: SwipeLayout?) {}
@@ -355,10 +360,8 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
         super.onViewDetachedFromWindow(holder)
 
         if (holder is GalleryViewHolder) {
-            val task = refreshTasks[holder] ?: return
+            holder.timerTask?.cancel()
-
+            holder.timerTask = null
-            task.cancel()
-            refreshTasks.remove(holder)
         }
     }
 

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

@@ -0,0 +1,85 @@
+/*
+ *     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.adapters
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.android.synthetic.main.item_mirrors.view.*
+import xyz.quaver.pupil.R
+import java.util.*
+
+class MirrorAdapter(context: Context) : RecyclerView.Adapter<MirrorAdapter.ViewHolder>() {
+
+    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
+
+    val mirrors = context.resources.getStringArray(R.array.mirrors).map {
+        it.split('|').let { split ->
+            Pair(split.first(), split.last())
+        }
+    }.toMap()
+
+    val list = mirrors.keys.toMutableList().apply {
+        PreferenceManager.getDefaultSharedPreferences(context)
+            .getString("mirrors", "")!!
+            .split(">")
+            .reversed()
+            .forEach {
+                if (this.contains(it)) {
+                    this.remove(it)
+                    this.add(0, it)
+                }
+            }
+    }
+
+    val onItemMove : ((Int, Int) -> Unit) = { from, to ->
+        Collections.swap(list, from, to)
+        notifyItemMoved(from, to)
+        onItemMoved?.invoke(list)
+    }
+    var onStartDrag : ((ViewHolder) -> Unit)? = null
+    var onItemMoved : ((List<String>) -> (Unit))? = null
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        with(holder.view) {
+            mirror_name.text = mirrors[list.elementAt(position)]
+            mirror_button.setOnTouchListener { _, event ->
+                if (event.action == MotionEvent.ACTION_DOWN)
+                    onStartDrag?.invoke(holder)
+
+                true
+            }
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return LayoutInflater.from(parent.context).inflate(
+            R.layout.item_mirrors, parent, false
+        ).let {
+            ViewHolder(it)
+        }
+    }
+
+    override fun getItemCount() = mirrors.size
+
+}

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

@@ -18,24 +18,71 @@
 
 package xyz.quaver.pupil.adapters
 
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.RequestManager
+import com.bumptech.glide.Glide
+import com.bumptech.glide.ListPreloader
+import com.bumptech.glide.RequestBuilder
+import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.crashlytics.android.Crashlytics
+import io.fabric.sdk.android.Fabric
+import kotlinx.android.synthetic.main.item_reader.view.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import xyz.quaver.hitomi.Reader
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.getCachedGallery
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.DownloadWorker
 import java.io.File
+import java.util.*
+import kotlin.concurrent.schedule
+import kotlin.math.roundToInt
 
-class ReaderAdapter(private val glide: RequestManager,
+class ReaderAdapter(private val context: Context,
-                    private val galleryID: Int,
+                    private val galleryID: Int) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
-                    private val images: List<String>) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+
+    val glide = Glide.with(context)
+
+    //region Glide.RecyclerView
+    val sizeProvider = ListPreloader.PreloadSizeProvider<File> { _, _, position ->
+        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)?.getOrNull(position)).filterNotNullTo(mutableListOf())
+        }
+
+        override fun getPreloadRequestBuilder(item: File): RequestBuilder<*>? {
+            return glide
+                .load(item)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .skipMemoryCache(true)
+                .error(R.drawable.image_broken_variant)
+                .apply {
+                    if (BuildConfig.CENSOR)
+                        override(5, 8)
+                }
+        }
+    }
+    val preloader = RecyclerViewPreloader<File>(glide, modelProvider, sizeProvider, 10)
+    //endregion
+
+    var reader: Reader? = null
+    val timer = Timer()
 
     var isFullScreen = false
 
+    var onItemClickListener : ((Int) -> (Unit))? = null
+
     class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -47,26 +94,73 @@ class ReaderAdapter(private val glide: RequestManager,
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.view as ImageView
+        holder.view as ConstraintLayout
 
-        if (isFullScreen)
+        if (isFullScreen) {
             holder.view.layoutParams.height = RecyclerView.LayoutParams.MATCH_PARENT
-        else
+            holder.view.container.layoutParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT
+        } else {
             holder.view.layoutParams.height = RecyclerView.LayoutParams.WRAP_CONTENT
+            holder.view.container.layoutParams.height = 0
+        }
 
-        glide
+        holder.view.image.setOnPhotoTapListener { _, _, _ ->
-            .load(File(getCachedGallery(holder.view.context, galleryID), images[position]))
+            onItemClickListener?.invoke(position)
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
+        }
-            .skipMemoryCache(true)
+
-            .error(R.drawable.image_broken_variant)
+        holder.view.container.setOnClickListener {
-            .dontTransform()
+            onItemClickListener?.invoke(position)
-            .apply {
+        }
-                if (BuildConfig.CENSOR)
+
-                    override(5, 8)
+        if (!isFullScreen)
+            (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
+                .dimensionRatio = "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
+
+        holder.view.reader_index.text = (position+1).toString()
+
+        val images = Cache(context).getImage(galleryID, position)
+
+        if (images != null) {
+            glide
+                .load(images)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .skipMemoryCache(true)
+                .error(R.drawable.image_broken_variant)
+                .apply {
+                    if (BuildConfig.CENSOR)
+                        override(5, 8)
+                }
+                .into(holder.view.image)
+        } else {
+            val progress = DownloadWorker.getInstance(context).progress[galleryID]?.get(position)
+
+            if (progress?.isNaN() == true) {
+                if (Fabric.isInitialized())
+                    Crashlytics.logException(DownloadWorker.getInstance(context).exception[galleryID]?.get(position))
+
+                glide
+                    .load(R.drawable.image_broken_variant)
+                    .into(holder.view.image)
+
+                return
+            } else {
+                holder.view.reader_item_progressbar.progress =
+                    if (progress?.isInfinite() == true)
+                        100
+                    else
+                        progress?.roundToInt() ?: 0
+
+                holder.view.image.setImageDrawable(null)
             }
-            .into(holder.view)
+
+            timer.schedule(1000) {
+                CoroutineScope(Dispatchers.Main).launch {
+                    notifyItemChanged(position)
+                }
+            }
+        }
     }
 
-    override fun getItemCount() = images.size
+    override fun getItemCount() = reader?.galleryInfo?.files?.size ?: 0
 
 }

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

@@ -45,17 +45,17 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.arlib.floatingsearchview.FloatingSearchView
 import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
 import com.arlib.floatingsearchview.util.view.SearchInputView
-import com.bumptech.glide.Glide
+import com.crashlytics.android.Crashlytics
 import com.google.android.material.appbar.AppBarLayout
+import io.fabric.sdk.android.Fabric
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.activity_main_content.*
 import kotlinx.coroutines.*
-import kotlinx.serialization.ImplicitReflectionSerializer
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.list
-import kotlinx.serialization.stringify
+import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.*
+import xyz.quaver.hitomi.doSearch
+import xyz.quaver.hitomi.getGalleryIDsFromNozomi
+import xyz.quaver.hitomi.getSuggestionsForQuery
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
@@ -64,11 +64,10 @@ import xyz.quaver.pupil.types.TagSuggestion
 import xyz.quaver.pupil.types.Tags
 import xyz.quaver.pupil.ui.dialog.GalleryDialog
 import xyz.quaver.pupil.util.*
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.DownloadWorker
 import java.io.File
-import java.io.FileOutputStream
-import java.net.URL
 import java.util.*
-import javax.net.ssl.HttpsURLConnection
 import kotlin.collections.ArrayList
 import kotlin.math.abs
 import kotlin.math.ceil
@@ -89,7 +88,7 @@ class MainActivity : AppCompatActivity() {
         POPULAR
     }
 
-    private val galleries = ArrayList<Pair<GalleryBlock, Deferred<String>>>()
+    private val galleries = ArrayList<GalleryBlock>()
 
     private var query = ""
     set(value) {
@@ -112,7 +111,6 @@ class MainActivity : AppCompatActivity() {
     private var currentPage = 0
 
     private lateinit var histories: Histories
-    private lateinit var downloads: Histories
     private lateinit var favorites: Histories
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -128,6 +126,7 @@ class MainActivity : AppCompatActivity() {
                     finish()
                 }
             }.show()
+
             return
         }
 
@@ -150,7 +149,6 @@ class MainActivity : AppCompatActivity() {
 
         with(application as Pupil) {
             this@MainActivity.histories = histories
-            this@MainActivity.downloads = downloads
             this@MainActivity.favorites = favorites
         }
 
@@ -176,6 +174,12 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+
+        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.timer?.cancel()
+    }
+
     override fun onResume() {
         val preferences = PreferenceManager.getDefaultSharedPreferences(this)
 
@@ -386,7 +390,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun setupRecyclerView() {
         with(main_recyclerview) {
-            adapter = GalleryBlockAdapter(Glide.with(this@MainActivity), galleries).apply {
+            adapter = GalleryBlockAdapter(this@MainActivity, galleries).apply {
                 onChipClickedHandler.add {
                     runOnUiThread {
                         query = it.toQuery()
@@ -399,16 +403,18 @@ class MainActivity : AppCompatActivity() {
                     }
                 }
                 onDownloadClickedHandler = { position ->
-                    val galleryID = galleries[position].first.id
+                    val galleryID = galleries[position].id
 
                     if (!completeFlag.get(galleryID, false)) {
-                        val downloader = GalleryDownloader.get(galleryID)
+                        val worker = DownloadWorker.getInstance(context)
 
-                        if (downloader == null)
+                        if (worker.progress.indexOfKey(galleryID) >= 0)     //download in progress
-                            GalleryDownloader(context, galleryID, true).start()
+                            worker.cancel(galleryID)
                         else {
-                            downloader.cancel()
+                            Cache(context).setDownloading(galleryID, true)
-                            downloader.clearNotification()
+
+                            if (!worker.queue.contains(galleryID))
+                                worker.queue.add(galleryID)
                         }
                     }
 
@@ -416,39 +422,22 @@ class MainActivity : AppCompatActivity() {
                 }
 
                 onDeleteClickedHandler = { position ->
-                    val galleryID = galleries[position].first.id
+                    val galleryID = galleries[position].id
 
                     CoroutineScope(Dispatchers.Default).launch {
-                        with(GalleryDownloader[galleryID]) {
+                        DownloadWorker.getInstance(context).cancel(galleryID)
-                            this?.cancelAndJoin()
-                            this?.clearNotification()
-                        }
-                        val cache = File(cacheDir, "imageCache/${galleryID}")
-                        val data = getCachedGallery(context, galleryID)
-                        cache.deleteRecursively()
-                        data.deleteRecursively()
 
-                        downloads.remove(galleryID)
+                        Cache(context).getCachedGallery(galleryID).deleteRecursively()
-
-                        if (this@MainActivity.mode == Mode.DOWNLOAD) {
-                            runOnUiThread {
-                                cancelFetch()
-                                clearGalleries()
-                                fetchGalleries(query, sortMode)
-                                loadBlocks()
-                            }
-                        }
 
                         histories.remove(galleryID)
 
-                        if (this@MainActivity.mode == Mode.HISTORY) {
+                        if (this@MainActivity.mode != Mode.SEARCH)
                             runOnUiThread {
                                 cancelFetch()
                                 clearGalleries()
                                 fetchGalleries(query, sortMode)
                                 loadBlocks()
                             }
-                        }
 
                         completeFlag.put(galleryID, false)
                     }
@@ -462,7 +451,7 @@ class MainActivity : AppCompatActivity() {
                         return@setOnItemClickListener
 
                     val intent = Intent(this@MainActivity, ReaderActivity::class.java)
-                    val gallery = galleries[position].first
+                    val gallery = galleries[position]
                     intent.putExtra("galleryID", gallery.id)
 
                     //TODO: Maybe sprinkling some transitions will be nice :D
@@ -474,7 +463,7 @@ class MainActivity : AppCompatActivity() {
                     if (v !is CardView)
                         return@setOnItemLongClickListener true
 
-                    val galleryID = galleries[position].first.id
+                    val galleryID = galleries[position].id
 
                     GalleryDialog(
                         this@MainActivity,
@@ -702,7 +691,6 @@ class MainActivity : AppCompatActivity() {
     }
 
     private var suggestionJob : Job? = null
-    @UseExperimental(ImplicitReflectionSerializer::class)
     private fun setupSearchBar() {
         val searchInputView = findViewById<SearchInputView>(R.id.search_bar_text)
         //Change upper case letters to lower case
@@ -726,12 +714,11 @@ class MainActivity : AppCompatActivity() {
 
         with(main_searchview as FloatingSearchView) {
             val favoritesFile = File(ContextCompat.getDataDir(context), "favorites_tags.json")
-            val json = Json(JsonConfiguration.Stable)
             val serializer = Tag.serializer().list
 
             if (!favoritesFile.exists()) {
                 favoritesFile.createNewFile()
-                favoritesFile.writeText(json.stringify(Tags(listOf())))
+                favoritesFile.writeText(json.stringify(serializer, Tags(listOf())))
             }
 
             setOnMenuItemClickListener {
@@ -849,7 +836,7 @@ class MainActivity : AppCompatActivity() {
                             favorites.add(tag)
                         }
 
-                        favoritesFile.writeText(json.stringify(favorites))
+                        favoritesFile.writeText(json.stringify(serializer, favorites))
                     }
                 }
 
@@ -948,52 +935,58 @@ class MainActivity : AppCompatActivity() {
                             when(sortMode) {
                                 SortMode.POPULAR -> getGalleryIDsFromNozomi(null, "popular", "all")
                                 else -> getGalleryIDsFromNozomi(null, "index", "all")
-                            }.apply {
+                            }.also {
-                                totalItems = size
+                                totalItems = it.size
                             }
                         }
-                        else -> doSearch("$defaultQuery $query", sortMode == SortMode.POPULAR).apply {
+                        else -> doSearch("$defaultQuery $query", sortMode == SortMode.POPULAR).also {
-                            totalItems = size
+                            totalItems = it.size
                         }
                     }
                 }
                 Mode.HISTORY -> {
                     when {
                         query.isEmpty() -> {
-                            histories.toList().apply {
+                            histories.toList().also {
-                                totalItems = size
+                                totalItems = it.size
                             }
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            histories.filter { result.binarySearch(it) >= 0 }.apply {
+                            histories.filter { result.binarySearch(it) >= 0 }.also {
-                                totalItems = size
+                                totalItems = it.size
                             }
                         }
                     }
                 }
                 Mode.DOWNLOAD -> {
+                    val downloads = getDownloadDirectory(this@MainActivity).listFiles()?.filter { file ->
+                        file.isDirectory && (file.name.toIntOrNull() != null) && File(file, ".metadata").exists()
+                    }?.map {
+                        it.name.toInt()
+                    } ?: emptyList()
+
                     when {
-                        query.isEmpty() -> downloads.toList().apply {
+                        query.isEmpty() -> downloads.also {
-                            totalItems = size
+                            totalItems = it.size
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            downloads.filter { result.binarySearch(it) >= 0 }.apply {
+                            downloads.filter { result.binarySearch(it) >= 0 }.also {
-                                totalItems = size
+                                totalItems = it.size
                             }
                         }
                     }
                 }
                 Mode.FAVORITE -> {
                     when {
-                        query.isEmpty() -> favorites.toList().apply {
+                        query.isEmpty() -> favorites.toList().also {
-                            totalItems = size
+                            totalItems = it.size
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            favorites.filter { result.binarySearch(it) >= 0 }.apply {
+                            favorites.filter { result.binarySearch(it) >= 0 }.also {
-                                totalItems = size
+                                totalItems = it.size
                             }
                         }
                     }
@@ -1007,9 +1000,16 @@ class MainActivity : AppCompatActivity() {
         val perPage = preference.getString("per_page", "25")?.toInt() ?: 25
 
         loadingJob = CoroutineScope(Dispatchers.IO).launch {
-            val galleryIDs = galleryIDs?.await()
+            val galleryIDs = try {
+                galleryIDs!!.await().also {
+                    if (it.isEmpty())
+                        throw Exception("No result")
+                }
+            } catch (e: Exception) {
+
+                if (Fabric.isInitialized() && e.message != "No result")
+                    Crashlytics.logException(e)
 
-            if (galleryIDs.isNullOrEmpty()) { //No result
                 withContext(Dispatchers.Main) {
                     main_noresult.visibility = View.VISIBLE
                     main_progressbar.hide()
@@ -1022,48 +1022,7 @@ class MainActivity : AppCompatActivity() {
                 for (chunk in chunks)
                     chunk.map { galleryID ->
                         async {
-                            try {
+                            Cache(this@MainActivity).getGalleryBlock(galleryID)
-                                val json = Json(JsonConfiguration.Stable)
-                                val serializer = GalleryBlock.serializer()
-
-                                val galleryBlock =
-                                    File(getCachedGallery(this@MainActivity, galleryID), "galleryBlock.json").let { cache ->
-                                        when {
-                                            cache.exists() -> json.parse(serializer, cache.readText())
-                                            else -> {
-                                                getGalleryBlock(galleryID).apply {
-                                                    this ?: return@apply
-
-                                                    if (cache.parentFile?.exists() == false)
-                                                        cache.parentFile!!.mkdirs()
-
-                                                    cache.writeText(json.stringify(serializer, this))
-                                                }
-                                            }
-                                        }
-                                    } ?: return@async null
-
-                                val thumbnail = async {
-                                    val ext = galleryBlock.thumbnails[0].split('.').last()
-                                    File(getCachedGallery(this@MainActivity, galleryBlock.id), "thumbnail.$ext").apply {
-                                        if (!exists())
-                                            try {
-                                                with(URL(galleryBlock.thumbnails[0]).openConnection() as HttpsURLConnection) {
-                                                    if (this@apply.parentFile?.exists() == false)
-                                                        this@apply.parentFile!!.mkdirs()
-
-                                                    inputStream.copyTo(FileOutputStream(this@apply))
-                                                }
-                                            } catch (e: Exception) {
-                                                delete()
-                                            }
-                                    }.absolutePath
-                                }
-
-                                Pair(galleryBlock, thumbnail)
-                            } catch (e: Exception) {
-                                null
-                            }
                         }
                     }.forEach {
                         val galleryBlock = it.await()

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

@@ -21,40 +21,36 @@ package xyz.quaver.pupil.ui
 import android.content.Intent
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.os.Bundle
 import android.view.*
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.bumptech.glide.Glide
 import com.crashlytics.android.Crashlytics
 import com.google.android.material.snackbar.Snackbar
 import io.fabric.sdk.android.Fabric
 import kotlinx.android.synthetic.main.activity_reader.*
 import kotlinx.android.synthetic.main.activity_reader.view.*
 import kotlinx.android.synthetic.main.dialog_numberpicker.view.*
-import kotlinx.coroutines.CoroutineScope
+import xyz.quaver.Code
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.serialization.ImplicitReflectionSerializer
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.ReaderAdapter
-import xyz.quaver.pupil.util.GalleryDownloader
 import xyz.quaver.pupil.util.Histories
-import xyz.quaver.pupil.util.ItemClickSupport
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.DownloadWorker
+import java.util.*
+import kotlin.concurrent.schedule
 
 class ReaderActivity : AppCompatActivity() {
 
     private var galleryID = 0
-    private val images = ArrayList<String>()
-    private var gallerySize = 0
     private var currentPage = 0
 
     private var isScroll = true
@@ -70,7 +66,7 @@ class ReaderActivity : AppCompatActivity() {
         }
     }
 
-    private lateinit var downloader: GalleryDownloader
+    private val timer = Timer()
 
     private val snapHelper = PagerSnapHelper()
 
@@ -102,12 +98,8 @@ class ReaderActivity : AppCompatActivity() {
             return
         }
 
-        initDownloader()
-
         initView()
-
+        initDownloader()
-        if (!downloader.download)
-            downloader.start()
     }
 
     override fun onNewIntent(intent: Intent) {
@@ -148,7 +140,6 @@ class ReaderActivity : AppCompatActivity() {
         super.onResume()
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.reader, menu)
 
@@ -169,7 +160,7 @@ class ReaderActivity : AppCompatActivity() {
                 val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, findViewById(android.R.id.content), false)
                 with(view.dialog_number_picker) {
                     minValue=1
-                    maxValue=gallerySize
+                    maxValue=reader_recyclerview?.adapter?.itemCount ?: 0
                     value=currentPage
                 }
                 val dialog = AlertDialog.Builder(this).apply {
@@ -202,8 +193,11 @@ class ReaderActivity : AppCompatActivity() {
     override fun onDestroy() {
         super.onDestroy()
 
-        if (::downloader.isInitialized && !downloader.download)
+        timer.cancel()
-            downloader.cancel()
+        (reader_recyclerview?.adapter as? ReaderAdapter)?.timer?.cancel()
+
+        if (!Cache(this).isDownloading(galleryID))
+            DownloadWorker.getInstance(this@ReaderActivity).cancel(galleryID)
     }
 
     override fun onBackPressed() {
@@ -239,102 +233,74 @@ class ReaderActivity : AppCompatActivity() {
     }
 
     private fun initDownloader() {
-        var d: GalleryDownloader? = GalleryDownloader.get(galleryID)
+        val worker = DownloadWorker.getInstance(this).apply {
-
+            queue.add(galleryID)
-        if (d == null)
-            d = GalleryDownloader(this, galleryID)
-
-        downloader = d.apply {
-            onReaderLoadedHandler = {
-                CoroutineScope(Dispatchers.Main).launch {
-                    title = it.title
-                    with(reader_download_progressbar) {
-                        max = it.galleryInfo.size
-                        progress = 0
-                    }
-                    with(reader_progressbar) {
-                        max = it.galleryInfo.size
-                        progress = 0
-                    }
-
-                    gallerySize = it.galleryInfo.size
-                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${it.galleryInfo.size}"
-                }
-            }
-            onProgressHandler = {
-                CoroutineScope(Dispatchers.Main).launch {
-                    reader_download_progressbar.progress = it
-                    menu?.findItem(R.id.reader_menu_use_hiyobi)?.isVisible = downloader.useHiyobi
-                }
-            }
-            onDownloadedHandler = {
-                val item = it.toList()
-                CoroutineScope(Dispatchers.Main).launch {
-                    if (images.isEmpty()) {
-                        images.addAll(item)
-                        reader_recyclerview.adapter?.notifyDataSetChanged()
-                    } else {
-                        images.add(item.last())
-                        reader_recyclerview.adapter?.notifyItemInserted(images.size-1)
-                    }
-                }
-            }
-            onErrorHandler = {
-                Snackbar
-                    .make(reader_layout, it.message ?: it.javaClass.name, Snackbar.LENGTH_INDEFINITE)
-                    .setAction(R.string.reader_help) {
-                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.error_help))))
-                    }
-                    .show()
-                downloader.download = false
-            }
-            onCompleteHandler = {
-                CoroutineScope(Dispatchers.Main).launch {
-                    reader_download_progressbar.visibility = View.GONE
-                }
-            }
-            onNotifyChangedHandler = { notify ->
-                val fab = reader_fab_download
-
-                runOnUiThread {
-                    if (notify) {
-                        val icon = AnimatedVectorDrawableCompat.create(this, R.drawable.ic_downloading)
-                        icon?.registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
-                            override fun onAnimationEnd(drawable: Drawable?) {
-                                if (downloader.download)
-                                    fab.post {
-                                        icon.start()
-                                        fab.labelText = getString(R.string.reader_fab_download_cancel)
-                                    }
-                                else
-                                    fab.post {
-                                        fab.setImageResource(R.drawable.ic_download)
-                                        fab.labelText = getString(R.string.reader_fab_download)
-                                    }
-                            }
-                        })
-
-                        fab.setImageDrawable(icon)
-                        icon?.start()
-                    } else {
-                        runOnUiThread {
-                            fab.setImageResource(R.drawable.ic_download)
-                        }
-                    }
-                }
-            }
         }
 
-        if (downloader.download) {
+        timer.schedule(1000, 1000) {
-            downloader.invokeOnReaderLoaded()
+            if (worker.progress.indexOfKey(galleryID) < 0)  //loading
-            downloader.invokeOnNotifyChanged()
+                return@schedule
+
+            if (worker.progress[galleryID] == null) {      //Gallery not found
+                timer.cancel()
+                Snackbar
+                    .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
+                    .show()
+            }
+
+            runOnUiThread {
+                reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
+                reader_download_progressbar.progress = worker.progress[galleryID]?.count { !it.isFinite() } ?: 0
+                reader_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
+
+                if (title == getString(R.string.reader_loading)) {
+                    val reader = Cache(this@ReaderActivity).getReaderOrNull(galleryID)
+
+                    if (reader != null) {
+
+                        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) {
+                                Code.HITOMI -> R.drawable.hitomi
+                                Code.HIYOBI -> R.drawable.ic_hiyobi
+                                else -> android.R.color.transparent
+                            })
+                    }
+                }
+
+                if (worker.progress[galleryID]?.all { !it.isFinite() } == true) {   //Download finished
+                    reader_download_progressbar.visibility = View.GONE
+
+                    animateDownloadFAB(false)
+                }
+            }
         }
     }
 
     private fun initView() {
         with(reader_recyclerview) {
-            adapter = ReaderAdapter(Glide.with(this@ReaderActivity), galleryID, images)
+            adapter = ReaderAdapter(this@ReaderActivity, galleryID).apply {
+                onItemClickListener = {
+                    if (isScroll) {
+                        isScroll = false
+                        isFullscreen = true
 
+                        scrollMode(false)
+                        fullscreen(true)
+                    } else {
+                        (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage) //Moves to next page because currentPage is 1-based indexing
+                    }
+                }
+            }
+
+            addOnScrollListener((adapter as ReaderAdapter).preloader)
             addOnScrollListener(object: RecyclerView.OnScrollListener() {
                 override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                     super.onScrolled(recyclerView, dx, dy)
@@ -349,32 +315,24 @@ class ReaderActivity : AppCompatActivity() {
                     if (layoutManager.findFirstVisibleItemPosition() == -1)
                         return
                     currentPage = layoutManager.findFirstVisibleItemPosition()+1
-                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/$gallerySize"
+                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${recyclerView.adapter!!.itemCount}"
                     this@ReaderActivity.reader_progressbar.progress = currentPage
                 }
             })
-
-            ItemClickSupport.addTo(this)
-                .setOnItemClickListener { _, _, _ ->
-                    if (isScroll) {
-                        isScroll = false
-                        isFullscreen = true
-
-                        scrollMode(false)
-                        fullscreen(true)
-                    } else {
-                        (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage) //Moves to next page because currentPage is 1-based indexing
-                    }
-                }
         }
 
         with(reader_fab_download) {
-            setImageResource(R.drawable.ic_download)
+            animateDownloadFAB(Cache(context).isDownloading(galleryID)) //If download in progress, animate button
-            setOnClickListener {
-                downloader.download = !downloader.download
 
-                if (!downloader.download)
+            setOnClickListener {
-                    downloader.clearNotification()
+                if (Cache(context).isDownloading(galleryID)) {
+                   Cache(context).setDownloading(galleryID, false)
+
+                    animateDownloadFAB(false)
+                } else {
+                    Cache(context).setDownloading(galleryID, true)
+                    animateDownloadFAB(true)
+                }
             }
         }
 
@@ -416,4 +374,34 @@ class ReaderActivity : AppCompatActivity() {
 
         (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
     }
+
+    private fun animateDownloadFAB(animate: Boolean) {
+        with(reader_fab_download) {
+            if (animate) {
+                val icon = AnimatedVectorDrawableCompat.create(context, R.drawable.ic_downloading)
+
+                icon?.registerAnimationCallback(object : Animatable2Compat.AnimationCallback() {
+                    override fun onAnimationEnd(drawable: Drawable?) {
+                        val worker = DownloadWorker.getInstance(context)
+                        if (worker.progress[galleryID]?.all { !it.isFinite() } == true) // If download is finished, stop animating
+                            post {
+                                setImageResource(R.drawable.ic_download)
+                                labelText = getString(R.string.reader_fab_download)
+                            }
+                        else                                                            // Or continue animate
+                            post {
+                                icon.start()
+                                labelText = getString(R.string.reader_fab_download_cancel)
+                            }
+                    }
+                })
+
+                setImageDrawable(icon)
+                icon?.start()
+            } else {
+                setImageResource(R.drawable.ic_download)
+                labelText = getString(R.string.reader_fab_download)
+            }
+        }
+    }
 }

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

@@ -18,28 +18,31 @@
 
 package xyz.quaver.pupil.ui
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.PreferenceManager
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.serialization.ImplicitReflectionSerializer
+import kotlinx.android.synthetic.main.settings_activity.*
-import kotlinx.serialization.json.Json
+import kotlinx.serialization.list
-import kotlinx.serialization.parseList
+import kotlinx.serialization.serializer
+import net.rdrei.android.dirchooser.DirectoryChooserActivity
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.ui.fragment.LockFragment
 import xyz.quaver.pupil.ui.fragment.SettingsFragment
+import xyz.quaver.pupil.util.*
+import java.io.File
 import java.nio.charset.Charset
 
 class SettingsActivity : AppCompatActivity() {
 
-    val REQUEST_LOCK = 38238
-    val REQUEST_RESTORE = 16546
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -75,7 +78,6 @@ class SettingsActivity : AppCompatActivity() {
         return true
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         when(requestCode) {
             REQUEST_LOCK -> {
@@ -92,13 +94,13 @@ class SettingsActivity : AppCompatActivity() {
                     val uri = data?.data ?: return
 
                     try {
-                        val json = contentResolver.openInputStream(uri).use { inputStream ->
+                        val str = contentResolver.openInputStream(uri).use { inputStream ->
                             inputStream!!
 
                             inputStream.readBytes().toString(Charset.defaultCharset())
                         }
 
-                        (application as Pupil).favorites.addAll(Json.parseList<Int>(json).also {
+                        (application as Pupil).favorites.addAll(json.parse(Int.serializer().list, str).also {
                             Snackbar.make(
                                 window.decorView,
                                 getString(R.string.settings_restore_successful, it.size),
@@ -114,7 +116,62 @@ class SettingsActivity : AppCompatActivity() {
                     }
                 }
             }
+            REQUEST_DOWNLOAD_FOLDER -> {
+                if (resultCode == Activity.RESULT_OK) {
+                    data?.data?.also { uri ->
+                        val takeFlags: Int =
+                            intent.flags and (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+                            contentResolver.takePersistableUriPermission(uri, takeFlags)
+
+                        val file = uri.toFile(this)
+
+                        if (file?.canWrite() != true)
+                            Snackbar.make(
+                                settings,
+                                R.string.settings_dl_location_not_writable,
+                                Snackbar.LENGTH_LONG
+                            ).show()
+                        else
+                            PreferenceManager.getDefaultSharedPreferences(this).edit()
+                                .putString("dl_location", file.canonicalPath)
+                                .apply()
+                    }
+                }
+            }
+            REQUEST_DOWNLOAD_FOLDER_OLD -> {
+                if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
+                    val directory = data?.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR)!!
+
+                    if (!File(directory).canWrite())
+                        Snackbar.make(
+                            settings,
+                            R.string.settings_dl_location_not_writable,
+                            Snackbar.LENGTH_LONG
+                        ).show()
+                    else
+                        PreferenceManager.getDefaultSharedPreferences(this).edit()
+                            .putString("dl_location", File(directory).canonicalPath)
+                            .apply()
+                }
+            }
             else -> super.onActivityResult(requestCode, resultCode, data)
         }
     }
+
+    @SuppressLint("InlinedApi")
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        when (requestCode) {
+            REQUEST_WRITE_PERMISSION_AND_SAF -> {
+                if (grantResults.firstOrNull() == PackageManager.PERMISSION_GRANTED) {
+                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
+                        putExtra("android.content.extra.SHOW_ADVANCED", true)
+                    }
+
+                    startActivityForResult(intent, REQUEST_DOWNLOAD_FOLDER)
+                }
+            }
+        }
+    }
 }

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

@@ -19,6 +19,7 @@
 package xyz.quaver.pupil.ui.dialog
 
 import android.annotation.SuppressLint
+import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
 import android.text.Editable
@@ -28,6 +29,7 @@ import android.view.View
 import android.widget.ArrayAdapter
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.PreferenceManager
+import kotlinx.android.synthetic.main.dialog_default_query.*
 import kotlinx.android.synthetic.main.dialog_default_query.view.*
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tags
@@ -44,28 +46,44 @@ 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?) {
+        setTitle(R.string.default_query_dialog_title)
+        setView(build())
+        setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ ->
+            val newTags = Tags.parse(default_query_dialog_edittext.text.toString())
+
+            with(default_query_dialog_language_selector) {
+                if (selectedItemPosition != 0)
+                    newTags.add("language:${reverseLanguages[selectedItem]}")
+            }
+
+            if (default_query_dialog_BL_checkbox.isChecked)
+                newTags.add(excludeBL)
+
+            if (default_query_dialog_guro_checkbox.isChecked)
+                excludeGuro.forEach { tag ->
+                    newTags.add(tag)
+                }
+
+            onPositiveButtonClickListener?.invoke(newTags)
+        }
+
         super.onCreate(savedInstanceState)
-
-        dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
-
-        initView()
-
-        setContentView(dialogView)
     }
 
-    private fun initView() {
+    @SuppressLint("InflateParams")
+    private fun build() : View {
         val preferences = PreferenceManager.getDefaultSharedPreferences(context)
         val tags = Tags.parse(
             preferences.getString("default_query", "") ?: ""
         )
 
-        with(dialogView.default_query_dialog_language_selector) {
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
+
+        with(view.default_query_dialog_language_selector) {
             adapter =
                 ArrayAdapter(
                     context,
@@ -88,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 {
@@ -102,10 +120,16 @@ 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(s: CharSequence?, start: Int, count: Int, after: Int) {}
+                override fun beforeTextChanged(
+                    s: CharSequence?,
+                    start: Int,
+                    count: Int,
+                    after: Int
+                ) {
+                }
 
                 override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
 
@@ -113,29 +137,16 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
                     s ?: return
 
                     if (s.any { it.isUpperCase() })
-                        s.replace(0, s.length, s.toString().toLowerCase(java.util.Locale.getDefault()))
+                        s.replace(
+                            0,
+                            s.length,
+                            s.toString().toLowerCase(java.util.Locale.getDefault())
+                        )
                 }
             })
         }
 
-        dialogView.default_query_dialog_ok.setOnClickListener {
+        return view
-            val newTags = Tags.parse(dialogView.default_query_dialog_edittext.text.toString())
-
-            with(dialogView.default_query_dialog_language_selector) {
-                if (selectedItemPosition != 0)
-                    newTags.add("language:${reverseLanguages[selectedItem]}")
-            }
-
-            if (dialogView.default_query_dialog_BL_checkbox.isChecked)
-                newTags.add(excludeBL)
-
-            if (dialogView.default_query_dialog_guro_checkbox.isChecked)
-                excludeGuro.forEach { tag ->
-                    newTags.add(tag)
-                }
-
-            onPositiveButtonClickListener?.invoke(newTags)
-        }
     }
 
 }

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

@@ -18,29 +18,50 @@
 
 package xyz.quaver.pupil.ui.dialog
 
+import android.Manifest
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.app.Dialog
-import android.content.Context
+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
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
 import kotlinx.android.synthetic.main.item_dl_location.view.*
+import net.rdrei.android.dirchooser.DirectoryChooserActivity
+import net.rdrei.android.dirchooser.DirectoryChooserConfig
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.byteToString
+import xyz.quaver.pupil.util.*
+import java.io.File
 
 @SuppressLint("InflateParams")
-class DownloadLocationDialog(context: Context) : AlertDialog(context) {
+class DownloadLocationDialog(val activity: Activity) : AlertDialog(activity) {
 
     private val preference = PreferenceManager.getDefaultSharedPreferences(context)
-    private val buttons = mutableListOf<RadioButton>()
+    private val buttons = mutableListOf<Pair<RadioButton, File?>>()
-    var onDownloadLocationChangedListener : ((Int) -> (Unit))? = null
 
-    init {
+    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
 
-        ContextCompat.getExternalFilesDirs(context, null).forEachIndexed { index, dir ->
+        val externalFilesDirs = ContextCompat.getExternalFilesDirs(context, null)
+
+        externalFilesDirs.forEachIndexed { index, dir ->
 
             dir ?: return@forEachIndexed
 
@@ -54,25 +75,64 @@ class DownloadLocationDialog(context: Context) : AlertDialog(context) {
                     byteToString(dir.freeSpace)
                 )
                 setOnClickListener {
-                    buttons.forEach { button ->
+                    buttons.forEach { pair ->
-                        button.isChecked = false
+                        pair.first.isChecked = false
                     }
                     button.performClick()
-                    onDownloadLocationChangedListener?.invoke(index)
+                    preference.edit().putString("dl_location", dir.canonicalPath).apply()
                 }
-                buttons.add(button)
+                buttons.add(button to dir)
             })
         }
 
-        buttons[preference.getInt("dl_location", 0)].isChecked = true
+        view.addView(layoutInflater.inflate(R.layout.item_dl_location, view, false).apply {
+            location_type.text = context.getString(R.string.settings_dl_location_custom)
+            setOnClickListener {
+                buttons.forEach { pair ->
+                    pair.first.isChecked = false
+                }
+                button.performClick()
 
-        setTitle(R.string.settings_dl_location)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 
-        setView(view)
+                    if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
+                        ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_WRITE_PERMISSION_AND_SAF)
+                    else {
+                        val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
+                            putExtra("android.content.extra.SHOW_ADVANCED", true)
+                        }
 
-        setButton(Dialog.BUTTON_POSITIVE, context.getText(android.R.string.ok)) { _, _ ->
+                        activity.startActivityForResult(intent, REQUEST_DOWNLOAD_FOLDER)
-            dismiss()
+                    }
+
+                    dismiss()
+                } else {    // Can't use SAF on old Androids!
+                    val config = DirectoryChooserConfig.builder()
+                        .newDirectoryName("Pupil")
+                        .allowNewDirectoryNameModification(true)
+                        .build()
+
+                    val intent = Intent(context, DirectoryChooserActivity::class.java).apply {
+                        putExtra(DirectoryChooserActivity.EXTRA_CONFIG, config)
+                    }
+
+                    activity.startActivityForResult(intent, REQUEST_DOWNLOAD_FOLDER_OLD)
+                    dismiss()
+                }
+            }
+            buttons.add(button to null)
+        })
+
+        externalFilesDirs.indexOfFirst {
+            it.canonicalPath == getDownloadDirectory(context).canonicalPath
+        }.let { index ->
+            if (index < 0)
+                buttons.first().first.isChecked = true
+            else
+                buttons[index].first.isChecked = true
         }
+
+        return view
     }
 
 }

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

@@ -32,14 +32,16 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.google.android.material.chip.Chip
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.dialog_galleryblock.*
+import kotlinx.android.synthetic.main.dialog_gallery.*
 import kotlinx.android.synthetic.main.gallery_details.view.*
 import kotlinx.android.synthetic.main.item_gallery_details.view.*
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
 import xyz.quaver.hitomi.Gallery
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.getGallery
-import xyz.quaver.hitomi.getGalleryBlock
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
@@ -48,6 +50,7 @@ import xyz.quaver.pupil.adapters.ThumbnailAdapter
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.ui.ReaderActivity
 import xyz.quaver.pupil.util.ItemClickSupport
+import xyz.quaver.pupil.util.download.Cache
 import xyz.quaver.pupil.util.wordCapitalize
 
 class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(context) {
@@ -64,7 +67,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.dialog_galleryblock)
+        setContentView(R.layout.dialog_gallery)
 
         window?.attributes.apply {
             this ?: return@apply
@@ -183,6 +186,8 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
                                     else -> tag.tag.wordCapitalize()
                                 }
 
+                                setEnsureMinTouchTargetSize(false)
+
                                 setOnClickListener {
                                     onChipClickedHandler.forEach { handler ->
                                         handler.invoke(tag)
@@ -219,9 +224,9 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
 
     private fun addRelated(gallery: Gallery) {
         val inflater = LayoutInflater.from(context)
-        val galleries = ArrayList<Pair<GalleryBlock, Deferred<String>>>()
+        val galleries = ArrayList<GalleryBlock>()
 
-        val adapter = GalleryBlockAdapter(glide, galleries).apply {
+        val adapter = GalleryBlockAdapter(context, galleries).apply {
             onChipClickedHandler.add { tag ->
                 this@GalleryDialog.onChipClickedHandler.forEach { handler ->
                     handler.invoke(tag)
@@ -232,11 +237,11 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
         CoroutineScope(Dispatchers.Main).launch {
             gallery.related.forEachIndexed { i, galleryID ->
                 async(Dispatchers.IO) {
-                    getGalleryBlock(galleryID)
+                    Cache(context).getGalleryBlock(galleryID)
                 }.let {
                     val galleryBlock = it.await() ?: return@let
 
-                    galleries.add(Pair(galleryBlock, GlobalScope.async { galleryBlock.thumbnails.first() }))
+                    galleries.add(galleryBlock)
                     adapter.notifyItemInserted(i)
                 }
             }
@@ -252,14 +257,14 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
                 ItemClickSupport.addTo(this)
                     .setOnItemClickListener { _, position, _ ->
                         context.startActivity(Intent(context, ReaderActivity::class.java).apply {
-                            putExtra("galleryID", galleries[position].first.id)
+                            putExtra("galleryID", galleries[position].id)
                         })
-                        (context.applicationContext as Pupil).histories.add(galleries[position].first.id)
+                        (context.applicationContext as Pupil).histories.add(galleries[position].id)
                     }
                     .setOnItemLongClickListener { _, position, _ ->
                         GalleryDialog(
                             context,
-                            galleries[position].first.id
+                            galleries[position].id
                         ).apply {
                             onChipClickedHandler.add { tag ->
                                 this@GalleryDialog.onChipClickedHandler.forEach { it.invoke(tag) }

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

@@ -0,0 +1,94 @@
+/*
+ *     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.View
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.adapters.MirrorAdapter
+
+class MirrorDialog(context: Context) : AlertDialog(context) {
+
+    class ItemTouchHelperCallback : ItemTouchHelper.Callback() {
+
+        var onMoveItem : ((Int, Int) -> (Unit))? = null
+
+        override fun getMovementFlags(
+            recyclerView: RecyclerView,
+            viewHolder: RecyclerView.ViewHolder
+        ) = makeMovementFlags(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0)
+
+        override fun onMove(
+            recyclerView: RecyclerView,
+            viewHolder: RecyclerView.ViewHolder,
+            target: RecyclerView.ViewHolder
+        ): Boolean {
+            onMoveItem?.invoke(viewHolder.adapterPosition, target.adapterPosition)
+            return true
+        }
+
+        override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+
+        }
+    }
+
+    @SuppressLint("InflateParams")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setTitle(R.string.settings_mirror_title)
+        setView(build())
+        setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ -> }
+
+        super.onCreate(savedInstanceState)
+    }
+
+    private fun build() : View {
+        return RecyclerView(context).apply recyclerview@{
+            addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
+            layoutManager = LinearLayoutManager(context)
+            adapter = MirrorAdapter(context).apply adapter@{
+                val itemTouchHelper = ItemTouchHelper(ItemTouchHelperCallback().apply {
+                    onMoveItem = this@adapter.onItemMove
+                }).apply {
+                    attachToRecyclerView(this@recyclerview)
+                }
+
+                onStartDrag = {
+                    itemTouchHelper.startDrag(it)
+                }
+
+                onItemMoved = {
+                    PreferenceManager.getDefaultSharedPreferences(context)
+                        .edit()
+                        .putString("mirrors", it.joinToString(">"))
+                        .apply()
+                }
+            }
+        }
+    }
+
+}

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

@@ -19,6 +19,7 @@
 package xyz.quaver.pupil.ui.fragment
 
 import android.content.Intent
+import android.content.SharedPreferences
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDelegate
@@ -34,6 +35,8 @@ import xyz.quaver.pupil.ui.LockActivity
 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
 
@@ -41,7 +44,14 @@ import java.io.File
 class SettingsFragment :
     PreferenceFragmentCompat(),
     Preference.OnPreferenceClickListener,
-    Preference.OnPreferenceChangeListener {
+    Preference.OnPreferenceChangeListener,
+    SharedPreferences.OnSharedPreferenceChangeListener {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(this)
+    }
 
     override fun onResume() {
         super.onResume()
@@ -100,10 +110,6 @@ class SettingsFragment :
                             if (dir.exists())
                                 dir.deleteRecursively()
 
-                            val downloads = (activity!!.application as Pupil).downloads
-
-                            downloads.clear()
-
                             summary = getDirSize(dir)
                         }
                         setNegativeButton(android.R.string.no) { _, _ -> }
@@ -123,28 +129,27 @@ class SettingsFragment :
                     }.show()
                 }
                 "dl_location" -> {
-                    DownloadLocationDialog(context).apply {
+                    DownloadLocationDialog(activity!!).show()
-                        onDownloadLocationChangedListener = { value ->
-                            PreferenceManager.getDefaultSharedPreferences(context).edit()
-                                .putInt(key, value)
-                                .apply()
-                            summary = getDownloadDirectory(context).absolutePath
-                        }
-                    }.show()
                 }
                 "default_query" -> {
                     DefaultQueryDialog(context).apply {
                         onPositiveButtonClickListener = { newTags ->
                             sharedPreferences.edit().putString("default_query", newTags.toString()).apply()
                             summary = newTags.toString()
-                            dismiss()   //This sucks
-                            // TODO: make dialog dissmiss itself :P
                         }
                     }.show()
                 }
                 "app_lock" -> {
                     val intent = Intent(context, LockActivity::class.java)
-                    activity?.startActivityForResult(intent, (activity as SettingsActivity).REQUEST_LOCK)
+                    activity?.startActivityForResult(intent, REQUEST_LOCK)
+                }
+                "mirrors" -> {
+                    MirrorDialog(context)
+                        .show()
+                }
+                "proxy" -> {
+                    ProxyDialog(context)
+                        .show()
                 }
                 "backup" -> {
                     File(ContextCompat.getDataDir(context), "favorites.json").copyTo(
@@ -161,7 +166,7 @@ class SettingsFragment :
                         type = "*/*"
                     }
 
-                    activity?.startActivityForResult(intent, (activity as SettingsActivity).REQUEST_RESTORE)
+                    activity?.startActivityForResult(intent, REQUEST_RESTORE)
                 }
                 else -> return false
             }
@@ -188,6 +193,23 @@ class SettingsFragment :
         return true
     }
 
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        key ?: return
+
+        with(findPreference<Preference>(key)) {
+            this ?: return
+
+            when (key) {
+                "proxy" -> {
+                    summary = getProxyInfo(context).type.name
+                }
+                "dl_location" -> {
+                    summary = getDownloadDirectory(context!!).canonicalPath
+                }
+            }
+        }
+    }
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.root_preferences, rootKey)
 
@@ -232,13 +254,12 @@ class SettingsFragment :
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "dl_location" -> {
-                            summary = getDownloadDirectory(context).absolutePath
+                            summary = getDownloadDirectory(context).canonicalPath
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "default_query" -> {
-                            val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+                            summary = PreferenceManager.getDefaultSharedPreferences(context).getString("default_query", "") ?: ""
-                            summary = preferences.getString("default_query", "") ?: ""
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
@@ -259,6 +280,14 @@ class SettingsFragment :
 
                             onPreferenceClickListener = this@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/ConstValues.kt

@@ -0,0 +1,30 @@
+/*
+ *     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 kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonConfiguration
+
+const val REQUEST_LOCK = 38238
+const val REQUEST_RESTORE = 16546
+const val REQUEST_DOWNLOAD_FOLDER = 3874
+const val REQUEST_DOWNLOAD_FOLDER_OLD = 3425
+const val REQUEST_WRITE_PERMISSION_AND_SAF = 13900
+
+val json = Json(JsonConfiguration.Stable)

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

@@ -1,327 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  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.app.PendingIntent
-import android.content.Context
-import android.content.ContextWrapper
-import android.content.Intent
-import android.util.SparseArray
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.TaskStackBuilder
-import androidx.preference.PreferenceManager
-import com.crashlytics.android.Crashlytics
-import kotlinx.coroutines.*
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import xyz.quaver.hitomi.Reader
-import xyz.quaver.hitomi.getReader
-import xyz.quaver.hitomi.getReferer
-import xyz.quaver.hitomi.urlFromUrlFromHash
-import xyz.quaver.hiyobi.cookie
-import xyz.quaver.hiyobi.createImgList
-import xyz.quaver.hiyobi.user_agent
-import xyz.quaver.pupil.Pupil
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.ReaderActivity
-import java.io.File
-import java.io.FileOutputStream
-import java.net.URL
-import java.util.*
-import javax.net.ssl.HttpsURLConnection
-import kotlin.collections.ArrayList
-import kotlin.concurrent.schedule
-
-class GalleryDownloader(
-    base: Context,
-    private val galleryID: Int,
-    _notify: Boolean = false
-) : ContextWrapper(base) {
-
-    private val downloads = (applicationContext as Pupil).downloads
-    var useHiyobi = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("use_hiyobi", false)
-
-    var download: Boolean = false
-        set(value) {
-            if (value) {
-                field = true
-                notificationManager.notify(galleryID, notificationBuilder.build())
-
-                if (reader?.isActive == false && downloadJob?.isActive != true) {
-                    val data = File(getDownloadDirectory(this), galleryID.toString())
-                    val cache = File(cacheDir, "imageCache/$galleryID")
-
-                    if (File(cache, "images").exists() && !data.exists()) {
-                        cache.copyRecursively(data, true)
-                        cache.deleteRecursively()
-                    }
-
-                    field = false
-                }
-
-                downloads.add(galleryID)
-            } else {
-                field = false
-            }
-
-            onNotifyChangedHandler?.invoke(value)
-        }
-
-    private val reader: Deferred<Reader?>?
-    private var downloadJob: Job? = null
-
-    private lateinit var notificationBuilder: NotificationCompat.Builder
-    private lateinit var notificationManager: NotificationManagerCompat
-
-    var onReaderLoadedHandler: ((Reader) -> Unit)? = null
-    var onProgressHandler: ((Int) -> Unit)? = null
-    var onDownloadedHandler: ((List<String>) -> Unit)? = null
-    var onErrorHandler: ((Exception) -> Unit)? = null
-    var onCompleteHandler: (() -> Unit)? = null
-    var onNotifyChangedHandler: ((Boolean) -> Unit)? = null
-
-    companion object : SparseArray<GalleryDownloader>()
-
-    init {
-        put(galleryID, this)
-
-        initNotification()
-
-        reader = CoroutineScope(Dispatchers.IO).async {
-            try {
-                download = _notify
-                val json = Json(JsonConfiguration.Stable)
-                val serializer = Reader.serializer()
-
-                //Check cache
-                val cache = File(getCachedGallery(this@GalleryDownloader, galleryID), "reader.json")
-
-                try {
-                    json.parse(serializer, cache.readText())
-                } catch(e: Exception) {
-                    cache.delete()
-                }
-
-                if (cache.exists()) {
-                    val cached = json.parse(serializer, cache.readText())
-
-                    if (cached.galleryInfo.isNotEmpty()) {
-                        useHiyobi = cached.code == Reader.Code.HIYOBI
-
-                        onReaderLoadedHandler?.invoke(cached)
-
-                        return@async cached
-                    }
-                }
-
-                //Cache doesn't exist. Load from internet
-                val reader = when {
-                    useHiyobi -> {
-                        try {
-                            xyz.quaver.hiyobi.getReader(galleryID)
-                        } catch(e: Exception) {
-                            useHiyobi = false
-                            getReader(galleryID)
-                        }
-                    }
-                    else -> {
-                        getReader(galleryID)
-                    }
-                }
-
-                if (reader.galleryInfo.isNotEmpty()) {
-                    //Save cache
-                    if (cache.parentFile?.exists() == false)
-                        cache.parentFile!!.mkdirs()
-
-                    cache.writeText(json.stringify(serializer, reader))
-                }
-
-                reader
-            } catch (e: Exception) {
-                Crashlytics.logException(e)
-                onErrorHandler?.invoke(e)
-                null
-            }
-        }
-    }
-
-    fun start() {
-        downloadJob = CoroutineScope(Dispatchers.Default).launch {
-            val reader = reader!!.await() ?: return@launch
-            val lowQuality = PreferenceManager.getDefaultSharedPreferences(this@GalleryDownloader)
-                .getBoolean("low_quality", false)
-
-            notificationBuilder.setContentTitle(reader.title)
-
-            val list = ArrayList<String>()
-
-            onReaderLoadedHandler?.invoke(reader)
-
-            notificationBuilder
-                .setProgress(reader.galleryInfo.size, 0, false)
-                .setContentText("0/${reader.galleryInfo.size}")
-
-            reader.galleryInfo.chunked(4).forEachIndexed { chunkIndex, chunk ->
-                chunk.mapIndexed { i, galleryInfo ->
-                    val index = chunkIndex*4+i
-
-                    async(Dispatchers.IO) {
-                        val url = when(useHiyobi) {
-                            true -> createImgList(galleryID, reader, lowQuality)[index].path
-                            false -> when {
-                                (!galleryInfo.hash.isNullOrBlank()) && (galleryInfo.haswebp == 1) && lowQuality ->
-                                    urlFromUrlFromHash(galleryID, galleryInfo, "webp")
-                                else ->
-                                    urlFromUrlFromHash(galleryID, galleryInfo)
-                            }
-                        }
-
-                        val name = "$index".padStart(4, '0')
-                        val ext = url.split('.').last()
-
-                        val cache = File(getCachedGallery(this@GalleryDownloader, galleryID), "images/$name.$ext")
-
-                        if (!cache.exists())
-                            try {
-                                with(URL(url).openConnection() as HttpsURLConnection) {
-                                    if (useHiyobi) {
-                                        setRequestProperty("User-Agent", user_agent)
-                                        setRequestProperty("Cookie", cookie)
-                                    } else
-                                        setRequestProperty("Referer", getReferer(galleryID))
-
-                                    if (cache.parentFile?.exists() == false)
-                                        cache.parentFile!!.mkdirs()
-
-                                    inputStream.copyTo(FileOutputStream(cache))
-                                }
-                            } catch (e: Exception) {
-                                cache.delete()
-
-                                onErrorHandler?.invoke(e)
-
-                                notificationBuilder
-                                    .setContentTitle(reader.title)
-                                    .setContentText(getString(R.string.reader_notification_error))
-                                    .setProgress(0, 0, false)
-
-                                notificationManager.notify(galleryID, notificationBuilder.build())
-                            }
-
-                        "images/$name.$ext"
-                    }
-                }.forEach {
-                    list.add(it.await())
-
-                    val index = list.size
-
-                    onProgressHandler?.invoke(index)
-
-                    notificationBuilder
-                        .setProgress(reader.galleryInfo.size, index, false)
-                        .setContentText("$index/${reader.galleryInfo.size}")
-
-                    if (download)
-                        notificationManager.notify(galleryID, notificationBuilder.build())
-
-                    onDownloadedHandler?.invoke(list)
-                }
-            }
-
-            Timer(false).schedule(1000) {
-                notificationBuilder
-                    .setContentTitle(reader.title)
-                    .setContentText(getString(R.string.reader_notification_complete))
-                    .setProgress(0, 0, false)
-
-                if (download) {
-                    File(cacheDir, "imageCache/${galleryID}").let {
-                        if (it.exists()) {
-                            val target = File(getDownloadDirectory(this@GalleryDownloader), galleryID.toString())
-
-                            if (!target.exists())
-                                target.mkdirs()
-
-                            it.copyRecursively(target, true)
-                            it.deleteRecursively()
-                        }
-                    }
-
-                    notificationManager.notify(galleryID, notificationBuilder.build())
-
-                    download = false
-                }
-
-                onCompleteHandler?.invoke()
-            }
-
-            remove(galleryID)
-        }
-    }
-
-    fun cancel() {
-        downloadJob?.cancel()
-
-        remove(galleryID)
-    }
-
-    suspend fun cancelAndJoin() {
-        downloadJob?.cancelAndJoin()
-
-        remove(galleryID)
-    }
-
-    fun invokeOnReaderLoaded() {
-        CoroutineScope(Dispatchers.Default).launch {
-            onReaderLoadedHandler?.invoke(reader?.await() ?: return@launch)
-        }
-    }
-
-    fun clearNotification() {
-        notificationManager.cancel(galleryID)
-    }
-
-    fun invokeOnNotifyChanged() {
-        onNotifyChangedHandler?.invoke(download)
-    }
-
-    private fun initNotification() {
-        val intent = Intent(this, ReaderActivity::class.java).apply {
-            putExtra("galleryID", galleryID)
-        }
-        val pendingIntent = TaskStackBuilder.create(this).run {
-            addNextIntentWithParentStack(intent)
-            getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
-        }
-
-        notificationManager = NotificationManagerCompat.from(this)
-
-        notificationBuilder = NotificationCompat.Builder(this, "download").apply {
-            setContentTitle(getString(R.string.reader_loading))
-            setContentText(getString(R.string.reader_notification_text))
-            setSmallIcon(android.R.drawable.stat_sys_download)
-            setContentIntent(pendingIntent)
-            setProgress(0, 0, true)
-            priority = NotificationCompat.PRIORITY_LOW
-        }
-    }
-
-}

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

@@ -0,0 +1,244 @@
+/*
+ *     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.download
+
+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
+import kotlinx.coroutines.withContext
+import xyz.quaver.Code
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.Reader
+import xyz.quaver.pupil.util.getCachedGallery
+import xyz.quaver.pupil.util.getDownloadDirectory
+import xyz.quaver.pupil.util.json
+import java.io.File
+import java.net.URL
+
+class Cache(context: Context) : ContextWrapper(context) {
+
+    private val preference = PreferenceManager.getDefaultSharedPreferences(this)
+
+    // Search in this order
+    // Download -> Cache
+    fun getCachedGallery(galleryID: Int) = getCachedGallery(this, galleryID).also {
+        if (!it.exists())
+            it.mkdirs()
+    }
+
+    fun getCachedMetadata(galleryID: Int) : Metadata? {
+        val file = File(getCachedGallery(galleryID), ".metadata")
+
+        if (!file.exists())
+            return null
+
+        return try {
+            json.parse(Metadata.serializer(), file.readText())
+        } catch (e: Exception) {
+            //File corrupted
+            file.delete()
+            null
+        }
+    }
+
+    fun setCachedMetadata(galleryID: Int, metadata: Metadata) {
+        val file = File(getCachedGallery(galleryID), ".metadata").also {
+            if (!it.exists())
+                it.createNewFile()
+        }
+
+        file.writeText(json.stringify(Metadata.serializer(), metadata))
+    }
+
+    suspend fun getThumbnail(galleryID: Int): String? {
+        val metadata = Cache(this).getCachedMetadata(galleryID)
+
+        val thumbnail = if (metadata?.thumbnail == null)
+            withContext(Dispatchers.IO) {
+                val thumbnails = getGalleryBlock(galleryID)?.thumbnails
+                try {
+                    Base64.encodeToString(URL(thumbnails?.firstOrNull()).readBytes(), Base64.DEFAULT)
+                } catch (e: Exception) {
+                    null
+                }
+            }
+        else
+            metadata.thumbnail
+
+        setCachedMetadata(
+            galleryID,
+            Metadata(Cache(this).getCachedMetadata(galleryID), thumbnail = thumbnail)
+        )
+
+        return thumbnail
+    }
+
+    suspend fun getGalleryBlock(galleryID: Int): GalleryBlock? {
+        val metadata = Cache(this).getCachedMetadata(galleryID)
+
+        val sources = listOf(
+            { xyz.quaver.hitomi.getGalleryBlock(galleryID) },
+            { xyz.quaver.hiyobi.getGalleryBlock(galleryID) }
+        )
+
+        val galleryBlock = if (metadata?.galleryBlock == null) {
+            CoroutineScope(Dispatchers.IO).async {
+                var galleryBlock: GalleryBlock? = null
+
+                for (source in sources) {
+                    galleryBlock = try {
+                        source.invoke()
+                    } catch (e: Exception) {
+                        null
+                    }
+
+                    if (galleryBlock != null)
+                        break
+                }
+
+                galleryBlock
+            }.await() ?: return null
+        }
+        else
+            metadata.galleryBlock
+
+        setCachedMetadata(
+            galleryID,
+            Metadata(Cache(this).getCachedMetadata(galleryID), galleryBlock = galleryBlock)
+        )
+
+        return galleryBlock
+    }
+
+    fun getReaderOrNull(galleryID: Int): Reader? {
+        return getCachedMetadata(galleryID)?.reader
+    }
+
+    suspend fun getReader(galleryID: Int): Reader? {
+        val metadata = getCachedMetadata(galleryID)
+        val mirrors = preference.getString("mirrors", null)?.split('>') ?: listOf()
+
+        val sources = mapOf(
+            Code.HITOMI to { xyz.quaver.hitomi.getReader(galleryID) },
+            Code.HIYOBI to { xyz.quaver.hiyobi.getReader(galleryID) }
+        ).let {
+            if (mirrors.isNotEmpty())
+                it.toSortedMap(
+                    Comparator { o1, o2 ->
+                        mirrors.indexOf(o1.name) - mirrors.indexOf(o2.name)
+                    }
+                )
+            else
+                it
+        }
+
+        val reader = if (metadata?.reader == null) {
+            CoroutineScope(Dispatchers.IO).async {
+                var retval: Reader? = null
+
+                for (source in sources) {
+                    retval = try {
+                        source.value.invoke()
+                    } catch (e: Exception) {
+                        Crashlytics.logException(e)
+                        null
+                    }
+
+                    if (retval != null)
+                        break
+                }
+
+                retval
+            }.await() ?: return null
+        } else
+            metadata.reader
+
+        setCachedMetadata(
+            galleryID,
+            Metadata(Cache(this).getCachedMetadata(galleryID), readers = reader)
+        )
+
+        return reader
+    }
+
+    val imageNameRegex = Regex("""^\d+\..+$""")
+    fun getImages(galleryID: Int): List<File?>? {
+        val gallery = getCachedGallery(galleryID)
+
+        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())
+                it.createNewFile()
+        }
+
+        if (!Regex("""^[0-9]+.+$""").matches(name))
+            throw IllegalArgumentException("File name is not a number")
+
+        cache.writeBytes(data)
+    }
+
+    fun moveToDownload(galleryID: Int) {
+        val cache = getCachedGallery(galleryID).also {
+            if (!it.exists())
+                return
+        }
+        val download = File(getDownloadDirectory(this), galleryID.toString())
+
+        cache.copyRecursively(download, true)
+        cache.deleteRecursively()
+    }
+
+    fun isDownloading(galleryID: Int) = getCachedMetadata(galleryID)?.isDownloading == true
+
+    fun setDownloading(galleryID: Int, isDownloading: Boolean) {
+        setCachedMetadata(galleryID, Metadata(getCachedMetadata(galleryID), isDownloading = isDownloading))
+    }
+
+}

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

@@ -0,0 +1,387 @@
+/*
+ *     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.download
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import android.content.SharedPreferences
+import android.util.SparseArray
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.TaskStackBuilder
+import androidx.preference.PreferenceManager
+import com.crashlytics.android.Crashlytics
+import io.fabric.sdk.android.Fabric
+import kotlinx.coroutines.*
+import okhttp3.*
+import okio.*
+import xyz.quaver.Code
+import xyz.quaver.hitomi.Reader
+import xyz.quaver.hitomi.getReferer
+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
+import java.util.concurrent.Executors
+import java.util.concurrent.LinkedBlockingQueue
+
+@UseExperimental(ExperimentalCoroutinesApi::class)
+class DownloadWorker private constructor(context: Context) : ContextWrapper(context) {
+
+    private val preferences : SharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
+
+    //region ProgressListener
+    @Suppress("UNCHECKED_CAST")
+    private val progressListener = object: ProgressListener {
+        override fun update(tag: Any?, bytesRead: Long, contentLength: Long, done: Boolean) {
+            val (galleryID, index) = (tag as? Pair<Int, Int>) ?: return
+
+            if (!done && progress[galleryID]?.get(index)?.isFinite() == true)
+                progress[galleryID]?.set(index, bytesRead * 100F / contentLength)
+        }
+    }
+
+    interface ProgressListener {
+        fun update(tag: Any?, bytesRead : Long, contentLength: Long, done: Boolean)
+    }
+
+    class ProgressResponseBody(
+        val tag: Any?,
+        val responseBody: ResponseBody,
+        val progressListener : ProgressListener
+    ) : ResponseBody() {
+        private var bufferedSource : BufferedSource? = null
+
+        override fun contentLength() = responseBody.contentLength()
+        override fun contentType() = responseBody.contentType() ?: null
+
+        override fun source(): BufferedSource {
+            if (bufferedSource == null)
+                bufferedSource = Okio.buffer(source(responseBody.source()))
+
+            return bufferedSource!!
+        }
+
+        private fun source(source: Source) = object: ForwardingSource(source) {
+
+            var totalBytesRead = 0L
+
+            override fun read(sink: Buffer, byteCount: Long): Long {
+                val bytesRead = super.read(sink, byteCount)
+
+                totalBytesRead += if (bytesRead == -1L) 0L else bytesRead
+                progressListener.update(tag, totalBytesRead, responseBody.contentLength(), bytesRead == -1L)
+
+                return bytesRead
+            }
+
+        }
+    }
+    //endregion
+
+    //region Singleton
+    companion object {
+
+        @Volatile private var instance: DownloadWorker? = null
+
+        fun getInstance(context: Context) =
+            instance ?: synchronized(this) {
+                instance ?: DownloadWorker(context).also { instance = it }
+            }
+    }
+    //endregion
+
+    val notificationManager = NotificationManagerCompat.from(context)
+
+    val queue = LinkedBlockingQueue<Int>()
+
+    /*
+    * KEY
+    *  primary galleryID
+    *  secondary index
+    * PRIMARY VALUE
+    *  MutableList -> Download in progress
+    *  null -> Loading / Gallery doesn't exist
+    * SECONDARY VALUE
+    *  0 <= value < 100 -> Download in progress
+    *  Float.POSITIVE_INFINITY -> Download completed
+    *  Float.NaN -> Exception
+    */
+    val progress = SparseArray<MutableList<Float>?>()
+    /*
+    * KEY
+    *  primary galleryID
+    *  secondary index
+    * PRIMARY VALUE
+    *  MutableList -> Download in progress / Loading
+    *  null -> Gallery doesn't exist
+    * SECONDARY VALUE
+    *  Throwable -> Exception
+    *  null -> Download in progress / Loading
+    */
+    val exception = SparseArray<MutableList<Throwable?>?>()
+    val notification = SparseArray<NotificationCompat.Builder>()
+
+    private val loop = loop()
+    private val worker = SparseArray<Job?>()
+    val clients = SparseArray<OkHttpClient>()
+
+    val interceptor = Interceptor { chain ->
+        val request = chain.request()
+        val response = chain.proceed(request)
+
+        response.newBuilder()
+        .body(ProgressResponseBody(request.tag(), response.body(), progressListener))
+        .build()
+    }
+    fun buildClient() =
+        OkHttpClient.Builder()
+            .addInterceptor(interceptor)
+            .dispatcher(Dispatcher(Executors.newFixedThreadPool(4)))
+            .proxy(proxy)
+            .build()
+
+    fun stop() {
+        queue.clear()
+
+        loop.cancel()
+        for (i in 0..worker.size()) {
+            val galleryID = worker.keyAt(i)
+
+            Cache(this@DownloadWorker).setDownloading(galleryID, false)
+            worker[galleryID]?.cancel()
+        }
+
+        for (i in 0 until clients.size()) {
+            clients.valueAt(i).dispatcher().cancelAll()
+        }
+        clients.clear()
+
+        progress.clear()
+        exception.clear()
+        notification.clear()
+        notificationManager.cancelAll()
+    }
+
+    fun cancel(galleryID: Int) {
+        queue.remove(galleryID)
+        worker[galleryID]?.cancel()
+
+        clients[galleryID]?.dispatcher()?.cancelAll()
+        clients.remove(galleryID)
+
+        progress.remove(galleryID)
+        exception.remove(galleryID)
+        notification.remove(galleryID)
+        notificationManager.cancel(galleryID)
+
+        if (progress.indexOfKey(galleryID) >= 0) {
+            Cache(this@DownloadWorker).setDownloading(galleryID, false)
+        }
+    }
+
+    fun isCompleted(galleryID: Int) = progress[galleryID]?.all { !it.isFinite() } == true
+
+    private fun queueDownload(galleryID: Int, reader: Reader, index: Int, callback: Callback) {
+        val lowQuality = preferences.getBoolean("low_quality", false)
+
+        val request = Request.Builder().apply {
+            when (reader.code) {
+                Code.HITOMI -> {
+                    url(
+                        urlFromUrlFromHash(
+                            galleryID,
+                            reader.galleryInfo.files[index],
+                            if (lowQuality) "webp" else null
+                        )
+                    )
+                    addHeader("Referer", getReferer(galleryID))
+                }
+                Code.HIYOBI -> {
+                    url(createImgList(galleryID, reader, lowQuality)[index].path)
+                    addHeader("User-Agent", user_agent)
+                    addHeader("Cookie", cookie)
+                }
+                else -> {
+                    //shouldn't be called anyway
+                }
+            }
+            tag(galleryID to index)
+        }.build()
+
+        if (clients.get(galleryID) == null)
+            clients.put(galleryID, buildClient())
+
+        clients[galleryID]?.newCall(request)?.enqueue(callback)
+    }
+
+    private fun download(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
+        val reader = Cache(this@DownloadWorker).getReader(galleryID)
+
+        //gallery doesn't exist
+        if (reader == null) {
+            progress.put(galleryID, null)
+            exception.put(galleryID, null)
+
+            Cache(this@DownloadWorker).setDownloading(galleryID, false)
+            return@launch
+        }
+
+        val cache = Cache(this@DownloadWorker).getImages(galleryID)
+
+        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.files.map { null }.toMutableList())
+
+        if (notification[galleryID] == null)
+            initNotification(galleryID)
+
+        notification[galleryID].setContentTitle(reader.galleryInfo.title)
+        notify(galleryID)
+
+        if (isCompleted(galleryID)) {
+            with(Cache(this@DownloadWorker)) {
+                if (isDownloading(galleryID)) {
+                    moveToDownload(galleryID)
+                    setDownloading(galleryID, false)
+                }
+            }
+
+            return@launch
+        }
+
+        for (i in reader.galleryInfo.files.indices) {
+            val callback = object : Callback {
+                override fun onFailure(call: Call, e: IOException) {
+                    if (Fabric.isInitialized() && e.message != "Canceled")
+                        Crashlytics.logException(e)
+
+                    progress[galleryID]?.set(i, Float.NaN)
+                    exception[galleryID]?.set(i, e)
+
+                    notify(galleryID)
+
+                    if (isCompleted(galleryID)) {
+                        with(Cache(this@DownloadWorker)) {
+                            if (isDownloading(galleryID)) {
+                                moveToDownload(galleryID)
+                                setDownloading(galleryID, false)
+                            }
+                        }
+                        clients.remove(galleryID)
+                    }
+                }
+
+                override fun onResponse(call: Call, response: Response) {
+                    response.body().use {
+                        val res = it.bytes()
+                        val ext =
+                            call.request().url().encodedPath().split('.').last()
+
+                        Cache(this@DownloadWorker).putImage(galleryID, "%05d.%s".format(i, ext), res)
+                        progress[galleryID]?.set(i, Float.POSITIVE_INFINITY)
+                    }
+
+                    notify(galleryID)
+
+                    if (isCompleted(galleryID)) {
+                        with(Cache(this@DownloadWorker)) {
+                            if (isDownloading(galleryID)) {
+                                moveToDownload(galleryID)
+                                setDownloading(galleryID, false)
+                            }
+                        }
+                        clients.remove(galleryID)
+                    }
+                }
+            }
+
+            if (progress[galleryID]?.get(i)?.isFinite() == true)
+                queueDownload(galleryID, reader, i, callback)
+        }
+    }
+
+    private fun notify(galleryID: Int) {
+        val max = progress[galleryID]?.size ?: 0
+        val progress = progress[galleryID]?.count { !it.isFinite() } ?: 0
+
+        if (isCompleted(galleryID))
+            notification[galleryID]
+                ?.setContentText(getString(R.string.reader_notification_complete))
+                ?.setSmallIcon(android.R.drawable.stat_sys_download_done)
+                ?.setProgress(0, 0, false)
+                ?.setOngoing(false)
+        else
+            notification[galleryID]
+                ?.setProgress(max, progress, false)
+                ?.setContentText("$progress/$max")
+
+        if (Cache(this).isDownloading(galleryID) && notification[galleryID] != null)
+            notificationManager.notify(galleryID, notification[galleryID].build())
+        else
+            notificationManager.cancel(galleryID)
+    }
+
+    private fun initNotification(galleryID: Int) {
+        val intent = Intent(this, ReaderActivity::class.java).apply {
+            putExtra("galleryID", galleryID)
+        }
+        val pendingIntent = TaskStackBuilder.create(this).run {
+            addNextIntentWithParentStack(intent)
+            getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+
+        notification.put(galleryID, NotificationCompat.Builder(this, "download").apply {
+            setContentTitle(getString(R.string.reader_loading))
+            setContentText(getString(R.string.reader_notification_text))
+            setSmallIcon(android.R.drawable.stat_sys_download)                                  // had to use this because old android doesn't support VectorDrawable on Notification :P
+            setContentIntent(pendingIntent)
+            setProgress(0, 0, true)
+            setOngoing(true)
+        })
+    }
+
+    private fun loop() = CoroutineScope(Dispatchers.Default).launch {
+        while (true) {
+            if (queue.isEmpty() || clients.size() > preferences.getInt("max_download", 4))
+                continue
+
+            val galleryID = queue.poll() ?: continue
+
+            if (clients.indexOfKey(galleryID) >= 0)    // Gallery already downloading!
+                continue
+
+            initNotification(galleryID)
+            if (Cache(this@DownloadWorker).isDownloading(galleryID))
+                notificationManager.notify(galleryID, notification[galleryID].build())
+            worker.put(galleryID, download(galleryID))
+        }
+    }
+
+}

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

@@ -0,0 +1,44 @@
+/*
+ *     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.download
+
+import kotlinx.serialization.Serializable
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.Reader
+
+@Serializable
+data class Metadata(
+    val thumbnail: String? = null,
+    val galleryBlock: GalleryBlock? = null,
+    val reader: Reader? = null,
+    val isDownloading: Boolean? = null
+) {
+    constructor(
+        metadata: Metadata?,
+        thumbnail: String? = null,
+        galleryBlock: GalleryBlock? = null,
+        readers: Reader? = null,
+        isDownloading: Boolean? = null
+    ) : this(
+        thumbnail ?: metadata?.thumbnail,
+        galleryBlock ?: metadata?.galleryBlock,
+        readers ?: metadata?.reader,
+        isDownloading ?: metadata?.isDownloading
+    )
+}

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

@@ -18,29 +18,45 @@
 
 package xyz.quaver.pupil.util
 
+import android.annotation.TargetApi
 import android.content.Context
+import android.net.Uri
+import android.os.Build
+import android.os.storage.StorageManager
+import android.provider.DocumentsContract
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
 import java.io.File
+import java.io.FileOutputStream
+import java.lang.reflect.Array
 import java.net.URL
 
-fun getCachedGallery(context: Context, galleryID: Int): File {
+
-    return File(getDownloadDirectory(context), galleryID.toString()).let {
+fun getCachedGallery(context: Context, galleryID: Int) =
-        when {
+    File(getDownloadDirectory(context), galleryID.toString()).let {
-            it.exists() -> it
+        if (it.exists())
-            else -> File(context.cacheDir, "imageCache/$galleryID")
+            it
-        }
+        else
+            File(context.cacheDir, "imageCache/$galleryID")
     }
-}
 
-fun getDownloadDirectory(context: Context): File {
+fun getDownloadDirectory(context: Context) =
-    val dlLocation = PreferenceManager.getDefaultSharedPreferences(context).getInt("dl_location", 0)
+    PreferenceManager.getDefaultSharedPreferences(context).getString("dl_location", null).let {
-
+        if (it != null && !it.startsWith("content"))
-    return ContextCompat.getExternalFilesDirs(context, null)[dlLocation]
+            File(it)
-}
+        else
+            context.getExternalFilesDir(null)!!
+    }
 
 fun URL.download(to: File, onDownloadProgress: ((Long, Long) -> Unit)? = null) {
-    to.outputStream().use { out ->
+
+    if (to.parentFile?.exists() == false)
+        to.parentFile!!.mkdirs()
+
+    if (!to.exists())
+        to.createNewFile()
+
+    FileOutputStream(to).use { out ->
 
         with(openConnection()) {
             val fileSize = contentLength.toLong()
@@ -49,6 +65,7 @@ fun URL.download(to: File, onDownloadProgress: ((Long, Long) -> Unit)? = null) {
 
                 var bytesCopied: Long = 0
                 val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
+
                 var bytes = it.read(buffer)
                 while (bytes >= 0) {
                     out.write(buffer, 0, bytes)
@@ -61,4 +78,137 @@ fun URL.download(to: File, onDownloadProgress: ((Long, Long) -> Unit)? = null) {
         }
 
     }
+}
+
+fun getExtSdCardPaths(context: Context) =
+    ContextCompat.getExternalFilesDirs(context, null).drop(1).map {
+        it.absolutePath.substringBeforeLast("/Android/data").let {  path ->
+            runCatching {
+                File(path).canonicalPath
+            }.getOrElse {
+                path
+            }
+        }
+    }
+
+const val PRIMARY_VOLUME_NAME = "primary"
+fun getVolumePath(context: Context, volumeID: String?): String? {
+    return runCatching {
+        val storageManager = context.getSystemService(Context.STORAGE_SERVICE) as StorageManager
+        val storageVolumeClass = Class.forName("android.os.storage.StorageVolume")
+
+        val getVolumeList = storageVolumeClass.javaClass.getMethod("getVolumeList")
+        val getUUID = storageVolumeClass.getMethod("getUuid")
+        val getPath = storageVolumeClass.getMethod("getPath")
+        val isPrimary = storageVolumeClass.getMethod("isPrimary")
+
+        val result = getVolumeList.invoke(storageManager)!!
+
+        val length = Array.getLength(result)
+
+        for (i in 0 until length) {
+            val storageVolumeElement = Array.get(result, i)
+            val uuid = getUUID.invoke(storageVolumeElement) as? String
+            val primary = isPrimary.invoke(storageVolumeElement) as? Boolean
+
+            // primary volume?
+            if (primary == true && volumeID == PRIMARY_VOLUME_NAME)
+                return@runCatching getPath.invoke(storageVolumeElement) as? String
+
+            // other volumes?
+            if (volumeID == uuid) {
+                return@runCatching getPath.invoke(storageVolumeElement) as? String
+            }
+        }
+        return@runCatching null
+    }.getOrNull()
+}
+
+// Credits go to https://stackoverflow.com/questions/34927748/android-5-0-documentfile-from-tree-uri/36162691#36162691
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+fun getVolumeIdFromTreeUri(uri: Uri) =
+    DocumentsContract.getTreeDocumentId(uri).split(':').let {
+        if (it.isNotEmpty())
+            it[0]
+        else
+            null
+    }
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+fun getDocumentPathFromTreeUri(uri: Uri) =
+    DocumentsContract.getTreeDocumentId(uri).split(':').let {
+        if (it.size >= 2)
+            it[1]
+        else
+            File.separator
+    }
+
+fun getFullPathFromTreeUri(context: Context, uri: Uri) : String? {
+    val volumePath = getVolumePath(context, getVolumeIdFromTreeUri(uri) ?: return null).let {
+        it ?: return File.separator
+
+        if (it.endsWith(File.separator))
+            it.dropLast(1)
+        else
+            it
+    }
+
+    val documentPath = getDocumentPathFromTreeUri(uri).let {
+        if (it.endsWith(File.separator))
+            it.dropLast(1)
+        else
+            it
+    }
+
+    return if (documentPath.isNotEmpty()) {
+        if (documentPath.startsWith(File.separator))
+            volumePath + documentPath
+        else
+            volumePath + File.separator + documentPath
+    } else
+        volumePath
+}
+
+// Huge thanks to avluis(https://github.com/avluis)
+// This code is originated from Hentoid(https://github.com/avluis/Hentoid) under Apache-2.0 license.
+fun Uri.toFile(context: Context): File? {
+    val path = this.path ?: return null
+
+    val pathSeparator = path.indexOf(':')
+    val folderName = path.substring(pathSeparator+1)
+
+    // Determine whether the designated file is
+    // - on a removable media (e.g. SD card, OTG)
+    // or
+    // - on the internal phone memory
+    val removableMediaFolderRoots = getExtSdCardPaths(context)
+
+    /* First test is to compare root names with known roots of removable media
+     * In many cases, the SD card root name is shared between pre-SAF (File) and SAF (DocumentFile) frameworks
+     * (e.g. /storage/3437-3934 vs. /tree/3437-3934)
+     * This is what the following block is trying to do
+     */
+    for (s in removableMediaFolderRoots) {
+        val sRoot = s.substring(s.lastIndexOf(File.separatorChar))
+        val root = path.substring(0, pathSeparator).let {
+            it.substring(it.lastIndexOf(File.separatorChar))
+        }
+
+        if (sRoot.equals(root, true)) {
+            return File(s + File.separatorChar + folderName)
+        }
+    }
+    /* In some other cases, there is no common name (e.g. /storage/sdcard1 vs. /tree/3437-3934)
+     * We can use a slower method to translate the Uri obtained with SAF into a pre-SAF path
+     * and compare it to the known removable media volume names
+     */
+    val root = getFullPathFromTreeUri(context, this)
+
+    for (s in removableMediaFolderRoots) {
+        if (root?.startsWith(s) == true) {
+            return File(root)
+        }
+    }
+
+    return File(context.getExternalFilesDir(null)?.canonicalPath?.substringBeforeLast("/Android/data") ?: return null, folderName)
 }

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

@@ -18,15 +18,14 @@
 
 package xyz.quaver.pupil.util
 
-import kotlinx.serialization.ImplicitReflectionSerializer
+import kotlinx.serialization.list
-import kotlinx.serialization.json.Json
+import kotlinx.serialization.serializer
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.parseList
-import kotlinx.serialization.stringify
 import java.io.File
 
 class Histories(private val file: File) : ArrayList<Int>() {
 
+    val serializer = Int.serializer().list
+
     init {
         if (!file.exists())
             file.parentFile?.mkdirs()
@@ -38,21 +37,20 @@ class Histories(private val file: File) : ArrayList<Int>() {
         }
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     fun load() : Histories {
         return apply {
             super.clear()
             addAll(
-                Json(JsonConfiguration.Stable).parseList(
+                json.parse(
+                    serializer,
                     file.bufferedReader().use { it.readText() }
                 )
             )
         }
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     fun save() {
-        file.writeText(Json(JsonConfiguration.Stable).stringify(this))
+        file.writeText(json.stringify(serializer, this))
     }
 
     override fun add(element: Int): Boolean {

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

@@ -21,9 +21,10 @@ package xyz.quaver.pupil.util
 import android.content.Context
 import android.content.ContextWrapper
 import androidx.core.content.ContextCompat
-import kotlinx.serialization.*
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
+import kotlinx.serialization.list
 import java.io.File
 import java.security.MessageDigest
 
@@ -73,7 +74,6 @@ class LockManager(base: Context): ContextWrapper(base) {
         load()
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     private fun load() {
         val lock = File(ContextCompat.getDataDir(this), "lock.json")
 
@@ -82,17 +82,16 @@ class LockManager(base: Context): ContextWrapper(base) {
             lock.writeText("[]")
         }
 
-        locks = ArrayList(Json(JsonConfiguration.Stable).parseList(lock.readText()))
+        locks = ArrayList(json.parse(Lock.serializer().list, lock.readText()))
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     private fun save() {
         val lock = File(ContextCompat.getDataDir(this), "lock.json")
 
         if (!lock.exists())
             lock.createNewFile()
 
-        lock.writeText(Json(JsonConfiguration.Stable).stringify(locks?.toList() ?: listOf()))
+        lock.writeText(json.stringify(Lock.serializer().list, locks?.toList() ?: listOf()))
     }
 
     fun add(lock: Lock) {

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/java/xyz/quaver/pupil/util/update.kt

@@ -21,7 +21,6 @@ package xyz.quaver.pupil.util
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.webkit.MimeTypeMap
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -33,12 +32,11 @@ import androidx.preference.PreferenceManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.internal.EnumSerializer
+import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.*
+import kotlinx.serialization.json.boolean
+import kotlinx.serialization.json.content
 import ru.noties.markwon.Markwon
-import xyz.quaver.availableInHiyobi
-import xyz.quaver.hitomi.Reader
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import java.io.File
@@ -48,7 +46,7 @@ import java.util.*
 fun getReleases(url: String) : JsonArray {
     return try {
         URL(url).readText().let {
-            Json(JsonConfiguration.Stable).parse(JsonArray.serializer(), it)
+            json.parse(JsonArray.serializer(), it)
         }
     } catch (e: Exception) {
         JsonArray(emptyList())
@@ -150,6 +148,7 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
                     setContentTitle(context.getString(R.string.update_notification_description))
                     setSmallIcon(android.R.drawable.stat_sys_download)
                     priority = NotificationCompat.PRIORITY_LOW
+                    setOngoing(true)
                 }
 
                 CoroutineScope(Dispatchers.IO).launch io@{
@@ -165,6 +164,7 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
                             setContentText(context.getString(R.string.update_failed))
                             setMessage(context.getString(R.string.update_failed_message))
                             setSmallIcon(android.R.drawable.stat_sys_download_done)
+                            setOngoing(false)
                         }
 
                         notificationManager.cancel(UPDATE_NOTIFICATION_ID)
@@ -175,15 +175,7 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
 
                     val install = Intent(Intent.ACTION_VIEW).apply {
                         flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION
-                        setDataAndType(FileProvider.getUriForFile(
+                        setDataAndType(FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", target), MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
-                            context,
-                            context.applicationContext.packageName + ".fileprovider",
-                            target
-                        ), MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
-
-                        if (resolveActivity(context.packageManager) == null)
-                            setDataAndType(Uri.fromFile(target),
-                                MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
                     }
 
                     builder.apply {
@@ -192,6 +184,7 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
                         setSmallIcon(android.R.drawable.stat_sys_download_done)
                         setContentTitle(context.getString(R.string.update_download_completed))
                         setContentText(context.getString(R.string.update_download_completed_description))
+                        setOngoing(false)
                     }
 
                     notificationManager.cancel(UPDATE_NOTIFICATION_ID)
@@ -214,59 +207,4 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
             dialog.show()
         }
     }
-}
-
-fun getOldReaderGalleries(context: Context) : List<File> {
-    val oldGallery = mutableListOf<File>()
-
-    listOf(
-        getDownloadDirectory(context),
-        File(context.cacheDir, "imageCache")
-    ).forEach { root ->
-        root.listFiles()?.forEach { gallery ->
-            File(gallery, "reader.json").let { readerFile ->
-                if (!readerFile.exists())
-                    return@let
-
-                try {
-                    Json(JsonConfiguration.Stable).parseJson(readerFile.readText())
-                        .jsonObject.let { reader ->
-                        if (!reader.contains("code"))
-                            oldGallery.add(gallery)
-                    }
-                } catch (e: Exception) {
-                    // do nothing
-                }
-            }
-        }
-    }
-
-    return oldGallery
-}
-
-@UseExperimental(InternalSerializationApi::class)
-fun updateOldReaderGalleries(context: Context) {
-
-    val json = Json(JsonConfiguration.Stable)
-
-   getOldReaderGalleries(context).forEach { gallery ->
-       val reader = json.parseJson(File(gallery, "reader.json").apply {
-           if (!exists())
-               return@forEach
-       }.readText())
-           .jsonObject.toMutableMap()
-
-       val codeSerializer = EnumSerializer(Reader.Code::class)
-
-       reader["code"] = when {
-           (File(gallery, "images").list()?.
-               all { !it.endsWith("webp") } ?: return@forEach) &&
-                   availableInHiyobi(gallery.name.toIntOrNull() ?: return@forEach)
-                -> json.toJson(codeSerializer, Reader.Code.HIYOBI)
-           else -> json.toJson(codeSerializer, Reader.Code.HITOMI)
-       }
-
-       File(gallery, "reader.json").writeText(JsonObject(reader).toString())
-   }
-
 }

app/src/main/res/drawable/ic_download.xml

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#fff"
+<vector android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#fff" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>

app/src/main/res/drawable/menu.xml

@@ -0,0 +1,8 @@
+<!-- drawable/menu.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z" />
+</vector>

app/src/main/res/drawable/reader_item_boundary.xml

@@ -0,0 +1,34 @@
+<?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/>.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp">
+        <shape android:shape="rectangle" >
+            <stroke
+                android:width="1dp"
+                android:color="#555555" />
+
+            <solid android:color="@color/transparent" />
+        </shape>
+    </item>
+</layer-list>

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

@@ -18,21 +18,12 @@
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:padding="16dp">
 
-    <TextView
-        android:id="@+id/default_query_dialog_title"
-        style="@style/TextAppearance.AppCompat.Large"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/default_query_dialog_title"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"/>
-
     <EditText
         tools:ignore="Autofill"
         android:inputType="text"
@@ -40,7 +31,7 @@
         android:id="@+id/default_query_dialog_edittext"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_title"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -116,14 +107,4 @@
 
     </LinearLayout>
 
-    <Button
-        android:id="@+id/default_query_dialog_ok"
-        style="?borderlessButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_guro_layout"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:text="@android:string/ok"/>
-
 </androidx.constraintlayout.widget.ConstraintLayout>

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/layout/item_gallery_details.xml

@@ -35,6 +35,6 @@
         android:id="@+id/gallery_details_tags"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:chipSpacingVertical="8dp"/>
+        app:chipSpacingVertical="4dp"/>
 
 </LinearLayout>

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

@@ -177,7 +177,7 @@
 					android:layout_marginStart="8dp"
 					android:layout_marginTop="16dp"
 					android:layout_marginBottom="16dp"
-					app:chipSpacing="2dp"
+					app:chipSpacing="4dp"
 					app:layout_constraintTop_toBottomOf="@id/galleryblock_padding"
 					app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
 					app:layout_constraintRight_toRightOf="parent"

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

@@ -0,0 +1,49 @@
+<?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="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingStart="32dp"
+    android:paddingLeft="32dp"
+    android:paddingEnd="32dp"
+    android:paddingRight="32dp"
+    android:paddingTop="16dp">
+
+    <TextView
+        android:id="@+id/mirror_name"
+        style="@style/TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <ImageView
+        android:id="@+id/mirror_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/menu"
+        app:tint="?attr/colorControlNormal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -36,7 +36,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         app:srcCompat="@drawable/ic_navigate_next_black_24dp"
-        android:tint="@color/colorAccent"
+        app:tint="@color/colorAccent"
         android:rotation="180"/>
 
     <TextView

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

@@ -36,7 +36,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         app:srcCompat="@drawable/ic_navigate_next_black_24dp"
-        android:tint="@color/colorAccent"
+        app:tint="@color/colorAccent"
         android:rotation="180"/>
 
     <TextView

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

@@ -17,9 +17,57 @@
   ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<com.github.chrisbanes.photoview.PhotoView xmlns:android="http://schemas.android.com/apk/res/android"
+
-    android:contentDescription="@string/reader_imageview_description"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="100dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
-    android:paddingBottom="8dp"/>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@drawable/reader_item_boundary">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <ProgressBar
+                android:id="@+id/reader_item_progressbar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="?android:progressBarStyleHorizontal"
+                android:indeterminate="false"
+                android:progress="0"
+                android:max="100"
+                android:visibility="visible"/>
+
+            <TextView
+                android:id="@+id/reader_index"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/TextAppearance.AppCompat.Caption"/>
+
+        </LinearLayout>
+
+        <com.github.chrisbanes.photoview.PhotoView
+            android:id="@+id/image"
+            android:contentDescription="@string/reader_imageview_description"
+            android:adjustViewBounds="true"
+            android:scaleType="fitCenter"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingBottom="8dp"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/reader.xml

@@ -25,11 +25,9 @@
         android:icon="@drawable/avd_star"
         app:showAsAction="always"/>
 
-    <item android:id="@+id/reader_menu_use_hiyobi"
+    <item android:id="@+id/reader_type"
         android:title=""
-        android:icon="@drawable/ic_hiyobi"
+        app:showAsAction="ifRoom"/>
-        app:showAsAction="ifRoom"
-        android:visible="false"/>
 
     <item android:id="@+id/reader_menu_page_indicator"
         android:title="@string/page_indicator_placeholder"

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

@@ -18,7 +18,7 @@
     <string name="update_title">新しいアップデートがあります</string>
     <string name="warning">注意</string>
     <string name="settings_miscellaneous_title">その他</string>
-    <string name="settings_use_hiyobi_title">hiyobi.meからロード</string>
+    <string name="settings_mirror_title">ミラーサーバー</string>
     <string name="settings_clear_history">履歴を削除</string>
     <string name="settings_clear_history_alert_message">履歴を削除しますか？</string>
     <string name="settings_clear_history_summary">履歴数: %1$d</string>
@@ -61,10 +61,10 @@
     <string name="main_export_error">エクスポートエラーが発生しました</string>
     <string name="settings_clear_downloads">ダウンロード削除</string>
     <string name="settings_clear_downloads_alert_message">ダウンロードしたギャラリーを全て削除します。\n実行しますか？</string>
-    <string name="settings_use_hiyobi_summary">ロード速度を向上させるため可能であればhiyobi.meからイメージロード</string>
+    <string name="settings_mirror_summary">ミラーサーバからイメージをロード</string>
     <string name="main_drawer_favorite">お気に入り</string>
     <string name="main_open_gallery_by_id">ギャラリー番号で見る</string>
-    <string name="main_open_gallery_by_id_error">エラーが発生しました</string>
+    <string name="reader_failed_to_find_gallery">エラーが発生しました</string>
     <string name="settings_storage">ストレージ</string>
     <string name="main_drawer_grouop_contact_discord">ディスコード</string>
     <string name="settings_app_lock">アプリロック</string>
@@ -120,4 +120,14 @@
     <string name="settings_app_version_description">v%s</string>
     <string name="settings_low_quality">低解像度イメージ</string>
     <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

@@ -18,7 +18,6 @@
     <string name="main_no_result">결과 없음</string>
     <string name="main_search">검색</string>
     <string name="settings_miscellaneous_title">기타</string>
-    <string name="settings_use_hiyobi_title">hiyobi.me 사용</string>
     <string name="settings_clear_history">기록 삭제</string>
     <string name="settings_clear_history_alert_message">기록을 삭제하시겠습니까?</string>
     <string name="settings_clear_history_summary">기록 %1$d개 저장됨</string>
@@ -61,10 +60,9 @@
     <string name="main_export_error">내보내기 오류가 발생했습니다</string>
     <string name="settings_clear_downloads">다운로드 삭제</string>
     <string name="settings_clear_downloads_alert_message">다운로드 된 만화를 모두 삭제합니다.\n계속하시겠습니까?</string>
-    <string name="settings_use_hiyobi_summary">속도 향상을 위해 가능하면 hiyobi.me에서 이미지 로드</string>
     <string name="main_drawer_favorite">즐겨찾기</string>
     <string name="main_open_gallery_by_id">갤러리 번호로 열기</string>
-    <string name="main_open_gallery_by_id_error">갤러리를 찾지 못했습니다</string>
+    <string name="reader_failed_to_find_gallery">갤러리를 찾지 못했습니다</string>
     <string name="settings_storage">저장 공간</string>
     <string name="main_drawer_grouop_contact_discord">디스코드</string>
     <string name="settings_app_lock">앱 잠금</string>
@@ -120,4 +118,16 @@
     <string name="settings_app_version_description">v%s</string>
     <string name="settings_low_quality">저해상도 이미지</string>
     <string name="settings_low_quality_summary">로드 속도와 데이터 사용량을 줄이기 위해 저해상도 이미지를 로드</string>
+    <string name="settings_mirror_summary">미러 서버에서 이미지 로드</string>
+    <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

@@ -57,4 +57,15 @@
         <item>japanese|日本語</item>
     </string-array>
 
+    <string-array name="mirrors">
+        <item>HITOMI|hitomi.la</item>
+        <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

@@ -60,7 +60,7 @@
     <string name="main_jump_title">Jump to page</string>
     <string name="main_jump_message">Current page: %1$d\nMaximum page: %2$d</string>
     <string name="main_open_gallery_by_id">Open Gallery by ID</string>
-    <string name="main_open_gallery_by_id_error">Failed to open gallery</string>
+    <string name="reader_failed_to_find_gallery">Failed to open gallery</string>
 
     <string name="main_move">Move to page %1$d</string>
 
@@ -140,6 +140,8 @@
     <string name="settings_dl_location_removable">Removable Storage</string>
     <string name="settings_dl_location_internal">Internal Storage</string>
     <string name="settings_dl_location_available">%s available</string>
+    <string name="settings_dl_location_custom">Custom Location</string>
+    <string name="settings_dl_location_not_writable">This folder is not writable. Please select another folder.</string>
     <string name="settings_low_quality">Low quality images</string>
     <string name="settings_low_quality_summary">Load low quality images to improve load speed and data usage</string>
 
@@ -151,8 +153,8 @@
     <!-- SETTINGS/MISCELLANEOUS -->
 
     <string name="settings_miscellaneous_title">Miscellaneous</string>
-    <string name="settings_use_hiyobi_title">Use hiyobi.me</string>
+    <string name="settings_mirror_summary">Load images from mirrors</string>
-    <string name="settings_use_hiyobi_summary">Load images from hiyobi.me to improve loading speed (if available)</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>
@@ -186,5 +188,15 @@
     <string name="default_query_dialog_filter_BL">Filter BL</string>
     <string name="default_query_dialog_filter_guro">Filter Guro</string>
     <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/file_paths.xml

@@ -17,6 +17,7 @@
   ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
+<paths>
     <external-path name="external" path="/"/>
+    <external-files-path name="files" path="/"/>
 </paths>

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"/>
 
@@ -66,10 +66,14 @@
     <PreferenceCategory
         app:title="@string/settings_miscellaneous_title">
 
-        <SwitchPreferenceCompat
+        <Preference
-            app:key="use_hiyobi"
+            app:key="mirrors"
-            app:title="@string/settings_use_hiyobi_title"
+            app:title="@string/settings_mirror_title"
-            app:summary="@string/settings_use_hiyobi_summary"/>
+            app:summary="@string/settings_mirror_summary"/>
+
+        <Preference
+            app:key="proxy"
+            app:title="@string/settings_proxy_title"/>
 
         <SwitchPreferenceCompat
             app:key="security_mode"

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

@@ -16,7 +16,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-@file:Suppress("UNUSED_VARIABLE")
+@file:Suppress("UNUSED_VARIABLE", "IncorrectScope")
 
 package xyz.quaver.pupil
 
@@ -26,20 +26,16 @@ package xyz.quaver.pupil
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 
+import android.util.SparseArray
 import org.junit.Test
-import xyz.quaver.pupil.util.download
-import java.io.File
-import java.net.URL
 
 class ExampleUnitTest {
 
     @Test
     fun test() {
-        URL("https://github.om/tom5079/Pupil/releases/download/4.2-beta2-hotfix2/Pupil-v4.2-beta2-hotfix2.apk").download(
+        val arr = SparseArray<Float>()
-            File(System.getenv("USERPROFILE"), "Pupil.apk")
+
-        ) { downloaded, fileSize ->
+        print(arr.indexOfKey(34))
-            println("%.1f%%".format(downloaded*100.0/fileSize))
-        }
     }
 
 }

build.gradle

@@ -15,7 +15,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'io.fabric.tools:gradle:1.29.0'
+        classpath 'io.fabric.tools:gradle:1.31.0'
         classpath 'com.google.firebase:perf-plugin:1.3.1'
     }
 }
@@ -25,9 +25,10 @@ allprojects {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
+        maven { url 'http://guardian.github.com/maven/repo-releases' }
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}

gradle.properties

@@ -1,18 +1,18 @@
-# Project-wide Gradle settings.
+## For more details on how to configure your build environment visit
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-# Kotlin code style for this project: "official" or "obsolete":
+#Thu Jan 30 12:29:48 KST 2020
 kotlin.code.style=official
-
+android.enableJetifier=true
+org.gradle.jvmargs=-Xmx1024M -Dkotlin.daemon.jvm.options\="-Xmx1024M"
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableR8.fullMode=true

libpupil/build.gradle

@@ -5,10 +5,10 @@ apply plugin: 'kotlinx-serialization'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0"
     implementation 'org.jsoup:jsoup:1.12.1'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
 }
 
 sourceCompatibility = "7"

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

@@ -0,0 +1,24 @@
+/*
+ *    Copyright 2020 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
+
+
+enum class Code {
+    HITOMI,
+    HIYOBI,
+    SORALA
+}

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,
+        GalleryInfo.serializer(),
-        Regex("""\[.+]""").find(
+        URL("$protocol//$domain/galleries/$galleryID.js").openConnection(proxy).getInputStream().use {
-            URL("$protocol//$domain/galleries/$galleryID.js").readText()
+            it.reader().readText()
-        )?.value ?: "[]"
+        }.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) =
+fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null) =
-    urlFromURL(urlFromHash(galleryID, image, dir, ext), base)
+    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

@@ -16,9 +16,12 @@
 
 package xyz.quaver.hitomi
 
+import kotlinx.serialization.Serializable
 import org.jsoup.Jsoup
+import xyz.quaver.proxy
 import java.net.URLDecoder
 
+@Serializable
 data class Gallery(
     val related: List<Int>,
     val langList: List<Pair<String, String>>,
@@ -34,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()
@@ -68,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

@@ -18,6 +18,8 @@ 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
@@ -33,40 +35,37 @@ fun fetchNozomi(area: String? = null, tag: String = "index", language: String =
                 else -> "$protocol//$domain/$area/$tag-$language$nozomiextension"
             }
 
-    try {
+    with(URL(url).openConnection() as HttpsURLConnection) {
-        with(URL(url).openConnection() as HttpsURLConnection) {
+        requestMethod = "GET"
-            requestMethod = "GET"
 
-            if (start != -1 && count != -1) {
+        if (start != -1 && count != -1) {
-                val startByte = start*4
+            val startByte = start*4
-                val endByte = (start+count)*4-1
+            val endByte = (start+count)*4-1
 
-                setRequestProperty("Range", "bytes=$startByte-$endByte")
+            setRequestProperty("Range", "bytes=$startByte-$endByte")
-            }
-
-            connect()
-
-            val totalItems = getHeaderField("Content-Range")
-                .replace(Regex("^[Bb]ytes \\d+-\\d+/"), "").toInt() / 4
-
-            val nozomi = ArrayList<Int>()
-
-            val arrayBuffer = ByteBuffer
-                .wrap(inputStream.readBytes())
-                .order(ByteOrder.BIG_ENDIAN)
-
-            while (arrayBuffer.hasRemaining())
-                nozomi.add(arrayBuffer.int)
-
-            return Pair(nozomi, totalItems)
         }
-    } catch (e: Exception) {
+
-        return Pair(emptyList(), 0)
+        connect()
+
+        val totalItems = getHeaderField("Content-Range")
+            .replace(Regex("^[Bb]ytes \\d+-\\d+/"), "").toInt() / 4
+
+        val nozomi = ArrayList<Int>()
+
+        val arrayBuffer = ByteBuffer
+            .wrap(inputStream.readBytes())
+            .order(ByteOrder.BIG_ENDIAN)
+
+        while (arrayBuffer.hasRemaining())
+            nozomi.add(arrayBuffer.int)
+
+        return Pair(nozomi, totalItems)
     }
 }
 
 @Serializable
 data class GalleryBlock(
+    val code: Code,
     val id: Int,
     val galleryUrl: String,
     val thumbnails: List<String>,
@@ -80,30 +79,26 @@ data class GalleryBlock(
 fun getGalleryBlock(galleryID: Int) : GalleryBlock? {
     val url = "$protocol//$domain/$galleryblockdir/$galleryID$extension"
 
-    try {
+    val doc = Jsoup.connect(url).proxy(proxy).get()
-        val doc = Jsoup.connect(url).get()
 
-        val galleryUrl = doc.selectFirst(".lillie").attr("href")
+    val galleryUrl = doc.selectFirst(".lillie").attr("href")
 
-        val thumbnails = doc.select("img").map { protocol + it.attr("data-src") }
+    val thumbnails = doc.select("img").map { protocol + it.attr("data-src") }
 
-        val title = doc.selectFirst("h1.lillie > a").text()
+    val title = doc.selectFirst("h1.lillie > a").text()
-        val artists = doc.select("div.artist-list a").map{ it.text() }
+    val artists = doc.select("div.artist-list a").map{ it.text() }
-        val series = doc.select("a[href~=^/series/]").map { it.text() }
+    val series = doc.select("a[href~=^/series/]").map { it.text() }
-        val type = doc.selectFirst("a[href~=^/type/]").text()
+    val type = doc.selectFirst("a[href~=^/type/]").text()
 
-        val language = {
+    val language = {
-            val href = doc.select("a[href~=^/index-.+-1.html]").attr("href")
+        val href = doc.select("a[href~=^/index-.+-1.html]").attr("href")
-            href.slice(7 until href.indexOf("-1"))
+        href.slice(7 until href.indexOf("-1"))
-        }.invoke()
+    }.invoke()
 
-        val relatedTags = doc.select(".relatedtags a").map {
+    val relatedTags = doc.select(".relatedtags a").map {
-            val href = URLDecoder.decode(it.attr("href"), "UTF-8")
+        val href = URLDecoder.decode(it.attr("href"), "UTF-8")
-            href.slice(5 until href.indexOf("-all"))
+        href.slice(5 until href.indexOf("-all"))
-        }
-
-        return GalleryBlock(galleryID, galleryUrl, thumbnails, title, artists, series, type, language, relatedTags)
-    } catch (e: Exception) {
-        return null
     }
+
+    return GalleryBlock(Code.HITOMI, galleryID, galleryUrl, thumbnails, title, artists, series, type, language, relatedTags)
 }

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

@@ -17,33 +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)
-    enum class Code {
-        HITOMI,
-        HIYOBI,
-        SORALA
-    }
-}
 
 //Set header `Referer` to reader url to avoid 403 error
 fun getReader(galleryID: Int) : Reader {
-    val readerUrl = "https://hitomi.la/reader/$galleryID.html"
+   return Reader(Code.HITOMI, getGalleryInfo(galleryID))
-
-    val doc = Jsoup.connect(readerUrl).get()
-
-   return Reader(Reader.Code.HITOMI, doc.title(), getGalleryInfo(galleryID))
 }

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

@@ -26,7 +26,7 @@ fun doSearch(query: String, sortByPopularity: Boolean = false) : List<Int> {
     val terms = query
         .trim()
         .replace(Regex("""^\?"""), "")
-        .toLowerCase()
+        .toLowerCase(Locale.US)
         .split(Regex("\\s+"))
         .map {
             it.replace('_', ' ')

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()}")
+        URL("$protocol//$domain/$name/version?_=${System.currentTimeMillis()}").openConnection(proxy).getInputStream().use {
-            .readText()
+            it.reader().readText()
+        }
     } catch (e: Exception) {
         ""
     }
@@ -173,22 +175,20 @@ fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : List
                 else -> "$protocol//$domain/$compressed_nozomi_prefix/$area/$tag-$language$nozomiextension"
             }
 
-    try {
+    val bytes = URL(nozomiAddress).openConnection(proxy).getInputStream().use {
-        val bytes = URL(nozomiAddress).readBytes()
+        it.readBytes()
-
-        val nozomi = ArrayList<Int>()
-
-        val arrayBuffer = ByteBuffer
-            .wrap(bytes)
-            .order(ByteOrder.BIG_ENDIAN)
-
-        while (arrayBuffer.hasRemaining())
-            nozomi.add(arrayBuffer.int)
-
-        return nozomi
-    } catch (e: Exception) {
-        return emptyList()
     }
+
+    val nozomi = ArrayList<Int>()
+
+    val arrayBuffer = ByteBuffer
+        .wrap(bytes)
+        .order(ByteOrder.BIG_ENDIAN)
+
+    while (arrayBuffer.hasRemaining())
+        nozomi.add(arrayBuffer.int)
+
+    return nozomi
 }
 
 fun getGalleryIDsFromData(data: Pair<Long, Int>) : List<Int> {
@@ -242,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

@@ -0,0 +1,46 @@
+/*
+ *    Copyright 2020 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.hiyobi
+
+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).proxy(proxy).get()
+
+    val galleryBlock = doc.selectFirst(".gallery-content")
+
+    val galleryUrl = galleryBlock.selectFirst("a").attr("href")
+
+    val thumbnails = listOf(galleryBlock.selectFirst("img").attr("abs:src"))
+
+    val title = galleryBlock.selectFirst("b").text()
+    val artists = galleryBlock.select("tr:matches(작가) a[href~=artist]").map { it.text() }
+    val series = galleryBlock.select("tr:matches(원작) a").map { it.attr("href").substringAfter("series:").replace('_', ' ') }
+    val type = galleryBlock.selectFirst("tr:matches(종류) a").attr("href").substringAfter("type:").replace('_', ' ')
+
+    val language = "korean"
+
+    val relatedTags = galleryBlock.select("tr:matches(태그) a").map { it.attr("href").substringAfterLast('/').replace('_', ' ') }
+
+    return GalleryBlock(Code.HIYOBI, galleryID, galleryUrl, thumbnails, title, artists, series, type, language, relatedTags)
+}

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

@@ -16,12 +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
 
@@ -46,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()
@@ -57,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 galleryFiles = Json.nonstrict.parse(
-    val galleryInfo = Json.parse(
+        GalleryFiles.serializer().list,
-        GalleryInfo.serializer().list,
+        with(URL(url).openConnection(proxy) as HttpsURLConnection) {
-        with(URL(url).openConnection() as HttpsURLConnection) {
             setRequestProperty("User-Agent", user_agent)
             setRequestProperty("Cookie", cookie)
             connectTimeout = 2000
@@ -76,14 +80,14 @@ fun getReader(galleryID: Int) : Reader {
         }
     )
 
-    return Reader(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 {
+        reader.galleryInfo.files.map {
-            val name = it.name.replace(Regex("/.[^/.]+$"), "") + ".jpg"
+            val name = it.name.replace(Regex("""\.[^/.]+$"""), "")
-            Images("$protocol//$hiyobi/data/$galleryID/$name.jpg", galleryID, it.name)
+            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

@@ -75,21 +75,21 @@ class UnitTest {
 
     @Test
     fun test_getReader() {
-        val reader = getReader(1442740)
+        val reader = getReader(1567569)
 
         print(reader)
     }
 
     @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")
 
@@ -102,4 +102,11 @@ class UnitTest {
 
         print(result)
     }
+
+    @Test
+    fun test_hiyobi_galleryBlock() {
+        val galleryBlock = xyz.quaver.hiyobi.getGalleryBlock(10000027)
+
+        print(galleryBlock)
+    }
 }