Bug fix

Auto redownload

.gitignore

@@ -17,3 +17,4 @@
 
 #Private files
 **/google-services.json
+**/credentials.json

.idea/codeStyles/Project.xml

@@ -1,10 +1,23 @@
 <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>
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">

.idea/copyright/Apache.xml

@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="   Copyright &amp;#36;today.year tom5079&#10;&#10;   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;   you may not use this file except in compliance with the License.&#10;   You may obtain a copy of the License at&#10;&#10;     http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;   Unless required by applicable law or agreed to in writing, software&#10;   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;   See the License for the specific language governing permissions and&#10;   limitations under the License." />
-    <option name="myName" value="Apache" />
-  </copyright>
-</component>

.idea/copyright/profiles_settings.xml

@@ -2,7 +2,6 @@
   <settings>
     <module2copyright>
       <element module="Pupil" copyright="GPL" />
-      <element module="libpupil" copyright="Apache" />
     </module2copyright>
   </settings>
 </component>

.idea/dictionaries/tom50.xml

@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="tom50">
+    <words>
+      <w>hitomi</w>
+    </words>
+  </dictionary>
+</component>

.idea/gradle.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/libpupil" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

.idea/jarRepositories.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="http://guardian.github.com/maven/repo-releases" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://guardian.github.com/maven/repo-releases" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://s3.amazonaws.com/fabric-artifacts-private/internal-snapshots" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven4" />
+      <option name="name" value="maven4" />
+      <option name="url" value="https://maven.fabric.io/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:/$USER_HOME$/.m2/repository/" />
+    </remote-repository>
+  </component>
+</project>

.idea/scopes/libpupil.xml

@@ -1,3 +0,0 @@
-<component name="DependencyValidationManager">
-  <scope name="libpupil" pattern="file[libpupil]:*/" />
-</component>

README.md

@@ -3,6 +3,8 @@
 ![Banner](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/pupil-banner.png?raw=true)
 *Pupil, Hitomi.la viewer for Android*  
 
+[![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)  
+
 # Screenshot
 ![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.png?raw=true)
 *Main Screen*

app/build.gradle

@@ -4,10 +4,10 @@ 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'
+    apply plugin: 'com.google.firebase.crashlytics'
     apply plugin: 'com.google.firebase.firebase-perf'
 } else {
     logger.lifecycle("Firebase Disabled")
@@ -19,75 +19,92 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 33
+        versionCode 57
-        versionName "5.0"
+        versionName "5.0-beta4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
-        release {
+        debug {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
+
+            debuggable true
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-DEBUG"
+
+            buildConfigField('Boolean', 'CENSOR', 'false')
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
+            ext.enableCrashlytics = false
+            ext.alwaysUpdateBuildId = false
         }
-        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 {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
         freeCompilerArgs += '-Xuse-experimental=kotlin.Experimental'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
+    buildToolsVersion = '29.0.3'
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-    buildToolsVersion = '29.0.2'
 }
 
 dependencies {
-    def markwonVersion = "3.0.1"
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC-HOTFIX1"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0"
+    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.preference:preference:1.1.1'
-    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 'androidx.fragment:fragment-ktx:1.2.5'
     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.3.0-alpha02'
-    implementation 'com.google.firebase:firebase-core:17.2.2'
+    implementation 'com.google.firebase:firebase-core:17.5.0'
-    implementation 'com.google.firebase:firebase-perf:19.0.5'
+    implementation 'com.google.firebase:firebase-analytics:17.5.0'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+    implementation 'com.google.firebase:firebase-perf:19.0.8'
     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'
+    //noinspection GradleDependency
-    implementation('com.github.bumptech.glide:recyclerview-integration:4.11.0') {
+    implementation 'com.squareup.okhttp3:okhttp:3.12.12'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    implementation ("com.github.bumptech.glide:okhttp3-integration:4.11.0") {
         transitive = false
     }
+    implementation 'com.github.bumptech.glide:annotations: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 'com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2'
     implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
-    implementation 'com.gu:option:1.3'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
-    implementation "ru.noties.markwon:core:${markwonVersion}"
+    //implementation 'com.andrognito.pinlockview:pinlockview:2.1.0'
-    kapt 'com.github.bumptech.glide:compiler:4.10.0'
+    implementation "ru.noties.markwon:core:3.1.0"
+    implementation ("xyz.quaver:libpupil:1.3") {
+        exclude group: 'org.jetbrains.kotlinx', module: 'kotlinx-serialization-core-jvm'
+    }
+    implementation "xyz.quaver:documentfilex:0.2.14-alpha2"
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    implementation project(path: ':libpupil')
 }
 
 androidExtensions {

app/proguard-rules.pro

@@ -19,3 +19,33 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-dontobfuscate
+
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep class * extends com.bumptech.glide.module.AppGlideModule {
+ <init>(...);
+}
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
+  *** rewind();
+}
+
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep class com.bumptech.glide.GeneratedAppGlideModuleImpl
+
+-keepattributes *Annotation*, InnerClasses
+-dontnote kotlinx.serialization.SerializationKt
+-keep,includedescriptorclasses class xyz.quaver.**$$serializer { *; } # <-- change package name to your app's
+-keepclassmembers class xyz.quaver.pupil.** { # <-- change package name to your app's
+    *** Companion;
+}
+-keepclasseswithmembers class xyz.quaver.pupil.** { # <-- change package name to your app's
+    kotlinx.serialization.KSerializer serializer(...);
+}
+-keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
+-keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
+-keep class xyz.quaver.pupil.util.Preferences

app/release/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "xyz.quaver.pupil",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "properties": [],
+      "versionCode": 57,
+      "versionName": "5.0-beta4",
+      "enabled": true,
+      "outputFile": "app-release.apk"
+    }
+  ]
+}

app/release/output.json

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

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

@@ -21,18 +21,14 @@
 package xyz.quaver.pupil
 
 import android.util.Log
-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.coroutines.runBlocking
-import kotlinx.serialization.ImplicitReflectionSerializer
-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.hitomi.getGalleryIDsFromNozomi
+import xyz.quaver.hitomi.getSuggestionsForQuery
 import xyz.quaver.hiyobi.cookie
 import xyz.quaver.hiyobi.createImgList
 import xyz.quaver.hiyobi.getReader
@@ -41,8 +37,7 @@ import xyz.quaver.pupil.ui.LockActivity
 import xyz.quaver.pupil.util.download.Cache
 import xyz.quaver.pupil.util.download.DownloadWorker
 import xyz.quaver.pupil.util.getDownloadDirectory
-import xyz.quaver.pupil.util.updateOldReaderGalleries
+import java.io.InputStreamReader
-import java.io.File
 import java.net.URL
 import javax.net.ssl.HttpsURLConnection
 
@@ -58,8 +53,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
@@ -67,11 +60,20 @@ class ExampleInstrumentedTest {
         val activityTestRule = ActivityTestRule(LockActivity::class.java)
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
 
-        ContextCompat.getExternalFilesDirs(appContext, null).forEachIndexed { index, file ->
+        Runtime.getRuntime().exec("du -hs " + getDownloadDirectory(appContext)).let {
-            Log.i("PUPILD", "$index: ${file?.absolutePath}")
+            InputStreamReader(it.inputStream).readLines().forEach { res ->
+                Log.i("PUPILD", res)
+            }
         }
     }
 
+    @Test
+    fun test_nozomi() {
+        val nozomi = getGalleryIDsFromNozomi(null, "index", "all")
+
+        Log.i("PUPILD", nozomi.size.toString())
+    }
+
     @Test
     fun test_doSearch() {
         val reader = getReader( 1426382)
@@ -88,40 +90,6 @@ class ExampleInstrumentedTest {
         Log.d("Pupil", data.size.toString())
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
-    @Test
-    fun test_deleteCodeFromReader() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-
-        val json = Json(JsonConfiguration.Stable)
-
-        listOf(
-            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)
-
-                reader.remove("code")
-
-                File(gallery, "reader.json").writeText(JsonObject(reader).toString())
-            }
-        }
-    }
-
-    @Test
-    fun test_updateOldReader() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-
-        updateOldReaderGalleries(context)
-    }
-
     @Test
     fun test_downloadWorker() {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
@@ -135,7 +103,7 @@ class ExampleInstrumentedTest {
         while(worker.progress.indexOfKey(galleryID) < 0 || worker.progress[galleryID] != null) {
             Log.i("PUPILD", worker.progress[galleryID]?.joinToString(" ") ?: "null")
 
-            if (worker.progress[galleryID]?.all { !it.isFinite() } == true)
+            if (worker.progress[galleryID]?.all { it.isInfinite() } == true)
                 break
         }
 
@@ -149,9 +117,14 @@ class ExampleInstrumentedTest {
         val galleryID = 1561552
 
         runBlocking {
-            Log.i("PUPILD", Cache(context).getReader(galleryID)?.title ?: "null")
+            Log.i("PUPILD", Cache(context).getReader(galleryID)?.galleryInfo?.title ?: "null")
         }
 
-        Log.i("PUPILD", Cache(context).getReaderOrNull(galleryID)?.title ?: "null")
+        Log.i("PUPILD", Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.title ?: "null")
+    }
+
+    @Test
+    fun test_suggestion() {
+        getSuggestionsForQuery("female:l")
     }
 }

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2019  tom5079
+  ~     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
@@ -17,7 +17,6 @@
   ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<resources xmlns:tools="http://schemas.android.com/tools">
-    android:layout_width="match_parent"
+    <string name="app_name" translatable="false" tools:override="true">Pupil-Debug</string>
-    android:layout_height="wrap_content"
+</resources>
-    android:columnCount="3"/>

app/src/main/AndroidManifest.xml

@@ -6,9 +6,10 @@
     <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
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        android:maxSdkVersion="21" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
 
     <application
         android:name=".Pupil"
@@ -19,10 +20,12 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:replace="android:theme">
+        android:networkSecurityConfig="@xml/network_security_config"
+        tools:replace="android:theme"
+        tools:ignore="UnusedAttribute">
 
         <provider
-            android:authorities="${applicationId}.fileprovider"
+            android:authorities="${applicationId}.provider"
             android:name="androidx.core.content.FileProvider"
             android:exported="false"
             android:grantUriPermissions="true">
@@ -33,6 +36,17 @@
 
         </provider>
 
+        <service android:name=".services.DownloadService"
+            android:exported="false"/>
+
+        <receiver
+            android:name=".receiver.UpdateBroadcastReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
+            </intent-filter>
+        </receiver>
+
         <activity android:name=".ui.LockActivity" />
         <activity
             android:name=".ui.ReaderActivity"
@@ -44,6 +58,61 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/galleries"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/manga"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/doujinshi"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/cg"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/reader"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
                     android:host="hitomi.la"
                     android:pathPrefix="/galleries"
@@ -55,6 +124,61 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/manga"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/doujinshi"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/cg"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPrefix="/reader"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="hiyobi.me"
+                    android:scheme="http"
+                    android:pathPrefix="/reader" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
                     android:host="hiyobi.me"
                     android:pathPrefix="/reader"
@@ -69,17 +193,6 @@
                 <data
                     android:host="e-hentai.org"
                     android:pathPrefix="/g"
-                    android:scheme="https" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/galleries"
                     android:scheme="http" />
             </intent-filter>
             <intent-filter>
@@ -88,26 +201,17 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data
-                    android:host="hiyobi.me"
-                    android:scheme="http"
-                    android:pathPrefix="/reader" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
                 <data
                     android:host="e-hentai.org"
                     android:pathPrefix="/g"
-                    android:scheme="http" />
+                    android:scheme="https" />
             </intent-filter>
         </activity>
         <activity
             android:name=".ui.SettingsActivity"
-            android:label="@string/settings_title" />
+            android:label="@string/settings_title">
+            <tools:validation testUrl="http://ix.io/eer" />
+        </activity>
         <activity
             android:name=".ui.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -118,6 +222,17 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="http"
+                    android:host="ix.io"
+                    android:pathPattern="/..*" />
+            </intent-filter>
         </activity>
         <activity android:name="net.rdrei.android.dirchooser.DirectoryChooserActivity" />
     </application>

app/src/main/java/com/arlib/floatingsearchview/FloatingSearchViewDayNight.kt

@@ -16,9 +16,20 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package xyz.quaver.pupil.util
+package com.arlib.floatingsearchview
 
-const val REQUEST_LOCK = 38238
+import android.content.Context
-const val REQUEST_RESTORE = 16546
+import android.os.Parcelable
-const val REQUEST_DOWNLOAD_FOLDER = 3874
+import android.util.AttributeSet
-const val REQUEST_DOWNLOAD_FOLDER_OLD = 3425
+
+class FloatingSearchViewDayNight @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null)
+    : FloatingSearchView(context, attrs) {
+
+    // hack to remove color attributes which should not be reused
+    override fun onSaveInstanceState(): Parcelable? {
+        super.onSaveInstanceState()
+        return null
+    }
+}

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

@@ -18,44 +18,118 @@
 
 package xyz.quaver.pupil
 
+import android.app.Application
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
+import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
-import androidx.multidex.MultiDexApplication
 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 xyz.quaver.pupil.util.Histories
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Response
+import xyz.quaver.io.FileX
+import xyz.quaver.pupil.util.*
+import xyz.quaver.setClient
 import java.io.File
+import java.util.*
+import java.util.concurrent.TimeUnit
+import kotlin.reflect.KClass
 
-class Pupil : MultiDexApplication() {
+typealias PupilInterceptor = (Interceptor.Chain) -> Response
 
-    lateinit var histories: Histories
+lateinit var histories: GalleryList
-    lateinit var favorites: Histories
+    private set
+lateinit var favorites: GalleryList
+    private set
+
+val interceptors = mutableMapOf<KClass<out Any>, PupilInterceptor>()
+
+lateinit var clientBuilder: OkHttpClient.Builder
+
+var clientHolder: OkHttpClient? = null
+val client: OkHttpClient
+    get() = clientHolder ?: clientBuilder.build().also {
+        clientHolder = it
+        setClient(it)
+    }
+
+class Pupil : Application() {
 
     init {
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
     }
 
     override fun onCreate() {
-        val preference = PreferenceManager.getDefaultSharedPreferences(this)
+        preferences = PreferenceManager.getDefaultSharedPreferences(this)
 
-        histories = Histories(File(ContextCompat.getDataDir(this), "histories.json"))
+        val userID = Preferences["user_id", ""].let {  userID ->
-        favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json"))
+            if (userID.isEmpty()) UUID.randomUUID().toString().also { Preferences["user_id"] = it }
-
+            else userID
-        val download = preference.getString("dl_location", null)
-
-        if (download == null) {
-            val default = ContextCompat.getExternalFilesDirs(this, null)[0]
-            preference.edit().putString("dl_location", Uri.fromFile(default).toString()).apply()
         }
 
+        FirebaseCrashlytics.getInstance().setUserId(userID)
+
+        val proxyInfo = getProxyInfo()
+
+        clientBuilder = OkHttpClient.Builder()
+            .connectTimeout(0, TimeUnit.SECONDS)
+            .readTimeout(0, TimeUnit.SECONDS)
+            .proxyInfo(proxyInfo)
+            .addInterceptor { chain ->
+                val request = chain.request()
+                val tag = request.tag() ?: return@addInterceptor chain.proceed(request)
+
+                interceptors[tag::class]?.invoke(chain) ?: chain.proceed(request)
+            }
+
+        try {
+            Preferences.get<String>("download_folder").also {
+                if (Build.VERSION.SDK_INT > 19)
+                    contentResolver.takePersistableUriPermission(
+                        Uri.parse(it),
+                        Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                    )
+
+                if (!FileX(this, it).canWrite())
+                    throw Exception()
+            }
+        } catch (e: Exception) {
+            Preferences.remove("download_folder")
+        }
+
+        histories = GalleryList(File(ContextCompat.getDataDir(this), "histories.json"))
+        favorites = GalleryList(File(ContextCompat.getDataDir(this), "favorites.json"))
+
+        if (Preferences["new_history"]) {
+            CoroutineScope(Dispatchers.IO).launch {
+                histories.reversed().let {
+                    histories.clear()
+                    histories.addAll(it)
+                }
+                favorites.reversed().let {
+                    favorites.clear()
+                    favorites.addAll(it)
+                }
+            }
+            Preferences["new_history"] = true
+        }
+
+        if (BuildConfig.DEBUG)
+            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)
+
         try {
             ProviderInstaller.installIfNeeded(this)
         } catch (e: GooglePlayServicesRepairableException) {
@@ -66,17 +140,37 @@ 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_MIN).apply {
+
+            manager.createNotificationChannel(NotificationChannel("download", getString(R.string.channel_download), NotificationManager.IMPORTANCE_LOW).apply {
                 description = getString(R.string.channel_download_description)
                 enableLights(false)
                 enableVibration(false)
                 lockscreenVisibility = Notification.VISIBILITY_SECRET
-            }
+            })
-            manager.createNotificationChannel(channel)
+
+            manager.createNotificationChannel(NotificationChannel("downloader", getString(R.string.channel_downloader), NotificationManager.IMPORTANCE_LOW).apply {
+                description = getString(R.string.channel_downloader_description)
+                enableLights(false)
+                enableVibration(false)
+                lockscreenVisibility = Notification.VISIBILITY_SECRET
+            })
+
+            manager.createNotificationChannel(NotificationChannel("update", getString(R.string.channel_update), NotificationManager.IMPORTANCE_HIGH).apply {
+                description = getString(R.string.channel_update_description)
+                enableLights(true)
+                enableVibration(true)
+                lockscreenVisibility = Notification.VISIBILITY_SECRET
+            })
+
+            manager.createNotificationChannel(NotificationChannel("import", getString(R.string.channel_update), NotificationManager.IMPORTANCE_LOW).apply {
+                description = getString(R.string.channel_update_description)
+                enableLights(false)
+                enableVibration(false)
+                lockscreenVisibility = Notification.VISIBILITY_SECRET
+            })
         }
 
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+        AppCompatDelegate.setDefaultNightMode(when (Preferences.get<Boolean>("dark_mode")) {
-        AppCompatDelegate.setDefaultNightMode(when (preference.getBoolean("dark_mode", false)) {
             true -> AppCompatDelegate.MODE_NIGHT_YES
             false -> AppCompatDelegate.MODE_NIGHT_NO
         })

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

@@ -0,0 +1,41 @@
+/*
+ *     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
+
+import android.content.Context
+import com.bumptech.glide.Glide
+import com.bumptech.glide.Registry
+import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.module.AppGlideModule
+import java.io.InputStream
+
+@GlideModule
+class PupilGlideModule : AppGlideModule() {
+
+    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
+        registry.append(
+            GlideUrl::class.java,
+            InputStream::class.java,
+            OkHttpUrlLoader.Factory(client)
+        )
+    }
+
+}

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

@@ -19,8 +19,10 @@
 package xyz.quaver.pupil.adapters
 
 import android.content.Context
+import android.graphics.Color
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.Drawable
-import android.util.Base64
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.View
@@ -32,8 +34,12 @@ 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.Glide
+import com.bumptech.glide.RequestManager
+import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
 import com.daimajia.swipe.SwipeLayout
 import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface
@@ -42,20 +48,23 @@ import kotlinx.android.synthetic.main.item_galleryblock.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import xyz.quaver.hitomi.GalleryBlock
+import kotlinx.coroutines.withContext
+import xyz.quaver.hitomi.getReader
+import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.BuildConfig
-import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.util.Histories
+import xyz.quaver.pupil.ui.view.TagChip
-import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.download.DownloadWorker
+import xyz.quaver.pupil.util.downloader.Cache
+import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.wordCapitalize
 import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.concurrent.schedule
 
-class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryBlock>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
+class GalleryBlockAdapter(private val glide: RequestManager, private val galleries: List<Int>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
 
     enum class ViewType {
         NEXT,
@@ -63,56 +72,68 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
         PREV
     }
 
-    private val glide = Glide.with(context)
-    private lateinit var favorites: Histories
-
     val timer = Timer()
 
+    var isThin = false
+
     inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
         var timerTask: TimerTask? = null
 
-        fun updateProgress(context: Context, galleryID: Int) = CoroutineScope(Dispatchers.Main).launch {
+        private fun updateProgress(context: Context, galleryID: Int) {
-            val cache = Cache(context).getCachedGallery(galleryID)
+            val cache = Cache.getInstance(context, galleryID)
-            val reader = Cache(context).getReaderOrNull(galleryID)
 
-            if (reader == null) {
+            CoroutineScope(Dispatchers.Main).launch {
-                view.galleryblock_progressbar.visibility = View.GONE
+                if (cache.metadata.reader == null || Preferences["cache_disable"]) {
-                view.galleryblock_progress_complete.visibility = View.GONE
+                    view.galleryblock_progressbar.visibility = View.GONE
-                return@launch
+                    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.size
                 }
 
-                if (progress == max) {
+                with(view.galleryblock_progressbar) {
-                    if (completeFlag.get(galleryID, false)) {
+                    val imageList = cache.metadata.imageList!!
-                        with(view.galleryblock_progress_complete) {
+
-                            setImageResource(R.drawable.ic_progressbar)
+                    progress = imageList.filterNotNull().size
-                            visibility = View.VISIBLE
+                    max = imageList.size
+
+                    if (visibility == View.GONE)
+                        visibility = View.VISIBLE
+
+                    if (progress == max) {
+                        val downloadManager = DownloadManager.getInstance(context)
+
+                        if (completeFlag.get(galleryID, false)) {
+                            with(view.galleryblock_progress_complete) {
+                                setImageResource(
+                                    if (downloadManager.getDownloadFolder(galleryID) != null)
+                                        R.drawable.ic_progressbar
+                                    else R.drawable.ic_progressbar_cache
+                                )
+                                visibility = View.VISIBLE
+                            }
+                        } else {
+                            with(view.galleryblock_progress_complete) {
+                                setImageDrawable(AnimatedVectorDrawableCompat.create(context,
+                                    if (downloadManager.getDownloadFolder(galleryID) != null)
+                                        R.drawable.ic_progressbar_complete
+                                    else R.drawable.ic_progressbar_complete_cache
+                                ).apply {
+                                    this?.start()
+                                })
+                                visibility = View.VISIBLE
+                            }
+                            completeFlag.put(galleryID, true)
                         }
-                    } else {
+                    } else
-                        with(view.galleryblock_progress_complete) {
+                        view.galleryblock_progress_complete.visibility = View.INVISIBLE
-                            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) {
+        fun bind(galleryID: Int) {
+            val cache = Cache.getInstance(view.context, galleryID)
+
+            val galleryBlock = cache.metadata.galleryBlock ?: return
+
             with(view) {
                 val resources = context.resources
                 val languages = resources.getStringArray(R.array.languages).map {
@@ -124,46 +145,54 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
                 val artists = galleryBlock.artists
                 val series = galleryBlock.series
 
+                if (isThin)
+                    galleryblock_thumbnail.layoutParams.width = context.resources.getDimensionPixelSize(
+                        R.dimen.galleryblock_thumbnail_thin
+                    )
+
                 galleryblock_thumbnail.setImageDrawable(CircularProgressDrawable(context).also {
                     it.start()
                 })
 
-                CoroutineScope(Dispatchers.Main).launch {
+                CoroutineScope(Dispatchers.IO).launch {
-                    val thumbnail = Base64.decode(Cache(context).getThumbnail(galleryBlock.id), Base64.DEFAULT)
+                    val thumbnail = cache.getThumbnail()
 
                     glide
                         .load(thumbnail)
                         .skipMemoryCache(true)
                         .diskCacheStrategy(DiskCacheStrategy.NONE)
                         .error(R.drawable.image_broken_variant)
+                        .listener(object: RequestListener<Drawable> {
+                            override fun onLoadFailed(
+                                e: GlideException?,
+                                model: Any?,
+                                target: Target<Drawable>?,
+                                isFirstResource: Boolean
+                            ): Boolean {
+                                Cache.getInstance(context, galleryID).let {
+                                    it.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
+                                    it.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
+                                }
+                                return false
+                            }
+
+                            override fun onResourceReady(
+                                resource: Drawable?,
+                                model: Any?,
+                                target: Target<Drawable>?,
+                                dataSource: DataSource?,
+                                isFirstResource: Boolean
+                            ): Boolean = false
+                        })
                         .apply {
                             if (BuildConfig.CENSOR)
                                 override(5, 8)
-                        }
+                        }.let { launch(Dispatchers.Main) { it.into(galleryblock_thumbnail) } }
-                        .into(galleryblock_thumbnail)
                 }
 
-                //Check cache
-                val cache = Cache(context).getCachedGallery(galleryBlock.id)
-                val reader = Cache(context).getReaderOrNull(galleryBlock.id)
-
-                if (cache != null && reader != null) {
-                    val count = cache.listFiles().count {
-                        Regex("^[0-9]+.+\$").matches(it.name!!)
-                    }
-
-                    with(galleryblock_progressbar) {
-                        max = reader.galleryInfo.size
-                        progress = count
-
-                        visibility = View.VISIBLE
-                    }
-                } else
-                    galleryblock_progressbar.visibility = View.GONE
-
                 if (timerTask == null)
                     timerTask = timer.schedule(0, 1000) {
-                        updateProgress(context, galleryBlock.id)
+                        updateProgress(context, galleryID)
                     }
 
                 galleryblock_title.text = galleryBlock.title
@@ -196,40 +225,24 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
 
                 galleryblock_tag_group.removeAllViews()
                 galleryBlock.relatedTags.forEach {
-                    galleryblock_tag_group.addView(Chip(context).apply {
+                    galleryblock_tag_group.addView(TagChip(context, Tag.parse(it)).apply {
-                        val tag = Tag.parse(it).let {  tag ->
+                        setOnClickListener { view ->
-                            when {
-                                tag.area != null -> tag
-                                else -> Tag("tag", it)
-                            }
-                        }
-
-                        chipIcon = when(tag.area) {
-                            "male" -> {
-                                setChipBackgroundColorResource(R.color.material_blue_700)
-                                setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                ContextCompat.getDrawable(context, R.drawable.ic_gender_male_white)
-                            }
-                            "female" -> {
-                                setChipBackgroundColorResource(R.color.material_pink_600)
-                                setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white)
-                            }
-                            else -> null
-                        }
-                        text = tag.tag.wordCapitalize()
-                        setEnsureMinTouchTargetSize(false)
-                        setOnClickListener {
                             for (callback in onChipClickedHandler)
-                                callback.invoke(tag)
+                                callback.invoke((view as TagChip).tag)
                         }
                     })
                 }
 
                 galleryblock_id.text = galleryBlock.id.toString()
-
+                galleryblock_pagecount.text = "-"
-                if (!::favorites.isInitialized)
+                CoroutineScope(Dispatchers.IO).launch {
-                    favorites = (context.applicationContext as Pupil).favorites
+                    val pageCount = kotlin.runCatching {
+                        getReader(galleryBlock.id).galleryInfo.files.size
+                    }.getOrNull() ?: return@launch
+                    withContext(Dispatchers.Main) {
+                        galleryblock_pagecount.text = context.getString(R.string.galleryblock_pagecount, pageCount)
+                    }
+                }
 
                 with(galleryblock_favorite) {
                     setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
@@ -257,6 +270,14 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
                         }
                     }
                 }
+
+
+                // Make some views invisible to make it thinner
+                if (isThin) {
+                    galleryblock_language.visibility = View.GONE
+                    galleryblock_type.visibility = View.GONE
+                    galleryblock_tag_group.visibility = View.GONE
+                }
             }
         }
     }
@@ -306,9 +327,9 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is GalleryViewHolder) {
-            val gallery = galleries[position-(if (showPrev) 1 else 0)]
+            val galleryID = galleries[position-(if (showPrev) 1 else 0)]
 
-            holder.bind(gallery)
+            holder.bind(galleryID)
 
             with(holder.view.galleryblock_primary) {
                 setOnClickListener {
@@ -334,10 +355,10 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
                     mItemManger.closeAllExcept(layout)
 
                     holder.view.galleryblock_download.text =
-                        if (DownloadWorker.getInstance(holder.view.context).progress.indexOfKey(gallery.id) < 0)
+                        if (DownloadManager.getInstance(holder.view.context).isDownloading(galleryID))
-                            holder.view.context.getString(R.string.main_download)
-                        else
                             holder.view.context.getString(android.R.string.cancel)
+                        else
+                            holder.view.context.getString(R.string.main_download)
                 }
 
                 override fun onClose(layout: SwipeLayout?) {}
@@ -359,8 +380,8 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
     }
 
     override fun getItemCount() =
-        (if (galleries.isEmpty()) 0 else galleries.size)+
+        galleries.size +
-        (if (showNext) 1 else 0)+
+        (if (showNext) 1 else 0) +
         (if (showPrev) 1 else 0)
 
     override fun getItemViewType(position: Int): Int {

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

@@ -18,15 +18,16 @@
 
 package xyz.quaver.pupil.adapters
 
+import android.annotation.SuppressLint
 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 xyz.quaver.pupil.util.Preferences
 import java.util.*
 
 class MirrorAdapter(context: Context) : RecyclerView.Adapter<MirrorAdapter.ViewHolder>() {
@@ -40,8 +41,7 @@ class MirrorAdapter(context: Context) : RecyclerView.Adapter<MirrorAdapter.ViewH
     }.toMap()
 
     val list = mirrors.keys.toMutableList().apply {
-        PreferenceManager.getDefaultSharedPreferences(context)
+        Preferences.get<String>("mirrors")
-            .getString("mirrors", "")!!
             .split(">")
             .reversed()
             .forEach {
@@ -60,6 +60,7 @@ class MirrorAdapter(context: Context) : RecyclerView.Adapter<MirrorAdapter.ViewH
     var onStartDrag : ((ViewHolder) -> Unit)? = null
     var onItemMoved : ((List<String>) -> (Unit))? = null
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         with(holder.view) {
             mirror_name.text = mirrors[list.elementAt(position)]

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

@@ -18,48 +18,53 @@
 
 package xyz.quaver.pupil.adapters
 
-import android.content.Context
+import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.google.android.material.snackbar.Snackbar
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.load.model.LazyHeaders
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
 import kotlinx.android.synthetic.main.item_reader.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import xyz.quaver.Code
 import xyz.quaver.hitomi.Reader
-import xyz.quaver.pupil.BuildConfig
+import xyz.quaver.hitomi.getReferer
+import xyz.quaver.hitomi.imageUrlFromImage
+import xyz.quaver.hiyobi.cookie
+import xyz.quaver.hiyobi.createImgList
+import xyz.quaver.hiyobi.user_agent
+import xyz.quaver.io.util.readBytes
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.services.DownloadService
-import xyz.quaver.pupil.util.download.DownloadWorker
+import xyz.quaver.pupil.ui.ReaderActivity
+import xyz.quaver.pupil.util.Preferences
+import xyz.quaver.pupil.util.downloader.Cache
 import java.util.*
 import kotlin.concurrent.schedule
 import kotlin.math.roundToInt
 
-class ReaderAdapter(private val context: Context,
+class ReaderAdapter(private val activity: ReaderActivity,
                     private val galleryID: Int) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
 
+    var reader: Reader? = null
+    val timer = Timer()
+
+    private val glide = Glide.with(activity)
+
     var isFullScreen = false
 
-    var reader: Reader? = null
-    private val glide = Glide.with(context)
-    val timer = Timer()
-
     var onItemClickListener : ((Int) -> (Unit))? = null
 
-    init {
-        CoroutineScope(Dispatchers.IO).launch {
-            reader = Cache(context).getReader(galleryID)
-            launch(Dispatchers.Main) {
-                notifyDataSetChanged()
-            }
-        }
-    }
-
     class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -70,13 +75,23 @@ class ReaderAdapter(private val context: Context,
         }
     }
 
+    private var cache: Cache? = null
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.view as ConstraintLayout
 
-        if (isFullScreen)
+        if (cache == null)
+            cache = Cache.getInstance(holder.view.context, galleryID)
+
+        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
+
+            (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
+                .dimensionRatio = "W,${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
+        }
 
         holder.view.image.setOnPhotoTapListener { _, _, _ ->
             onItemClickListener?.invoke(position)
@@ -86,60 +101,90 @@ class ReaderAdapter(private val context: Context,
             onItemClickListener?.invoke(position)
         }
 
-        (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
-            .dimensionRatio = "${reader!!.galleryInfo[position].width}:${reader!!.galleryInfo[position].height}"
-
         holder.view.reader_index.text = (position+1).toString()
 
-        val images = Cache(context).getImages(galleryID)
+        if (Preferences["cache_disable"]) {
+            val lowQuality: Boolean = Preferences["low_quality"]
 
-        if (images?.get(position) != null) {
+            val url = when (reader!!.code) {
-            glide
+                Code.HITOMI ->
-                .load(images[position]?.uri)
+                    GlideUrl(
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                        imageUrlFromImage(
-                .skipMemoryCache(true)
+                            galleryID,
-                .error(R.drawable.image_broken_variant)
+                            reader!!.galleryInfo.files[position],
-                .apply {
+                            !lowQuality
-                    if (BuildConfig.CENSOR)
+                        )
-                        override(5, 8)
+                    , LazyHeaders.Builder().addHeader("Referer", getReferer(galleryID)).build())
-                }
+                Code.HIYOBI ->
-                .into(holder.view.image)
+                    GlideUrl(createImgList(galleryID, reader!!, lowQuality)[position].path, LazyHeaders.Builder()
-        } else {
+                        .addHeader("User-Agent", user_agent)
-            val progress = DownloadWorker.getInstance(context).progress[galleryID]?.get(position)
+                        .addHeader("Cookie", cookie)
-
+                        .build())
-            if (progress?.isNaN() == true) {
+                else -> null
-                glide
-                    .load(R.drawable.image_broken_variant)
-                    .into(holder.view.image)
-                Snackbar
-                    .make(
-                        holder.view,
-                        DownloadWorker.getInstance(context).exception[galleryID]!![position]?.message
-                            ?: context.getText(R.string.default_error_msg),
-                        Snackbar.LENGTH_INDEFINITE
-                    )
-                    .show()
-
-                return
             }
+            holder.view.image.post {
+                glide
+                    .load(url!!)
+                    .diskCacheStrategy(DiskCacheStrategy.NONE)
+                    .skipMemoryCache(false)
+                    .fitCenter()
+                    .error(R.drawable.image_broken_variant)
+                    .into(holder.view.image)
+            }
+        } else {
+            val image = cache!!.getImage(position)
+            val progress = activity.downloader?.progress?.get(galleryID)?.get(position)
 
-            holder.view.reader_item_progressbar.progress =
+            if (progress?.isInfinite() == true && image != null) {
-                if (progress?.isInfinite() == true)
+                holder.view.reader_item_progressbar.visibility = View.INVISIBLE
-                    100
-                else
-                    progress?.roundToInt() ?: 0
 
-            holder.view.image.setImageDrawable(null)
+                CoroutineScope(Dispatchers.IO).launch {
+                    glide
+                        .load(image.readBytes())
+                        .diskCacheStrategy(DiskCacheStrategy.NONE)
+                        .skipMemoryCache(true)
+                        .fitCenter()
+                        .error(R.drawable.image_broken_variant)
+                        .listener(object: RequestListener<Drawable> {
+                            override fun onLoadFailed(
+                                e: GlideException?,
+                                model: Any?,
+                                target: Target<Drawable>?,
+                                isFirstResource: Boolean
+                            ): Boolean {
+                                cache!!.metadata.imageList?.set(position, null)
+                                image.delete()
+                                DownloadService.cancel(holder.view.context, galleryID)
+                                DownloadService.download(holder.view.context, galleryID, true)
+                                return true
+                            }
 
+                            override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean) =
+                                false
+                        }).let { launch(Dispatchers.Main) { it.into(holder.view.image) } }
+                }
+            } else {
+                holder.view.reader_item_progressbar.visibility = View.VISIBLE
 
-            timer.schedule(1000) {
+                glide.clear(holder.view.image)
-                CoroutineScope(Dispatchers.Main).launch {
+
-                    notifyItemChanged(position)
+                holder.view.reader_item_progressbar.progress =
+                    if (progress?.isInfinite() == true)
+                        100
+                    else
+                        progress?.roundToInt() ?: 0
+
+                holder.view.image.setImageDrawable(null)
+
+                timer.schedule(1000) {
+                    CoroutineScope(Dispatchers.Main).launch {
+                        notifyItemChanged(position)
+                    }
                 }
             }
         }
     }
 
-    override fun getItemCount() = reader?.galleryInfo?.size ?: 0
+    override fun getItemCount() = reader?.galleryInfo?.files?.size ?: 0
 
 }

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

@@ -22,9 +22,10 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.RequestManager
+import com.bumptech.glide.load.engine.DiskCacheStrategy
 import xyz.quaver.pupil.BuildConfig
 
-class ThumbnailAdapter(private val glide: RequestManager, private val thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {
+class ThumbnailAdapter(private val glide: RequestManager, var thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {
 
     class ViewHolder(val view: ImageView) : RecyclerView.ViewHolder(view)
 
@@ -35,6 +36,7 @@ class ThumbnailAdapter(private val glide: RequestManager, private val thumbnails
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         glide
             .load(thumbnails[position])
+            .diskCacheStrategy(DiskCacheStrategy.NONE)
             .apply {
                 if (BuildConfig.CENSOR)
                     override(5, 8)

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

@@ -0,0 +1,50 @@
+/*
+ *     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.view.ViewGroup
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.RequestManager
+import kotlin.math.min
+
+class ThumbnailPageAdapter(private val glide: RequestManager, private val thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailPageAdapter.ViewHolder>() {
+
+    class ViewHolder(val view: RecyclerView) : RecyclerView.ViewHolder(view)
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return ViewHolder(RecyclerView(parent.context).apply {
+            layoutManager = GridLayoutManager(parent.context, 3)
+            adapter = ThumbnailAdapter(glide, listOf())
+            layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        })
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        (holder.view.adapter as ThumbnailAdapter).apply {
+            thumbnails = this@ThumbnailPageAdapter.thumbnails.slice(9*position until min(9*position+9, this@ThumbnailPageAdapter.thumbnails.size))
+            notifyDataSetChanged()
+
+            holder.view.layoutManager?.scrollToPosition(itemCount-1)
+        }
+    }
+
+    override fun getItemCount() = if (thumbnails.isEmpty()) 0 else thumbnails.size/9 + if (thumbnails.size%9 != 0) 1 else 0
+
+}

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

@@ -0,0 +1,93 @@
+/*
+ *     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.receiver
+
+import android.app.DownloadManager
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.webkit.MimeTypeMap
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.FileProvider
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.util.Preferences
+import java.io.File
+
+class UpdateBroadcastReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context?, intent: Intent?) {
+        context ?: return
+
+        when (intent?.action) {
+            DownloadManager.ACTION_DOWNLOAD_COMPLETE -> {
+
+                // Validate download
+                val downloadID: Long = Preferences["update_download_id"]
+                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+
+                if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -2) != downloadID)
+                    return
+
+                // Get target uri
+
+                val query = DownloadManager.Query()
+                    .setFilterById(downloadID)
+
+                val uri = downloadManager.query(query).use { cursor ->
+                    if (cursor.moveToFirst()) {
+                        cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)).let {
+                            val uri = Uri.parse(it)
+
+                            when (uri.scheme) {
+                                "file" ->
+                                    FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!)
+                                    )
+                                "content" -> uri
+                                else -> null
+                            }
+                        }
+                    } else
+                        null
+                } ?: return
+
+                // Build Notification
+
+                val notificationManager = NotificationManagerCompat.from(context)
+
+                val pendingIntent = PendingIntent.getActivity(context, 0, Intent(Intent.ACTION_VIEW).apply {
+                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
+                    setDataAndType(uri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
+                }, 0)
+
+                val notification = NotificationCompat.Builder(context, "update")
+                    .setSmallIcon(android.R.drawable.stat_sys_download_done)
+                    .setContentTitle(context.getText(R.string.update_download_completed))
+                    .setContentText(context.getText(R.string.update_download_completed_description))
+                    .setContentIntent(pendingIntent)
+                    .build()
+
+                notificationManager.notify(R.id.notification_id_update, notification)
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,405 @@
+/*
+ *     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.services
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.util.SparseArray
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.TaskStackBuilder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.Response
+import okhttp3.ResponseBody
+import okio.*
+import xyz.quaver.pupil.PupilInterceptor
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.client
+import xyz.quaver.pupil.interceptors
+import xyz.quaver.pupil.ui.ReaderActivity
+import xyz.quaver.pupil.util.downloader.Cache
+import xyz.quaver.pupil.util.downloader.DownloadManager
+import xyz.quaver.pupil.util.ellipsize
+import xyz.quaver.pupil.util.normalizeID
+import xyz.quaver.pupil.util.requestBuilders
+import xyz.quaver.pupil.util.startForegroundServiceCompat
+import java.io.IOException
+
+private typealias ProgressListener = (DownloadService.Tag, Long, Long, Boolean) -> Unit
+class DownloadService : Service() {
+    data class Tag(val galleryID: Int, val index: Int, val startId: Int? = null)
+
+    //region Notification
+    private val notificationManager by lazy {
+        NotificationManagerCompat.from(this)
+    }
+
+    private val serviceNotification by lazy {
+        NotificationCompat.Builder(this, "downloader")
+            .setContentTitle(getString(R.string.downloader_running))
+            .setProgress(0, 0, false)
+            .setSmallIcon(R.drawable.ic_notification)
+            .setOngoing(true)
+    }
+
+    private val notification = SparseArray<NotificationCompat.Builder?>()
+
+    private fun initNotification(galleryID: Int) {
+        val intent = Intent(this, ReaderActivity::class.java)
+            .putExtra("galleryID", galleryID)
+
+        val pendingIntent = TaskStackBuilder.create(this).run {
+            addNextIntentWithParentStack(intent)
+            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+        val action =
+            NotificationCompat.Action.Builder(0, getText(android.R.string.cancel),
+                PendingIntent.getService(
+                    this,
+                    R.id.notification_download_cancel_action.normalizeID(),
+                    Intent(this, DownloadService::class.java)
+                        .putExtra(KEY_COMMAND, COMMAND_CANCEL)
+                        .putExtra(KEY_ID, galleryID),
+                    PendingIntent.FLAG_UPDATE_CURRENT),
+            ).build()
+
+        notification.put(galleryID, NotificationCompat.Builder(this, "download").apply {
+            setContentTitle(getString(R.string.reader_loading))
+            setContentText(getString(R.string.reader_notification_text))
+            setSmallIcon(R.drawable.ic_notification)
+            setContentIntent(pendingIntent)
+            addAction(action)
+            setProgress(0, 0, true)
+            setOngoing(true)
+        })
+
+        notify(galleryID)
+    }
+
+    @SuppressLint("RestrictedApi")
+    private fun notify(galleryID: Int) {
+        val max = progress[galleryID]?.size ?: 0
+        val progress = progress[galleryID]?.count { it == Float.POSITIVE_INFINITY } ?: 0
+
+        val notification = notification[galleryID] ?: return
+
+        if (isCompleted(galleryID)) {
+            notification
+                .setContentText(getString(R.string.reader_notification_complete))
+                .setProgress(0, 0, false)
+                .setOngoing(false)
+                .mActions.clear()
+
+            notificationManager.cancel(galleryID)
+        } else
+            notification
+                .setProgress(max, progress, false)
+                .setContentText("$progress/$max")
+
+        if (DownloadManager.getInstance(this).getDownloadFolder(galleryID) != null)
+            notification.let { notificationManager.notify(galleryID, it.build()) }
+        else
+            notificationManager.cancel(galleryID)
+    }
+    //endregion
+
+    //region ProgressListener
+    @Suppress("UNCHECKED_CAST")
+    private val progressListener: ProgressListener = { (galleryID, index), bytesRead, contentLength, done ->
+        if (!done && progress[galleryID]?.get(index)?.isFinite() == true)
+            progress[galleryID]?.set(index, bytesRead * 100F / contentLength)
+    }
+
+    private 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()
+
+        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.invoke(tag as Tag, totalBytesRead, responseBody.contentLength(), bytesRead == -1L)
+
+                return bytesRead
+            }
+        }
+    }
+
+    private val interceptor: PupilInterceptor = { chain ->
+        val request = chain.request()
+        var response = chain.proceed(request)
+
+        var retry = 5
+        while (!response.isSuccessful && retry > 0) {
+            response = chain.proceed(request)
+            retry--
+        }
+
+        response.newBuilder()
+            .body(response.body()?.let {
+                ProgressResponseBody(request.tag(), it, progressListener)
+            }).build()
+    }
+    //endregion
+
+    //region Downloader
+    /**
+    * 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
+    */
+    val progress = SparseArray<MutableList<Float>?>()
+
+    fun isCompleted(galleryID: Int) = progress[galleryID]?.toList()?.all { it == Float.POSITIVE_INFINITY } == true
+
+    private val callback = object: Callback {
+
+        override fun onFailure(call: Call, e: IOException) {
+            if (e.message?.contains("cancel", true) == false) {
+                val galleryID = (call.request().tag() as Tag).galleryID
+
+                // Retry
+                cancel(galleryID)
+                download(galleryID)
+            }
+        }
+
+        override fun onResponse(call: Call, response: Response) {
+            val (galleryID, index, startId) = call.request().tag() as Tag
+            val ext = call.request().url().encodedPath().split('.').last()
+
+            kotlin.runCatching {
+                val image = response.body()?.use { it.bytes() } ?: throw Exception()
+
+                CoroutineScope(Dispatchers.IO).launch {
+                    kotlin.runCatching {
+                        Cache.getInstance(this@DownloadService, galleryID).putImage(index, "$index.$ext", image)
+                    }.onSuccess {
+                        progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
+                        notify(galleryID)
+
+                        if (isCompleted(galleryID)) {
+                            if (DownloadManager.getInstance(this@DownloadService)
+                                    .getDownloadFolder(galleryID) != null)
+                                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
+
+                            startId?.let { stopSelf(it) }
+                        }
+                    }.onFailure {
+                        cancel(galleryID)
+                        download(galleryID)
+                    }
+                }
+            }
+        }
+    }
+
+    fun cancel(startId: Int? = null) {
+        client.dispatcher().queuedCalls().filter {
+            it.request().tag() is Tag
+        }.forEach {
+            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
+            it.cancel()
+        }
+        client.dispatcher().runningCalls().filter {
+            it.request().tag() is Tag
+        }.forEach {
+            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
+            it.cancel()
+        }
+
+        progress.clear()
+        notification.clear()
+        notificationManager.cancelAll()
+
+        startId?.let { stopSelf(it) }
+    }
+
+    fun cancel(galleryID: Int, startId: Int? = null) {
+        client.dispatcher().queuedCalls().filter {
+            (it.request().tag() as? Tag)?.galleryID == galleryID
+        }.forEach {
+            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
+            it.cancel()
+        }
+        client.dispatcher().runningCalls().filter {
+            (it.request().tag() as? Tag)?.galleryID == galleryID
+        }.forEach {
+            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
+            it.cancel()
+        }
+
+        progress.remove(galleryID)
+        notification.remove(galleryID)
+        notificationManager.cancel(galleryID)
+
+        startId?.let { stopSelf(it) }
+    }
+
+    fun delete(galleryID: Int, startId: Int? = null) = CoroutineScope(Dispatchers.IO).launch {
+        cancel(galleryID)
+        DownloadManager.getInstance(this@DownloadService).deleteDownloadFolder(galleryID)
+        Cache.delete(galleryID)
+
+        startId?.let { stopSelf(it) }
+    }
+
+    fun download(galleryID: Int, priority: Boolean = false, startId: Int? = null): Job = CoroutineScope(Dispatchers.IO).launch {
+        if (progress.indexOfKey(galleryID) >= 0)
+            cancel(galleryID)
+
+        val cache = Cache.getInstance(this@DownloadService, galleryID)
+
+        initNotification(galleryID)
+
+        val reader = cache.getReader()
+
+        // Gallery doesn't exist
+        if (reader == null) {
+            delete(galleryID)
+            progress.put(galleryID, null)
+            return@launch
+        }
+
+        if (progress.indexOfKey(galleryID) < 0)
+            progress.put(galleryID, MutableList(reader.galleryInfo.files.size) { 0F })
+
+        cache.metadata.imageList?.forEachIndexed { index, image ->
+            progress[galleryID]?.set(index, if (image != null) Float.POSITIVE_INFINITY else 0F)
+        }
+
+        notification[galleryID]?.setContentTitle(reader.galleryInfo.title?.ellipsize(30))
+        notify(galleryID)
+
+        val queued = mutableSetOf<Int>()
+
+        if (priority) {
+            client.dispatcher().queuedCalls().forEach {
+                val queuedID = (it.request().tag() as? Tag)?.galleryID ?: return@forEach
+
+                if (queued.add(queuedID))
+                    cancel(queuedID)
+            }
+        }
+
+        reader.requestBuilders.forEachIndexed { index, it ->
+            if (progress[galleryID]?.get(index)?.isInfinite() != true) {
+                val request = it.tag(Tag(galleryID, index, startId)).build()
+                client.newCall(request).enqueue(callback)
+            }
+        }
+
+        queued.forEach { download(it) }
+    }
+    //endregion
+
+    companion object {
+        const val KEY_COMMAND = "COMMAND"   // String
+        const val KEY_ID = "ID"             // Int
+        const val KEY_PRIORITY = "PRIORITY" // Boolean
+
+        const val COMMAND_DOWNLOAD = "DOWNLOAD"
+        const val COMMAND_CANCEL = "CANCEL"
+        const val COMMAND_DELETE = "DELETE"
+
+        private fun command(context: Context, extras: Intent.() -> Unit) {
+            context.startForegroundServiceCompat(Intent(context, DownloadService::class.java).apply(extras))
+        }
+
+        fun download(context: Context, galleryID: Int, priority: Boolean = false) {
+            command(context) {
+                putExtra(KEY_COMMAND, COMMAND_DOWNLOAD)
+                putExtra(KEY_PRIORITY, priority)
+                putExtra(KEY_ID, galleryID)
+            }
+        }
+
+        fun cancel(context: Context, galleryID: Int? = null) {
+            command(context) {
+                putExtra(KEY_COMMAND, COMMAND_CANCEL)
+                galleryID?.let { putExtra(KEY_ID, it) }
+            }
+        }
+
+        fun delete(context: Context, galleryID: Int) {
+            command(context) {
+                putExtra(KEY_COMMAND, COMMAND_DELETE)
+                putExtra(KEY_ID, galleryID)
+            }
+        }
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        when (intent?.getStringExtra(KEY_COMMAND)) {
+            COMMAND_DOWNLOAD -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0)
+                download(it, intent.getBooleanExtra(KEY_PRIORITY, false), startId)
+            }
+            COMMAND_CANCEL -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0) cancel(it, startId) else cancel(startId = startId) }
+            COMMAND_DELETE -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0) delete(it, startId) }
+        }
+
+        return START_NOT_STICKY
+    }
+
+    inner class Binder : android.os.Binder() {
+        val service = this@DownloadService
+    }
+
+    private val binder = Binder()
+    override fun onBind(p0: Intent?) = binder
+
+    override fun onCreate() {
+        startForeground(R.id.downloader_notification_id, serviceNotification.build())
+        interceptors[Tag::class] = interceptor
+    }
+
+    override fun onDestroy() {
+        interceptors.remove(Tag::class)
+    }
+}

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

@@ -19,6 +19,7 @@
 package xyz.quaver.pupil.types
 
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
 @Serializable
 data class Tag(val area: String?, val tag: String, val isNegative: Boolean = false) {
@@ -67,7 +68,7 @@ data class Tag(val area: String?, val tag: String, val isNegative: Boolean = fal
     }
 }
 
-class Tags(tag: List<Tag?>?) : ArrayList<Tag>() {
+class Tags(val tags: MutableSet<Tag> = mutableSetOf()) : MutableSet<Tag> by tags {
 
     companion object {
         fun parse(tags: String) : Tags {
@@ -77,20 +78,13 @@ class Tags(tag: List<Tag?>?) : ArrayList<Tag>() {
                         Tag.parse(it)
                     else
                         null
-                }
+                }.filterNotNull().toMutableSet()
             )
         }
     }
 
-    init {
-        tag?.forEach {
-            if (it != null)
-                add(it)
-        }
-    }
-
     fun contains(element: String): Boolean {
-        forEach {
+        tags.forEach {
             if (it.toString() == element)
                 return true
         }
@@ -99,23 +93,25 @@ class Tags(tag: List<Tag?>?) : ArrayList<Tag>() {
     }
 
     fun add(element: String): Boolean {
-        return super.add(Tag.parse(element))
+        return tags.add(Tag.parse(element))
     }
 
     fun remove(element: String) {
-        filter { it.toString() == element }.forEach {
+        tags.filter { it.toString() == element }.forEach {
-            remove(it)
+            tags.remove(it)
         }
     }
 
     fun removeByArea(area: String, isNegative: Boolean? = null) {
-        filter { it.area == area && (if(isNegative == null) true else (it.isNegative == isNegative)) }.forEach {
+        tags.filter { it.area == area && (if(isNegative == null) true else (it.isNegative == isNegative)) }.forEach {
-            remove(it)
+            tags.remove(it)
         }
     }
 
     override fun toString(): String {
-        return joinToString(" ") { it.toString() }
+        return tags.joinToString(" ") { it.toString() }
     }
 
+
+
 }

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

@@ -21,23 +21,157 @@ package xyz.quaver.pupil.ui
 import android.app.Activity
 import android.app.AlertDialog
 import android.os.Bundle
+import android.view.animation.Animation
+import android.view.animation.AnimationUtils
 import androidx.appcompat.app.AppCompatActivity
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricPrompt
+import androidx.core.content.ContextCompat
 import com.andrognito.patternlockview.PatternLockView
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_lock.*
 import kotlinx.android.synthetic.main.fragment_pattern_lock.*
+import kotlinx.android.synthetic.main.fragment_pin_lock.*
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.ui.fragment.PINLockFragment
 import xyz.quaver.pupil.ui.fragment.PatternLockFragment
 import xyz.quaver.pupil.util.Lock
 import xyz.quaver.pupil.util.LockManager
+import xyz.quaver.pupil.util.Preferences
 
 class LockActivity : AppCompatActivity() {
 
+    private lateinit var lockManager: LockManager
+    private var mode: String? = null
+
+    private val patternLockFragment = PatternLockFragment().apply {
+        var lastPass = ""
+        onPatternDrawn = {
+            when(mode) {
+                null -> {
+                    val result = lockManager.check(it)
+
+                    if (result == true) {
+                        setResult(Activity.RESULT_OK)
+                        finish()
+                    } else
+                        lock_pattern_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
+                }
+                "add_lock" -> {
+                    if (lastPass.isEmpty()) {
+                        lastPass = it
+
+                        Snackbar.make(view!!, R.string.settings_lock_confirm, Snackbar.LENGTH_LONG).show()
+                    } else {
+                        if (lastPass == it) {
+                            LockManager(context!!).add(Lock.generate(Lock.Type.PATTERN, it))
+                            finish()
+                        } else {
+                            lock_pattern_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
+                            lastPass = ""
+
+                            Snackbar.make(view!!, R.string.settings_lock_wrong_confirm, Snackbar.LENGTH_LONG).show()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private val pinLockFragment = PINLockFragment().apply {
+        var lastPass = ""
+        onPINEntered = {
+            when(mode) {
+                null -> {
+                    val result = lockManager.check(it)
+
+                    if (result == true) {
+                        setResult(Activity.RESULT_OK)
+                        finish()
+                    } else {
+                        indicator_dots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
+                            setAnimationListener(object: Animation.AnimationListener {
+                                override fun onAnimationEnd(animation: Animation?) {
+                                    pin_lock_view.resetPinLockView()
+                                    pin_lock_view.isEnabled = true
+                                }
+
+                                override fun onAnimationStart(animation: Animation?) {
+                                    pin_lock_view.isEnabled = false
+                                }
+
+                                override fun onAnimationRepeat(animation: Animation?) {
+                                    // Do Nothing
+                                }
+                            })
+                        })
+                    }
+                }
+                "add_lock" -> {
+                    if (lastPass.isEmpty()) {
+                        lastPass = it
+
+                        pin_lock_view.resetPinLockView()
+                        Snackbar.make(view!!, R.string.settings_lock_confirm, Snackbar.LENGTH_LONG).show()
+                    } else {
+                        if (lastPass == it) {
+                            LockManager(context!!).add(Lock.generate(Lock.Type.PIN, it))
+                            finish()
+                        } else {
+                            indicator_dots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
+                                setAnimationListener(object: Animation.AnimationListener {
+                                    override fun onAnimationEnd(animation: Animation?) {
+                                        pin_lock_view.resetPinLockView()
+                                        pin_lock_view.isEnabled = true
+                                    }
+
+                                    override fun onAnimationStart(animation: Animation?) {
+                                        pin_lock_view.isEnabled = false
+                                    }
+
+                                    override fun onAnimationRepeat(animation: Animation?) {
+                                        // Do Nothing
+                                    }
+                                })
+                            })
+                            lastPass = ""
+
+                            Snackbar.make(view!!, R.string.settings_lock_wrong_confirm, Snackbar.LENGTH_LONG).show()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun showBiometricPrompt() {
+        val promptInfo = BiometricPrompt.PromptInfo.Builder()
+            .setTitle(getText(R.string.settings_lock_fingerprint_prompt))
+            .setSubtitle(getText(R.string.settings_lock_fingerprint_prompt_subtitle))
+            .setNegativeButtonText(getText(android.R.string.cancel))
+            .setConfirmationRequired(false)
+            .build()
+
+        val biometricPrompt = BiometricPrompt(this, ContextCompat.getMainExecutor(this),
+            object : BiometricPrompt.AuthenticationCallback() {
+                override fun onAuthenticationSucceeded(
+                    result: BiometricPrompt.AuthenticationResult) {
+                    super.onAuthenticationSucceeded(result)
+                    setResult(RESULT_OK)
+                    finish()
+                    return
+                }
+            })
+
+        // Displays the "log in" prompt.
+        biometricPrompt.authenticate(promptInfo)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_lock)
 
-        val lockManager = try {
+        lockManager = try {
             LockManager(this)
         } catch (e: Exception) {
             AlertDialog.Builder(this).apply {
@@ -50,12 +184,7 @@ class LockActivity : AppCompatActivity() {
             return
         }
 
-        val mode = intent.getStringExtra("mode")
+        mode = intent.getStringExtra("mode")
-
-        lock_pattern.isEnabled = false
-        lock_pin.isEnabled = false
-        lock_fingerprint.isEnabled = false
-        lock_password.isEnabled = false
 
         when(mode) {
             null -> {
@@ -64,52 +193,75 @@ class LockActivity : AppCompatActivity() {
                     finish()
                     return
                 }
+
+                if (
+                    Preferences["lock_fingerprint"]
+                    && BiometricManager.from(this).canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS
+                ) {
+                    lock_fingerprint.apply {
+                        isEnabled = true
+                        setOnClickListener {
+                            showBiometricPrompt()
+                        }
+                    }
+                    showBiometricPrompt()
+                }
+
+                lock_pattern.apply {
+                    isEnabled = lockManager.contains(Lock.Type.PATTERN)
+                    setOnClickListener {
+                        supportFragmentManager.beginTransaction().replace(
+                            R.id.lock_content, patternLockFragment
+                        ).commit()
+                    }
+                }
+                lock_pin.apply {
+                    isEnabled = lockManager.contains(Lock.Type.PIN)
+                    setOnClickListener {
+                        supportFragmentManager.beginTransaction().replace(
+                            R.id.lock_content, pinLockFragment
+                        ).commit()
+                    }
+                }
+                lock_password.isEnabled = false
+
+                when (lockManager.locks!!.first().type) {
+                    Lock.Type.PIN -> {
+
+                        supportFragmentManager.beginTransaction().add(
+                            R.id.lock_content, pinLockFragment
+                        ).commit()
+                    }
+                    Lock.Type.PATTERN -> {
+                        supportFragmentManager.beginTransaction().add(
+                            R.id.lock_content, patternLockFragment
+                        ).commit()
+                    }
+                    else -> return
+                }
             }
             "add_lock" -> {
+                lock_pattern.isEnabled = false
+                lock_pin.isEnabled = false
+                lock_fingerprint.isEnabled = false
+                lock_password.isEnabled = false
+
                 when(intent.getStringExtra("type")!!) {
                     "pattern" -> {
-
+                        lock_pattern.isEnabled = true
+                        supportFragmentManager.beginTransaction().add(
+                            R.id.lock_content, patternLockFragment
+                        ).commit()
+                    }
+                    "pin" -> {
+                        lock_pin.isEnabled = true
+                        supportFragmentManager.beginTransaction().add(
+                            R.id.lock_content, pinLockFragment
+                        ).commit()
                     }
                 }
             }
         }
-
-        supportFragmentManager.beginTransaction().add(
-            R.id.lock_content,
-            PatternLockFragment().apply {
-                var lastPass = ""
-                onPatternDrawn = {
-                    when(mode) {
-                        null -> {
-                            val result = lockManager.check(it)
-
-                            if (result == true) {
-                                setResult(Activity.RESULT_OK)
-                                finish()
-                            } else
-                                lock_pattern_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
-                        }
-                        "add_lock" -> {
-                            if (lastPass.isEmpty()) {
-                                lastPass = it
-
-                                Snackbar.make(view!!, R.string.settings_lock_confirm, Snackbar.LENGTH_LONG).show()
-                            } else {
-                                if (lastPass == it) {
-                                    LockManager(context!!).add(Lock.generate(Lock.Type.PATTERN, it))
-                                    finish()
-                                } else {
-                                    lock_pattern_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
-                                    lastPass = ""
-
-                                    Snackbar.make(view!!, R.string.settings_lock_wrong_confirm, Snackbar.LENGTH_LONG).show()
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        ).commit()
     }
 
 }

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

@@ -18,6 +18,7 @@
 
 package xyz.quaver.pupil.ui
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.graphics.drawable.Animatable
@@ -25,49 +26,49 @@ import android.net.Uri
 import android.os.Bundle
 import android.text.*
 import android.text.style.AlignmentSpan
+import android.util.TypedValue
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
-import android.widget.EditText
+import android.widget.*
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.GravityCompat
-import androidx.preference.PreferenceManager
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.arlib.floatingsearchview.FloatingSearchView
+import com.arlib.floatingsearchview.FloatingSearchViewDayNight
 import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
 import com.arlib.floatingsearchview.util.view.SearchInputView
+import com.bumptech.glide.Glide
 import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.snackbar.Snackbar
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 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.decodeFromString
+import kotlinx.serialization.encodeToString
 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.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
-import xyz.quaver.pupil.types.Tag
+import xyz.quaver.pupil.favorites
+import xyz.quaver.pupil.histories
+import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.types.TagSuggestion
 import xyz.quaver.pupil.types.Tags
+import xyz.quaver.pupil.ui.dialog.DownloadLocationDialogFragment
 import xyz.quaver.pupil.ui.dialog.GalleryDialog
 import xyz.quaver.pupil.util.*
-import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.download.DownloadWorker
+import xyz.quaver.pupil.util.downloader.DownloadManager
 import java.io.File
 import java.util.*
 import kotlin.collections.ArrayList
@@ -90,7 +91,7 @@ class MainActivity : AppCompatActivity() {
         POPULAR
     }
 
-    private val galleries = ArrayList<GalleryBlock>()
+    private val galleries = ArrayList<Int>()
 
     private var query = ""
     set(value) {
@@ -100,20 +101,16 @@ class MainActivity : AppCompatActivity() {
                 setText(query, TextView.BufferType.EDITABLE)
         }
     }
+    private var queryStack = mutableListOf<String>()
 
     private var mode = Mode.SEARCH
     private var sortMode = SortMode.NEWEST
 
-    private val REQUEST_SETTINGS = 45162
-    private val REQUEST_LOCK = 561
-
     private var galleryIDs: Deferred<List<Int>>? = null
     private var totalItems = 0
     private var loadingJob: Job? = null
     private var currentPage = 0
 
-    private lateinit var histories: Histories
-    private lateinit var favorites: Histories
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -133,39 +130,36 @@ class MainActivity : AppCompatActivity() {
         }
 
         if (lockManager.isNotEmpty())
-            startActivityForResult(Intent(this, LockActivity::class.java), REQUEST_LOCK)
+            startActivityForResult(Intent(this, LockActivity::class.java), R.id.request_lock.normalizeID())
 
-        val preference = PreferenceManager.getDefaultSharedPreferences(this)
+        if (intent.action == Intent.ACTION_VIEW) {
-
+            intent.dataString?.let { url ->
-        if (Locale.getDefault().language == "ko") {
+                restore(favorites, url,
-            if (!preference.getBoolean("https_block_alert", false)) {
+                    onFailure = {
-                android.app.AlertDialog.Builder(this).apply {
+                        Snackbar.make(this.main_recyclerview, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
-                    setTitle(R.string.https_block_alert_title)
+                    }, onSuccess = {
-                    setMessage(R.string.https_block_alert)
+                        Snackbar.make(this.main_recyclerview, getString(R.string.settings_restore_success, it.size), Snackbar.LENGTH_LONG).show()
-                    setPositiveButton(android.R.string.ok) { _, _ -> }
+                    }
-                }.show()
+                )
-
-                preference.edit().putBoolean("https_block_alert", true).apply()
             }
         }
 
-        with(application as Pupil) {
-            this@MainActivity.histories = histories
-            this@MainActivity.favorites = favorites
-        }
-
         setContentView(R.layout.activity_main)
 
+        if (Preferences["download_folder", ""].isEmpty())
+            DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
+
         checkUpdate(this)
 
         initView()
     }
 
+    @OptIn(ExperimentalStdlibApi::class)
     override fun onBackPressed() {
         when {
             main_drawer_layout.isDrawerOpen(GravityCompat.START) -> main_drawer_layout.closeDrawer(GravityCompat.START)
-            query.isNotEmpty() -> runOnUiThread {
+            queryStack.removeLastOrNull() != null && queryStack.isNotEmpty() -> runOnUiThread {
-                query = ""
+                query = queryStack.last()
 
                 cancelFetch()
                 clearGalleries()
@@ -179,13 +173,11 @@ class MainActivity : AppCompatActivity() {
     override fun onDestroy() {
         super.onDestroy()
 
-        (main_recyclerview.adapter as GalleryBlockAdapter).timer.cancel()
+        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.timer?.cancel()
     }
 
     override fun onResume() {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
+        if (Preferences["security_mode"])
-
-        if (preferences.getBoolean("security_mode", false))
             window.setFlags(
                 WindowManager.LayoutParams.FLAG_SECURE,
                 WindowManager.LayoutParams.FLAG_SECURE)
@@ -196,8 +188,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        val preference = PreferenceManager.getDefaultSharedPreferences(this)
+        val perPage = Preferences["per_page", "25"].toInt()
-        val perPage = preference.getString("per_page", "25")!!.toInt()
         val maxPage = ceil(totalItems / perPage.toDouble()).roundToInt()
 
         return when(keyCode) {
@@ -234,9 +225,8 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
         when(requestCode) {
-            REQUEST_SETTINGS -> {
+            R.id.request_settings.normalizeID() -> {
                 runOnUiThread {
                     cancelFetch()
                     clearGalleries()
@@ -244,10 +234,11 @@ class MainActivity : AppCompatActivity() {
                     loadBlocks()
                 }
             }
-            REQUEST_LOCK -> {
+            R.id.request_lock.normalizeID() -> {
                 if (resultCode != Activity.RESULT_OK)
                     finish()
             }
+            else -> super.onActivityResult(requestCode, resultCode, data)
         }
     }
 
@@ -280,6 +271,7 @@ class MainActivity : AppCompatActivity() {
                         clearGalleries()
                         currentPage = 0
                         query = ""
+                        queryStack.clear()
                         mode = Mode.SEARCH
                         fetchGalleries(query, sortMode)
                         loadBlocks()
@@ -289,6 +281,7 @@ class MainActivity : AppCompatActivity() {
                         clearGalleries()
                         currentPage = 0
                         query = ""
+                        queryStack.clear()
                         mode = Mode.HISTORY
                         fetchGalleries(query, sortMode)
                         loadBlocks()
@@ -298,6 +291,7 @@ class MainActivity : AppCompatActivity() {
                         clearGalleries()
                         currentPage = 0
                         query = ""
+                        queryStack.clear()
                         mode = Mode.DOWNLOAD
                         fetchGalleries(query, sortMode)
                         loadBlocks()
@@ -307,6 +301,7 @@ class MainActivity : AppCompatActivity() {
                         clearGalleries()
                         currentPage = 0
                         query = ""
+                        queryStack.clear()
                         mode = Mode.FAVORITE
                         fetchGalleries(query, sortMode)
                         loadBlocks()
@@ -332,11 +327,17 @@ class MainActivity : AppCompatActivity() {
             true
         }
 
+        with(main_fab_cancel) {
+            setImageResource(R.drawable.cancel)
+            setOnClickListener {
+                DownloadService.cancel(this@MainActivity)
+            }
+        }
+
         with(main_fab_jump) {
             setImageResource(R.drawable.ic_jump)
             setOnClickListener {
-                val preference = PreferenceManager.getDefaultSharedPreferences(context)
+                val perPage = Preferences["per_page", "25"].toInt()
-                val perPage = preference.getString("per_page", "25")!!.toInt()
                 val editText = EditText(context)
 
                 AlertDialog.Builder(context).apply {
@@ -361,24 +362,58 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+        with(main_fab_random) {
+            setImageResource(R.drawable.shuffle_variant)
+            setOnClickListener {
+                runBlocking {
+                    withTimeoutOrNull(100) {
+                        galleryIDs?.await()
+                    }
+                }.let {
+                    if (it?.isEmpty() == false) {
+                        val galleryID = it.random()
+
+                        GalleryDialog(
+                            this@MainActivity,
+                            Glide.with(this@MainActivity),
+                            galleryID
+                        ).apply {
+                            onChipClickedHandler.add {
+                                runOnUiThread {
+                                    query = it.toQuery()
+                                    currentPage = 0
+
+                                    cancelFetch()
+                                    clearGalleries()
+                                    fetchGalleries(query, sortMode)
+                                    loadBlocks()
+                                }
+                                dismiss()
+                            }
+                        }.show()
+                    }
+                }
+            }
+        }
+
         with(main_fab_id) {
             setImageResource(R.drawable.numeric)
             setOnClickListener {
-                val editText = EditText(context)
+                val editText = EditText(context).apply {
+                    inputType = InputType.TYPE_CLASS_NUMBER
+                }
 
                 AlertDialog.Builder(context).apply {
                     setView(editText)
                     setTitle(R.string.main_open_gallery_by_id)
 
                     setPositiveButton(android.R.string.ok) { _, _ ->
-                            val galleryID = editText.text.toString().toInt()
+                            val galleryID = editText.text.toString().toIntOrNull() ?: return@setPositiveButton
                             val intent = Intent(this@MainActivity, ReaderActivity::class.java).apply {
                                 putExtra("galleryID", galleryID)
                             }
 
                             startActivity(intent)
-
-                            histories.add(galleryID)
                     }
                 }.show()
             }
@@ -390,9 +425,10 @@ class MainActivity : AppCompatActivity() {
         loadBlocks()
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     private fun setupRecyclerView() {
         with(main_recyclerview) {
-            adapter = GalleryBlockAdapter(this@MainActivity, galleries).apply {
+            adapter = GalleryBlockAdapter(Glide.with(this@MainActivity), galleries).apply {
                 onChipClickedHandler.add {
                     runOnUiThread {
                         query = it.toQuery()
@@ -405,18 +441,16 @@ class MainActivity : AppCompatActivity() {
                     }
                 }
                 onDownloadClickedHandler = { position ->
-                    val galleryID = galleries[position].id
+                    val galleryID = galleries[position]
-
+                    if (Preferences["cache_disable"])
-                    if (!completeFlag.get(galleryID, false)) {
+                        Toast.makeText(context, R.string.settings_download_when_cache_disable_warning, Toast.LENGTH_SHORT).show()
-                        val worker = DownloadWorker.getInstance(context)
+                    else {
-
+                        if (DownloadManager.getInstance(context).isDownloading(galleryID)) {     //download in progress
-                        if (worker.progress.indexOfKey(galleryID) >= 0)     //download in progress
+                            DownloadService.cancel(this@MainActivity, galleryID)
-                            worker.cancel(galleryID)
+                        }
                         else {
-                            Cache(context).setDownloading(galleryID, true)
+                            DownloadManager.getInstance(context).addDownloadFolder(galleryID)
-
+                            DownloadService.download(this@MainActivity, galleryID)
-                            if (!worker.queue.contains(galleryID))
-                                worker.queue.add(galleryID)
                         }
                     }
 
@@ -424,56 +458,45 @@ class MainActivity : AppCompatActivity() {
                 }
 
                 onDeleteClickedHandler = { position ->
-                    val galleryID = galleries[position].id
+                    val galleryID = galleries[position]
+                    DownloadService.delete(this@MainActivity, galleryID)
 
-                    CoroutineScope(Dispatchers.Default).launch {
+                    histories.remove(galleryID)
-                        DownloadWorker.getInstance(context).cancel(galleryID)
 
-                        var cache = Cache(context).getCachedGallery(galleryID)
+                    if (this@MainActivity.mode != Mode.SEARCH)
-
+                        runOnUiThread {
-                        while (cache != null) {
+                            cancelFetch()
-                            cache.deleteRecursively()
+                            clearGalleries()
-                            cache = Cache(context).getCachedGallery(galleryID)
+                            fetchGalleries(query, sortMode)
+                            loadBlocks()
                         }
 
-                        histories.remove(galleryID)
+                    completeFlag.put(galleryID, false)
-
-                        if (this@MainActivity.mode != Mode.SEARCH)
-                            runOnUiThread {
-                                cancelFetch()
-                                clearGalleries()
-                                fetchGalleries(query, sortMode)
-                                loadBlocks()
-                            }
-
-                        completeFlag.put(galleryID, false)
-                    }
 
                     closeAllItems()
                 }
             }
-            ItemClickSupport.addTo(this)
+            ItemClickSupport.addTo(this).apply {
-                .setOnItemClickListener { _, position, v ->
+                onItemClickListener = listener@{ _, position, v ->
                     if (v !is CardView)
-                        return@setOnItemClickListener
+                        return@listener
 
                     val intent = Intent(this@MainActivity, ReaderActivity::class.java)
-                    val gallery = galleries[position]
+                    intent.putExtra("galleryID", galleries[position])
-                    intent.putExtra("galleryID", gallery.id)
 
                     //TODO: Maybe sprinkling some transitions will be nice :D
                     startActivity(intent)
+                }
 
-                    histories.add(gallery.id)
+                onItemLongClickListener = listener@{ _, position, v ->
-                }.setOnItemLongClickListener { _, position, v ->
-
                     if (v !is CardView)
-                        return@setOnItemLongClickListener true
+                        return@listener false
 
-                    val galleryID = galleries[position].id
+                    val galleryID = galleries[position]
 
                     GalleryDialog(
                         this@MainActivity,
+                        Glide.with(this@MainActivity),
                         galleryID
                     ).apply {
                         onChipClickedHandler.add {
@@ -492,11 +515,11 @@ class MainActivity : AppCompatActivity() {
 
                     true
                 }
+            }
 
             var origin = 0f
             var target = -1
-            val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+            val perPage = Preferences["per_page", "25"].toInt()
-            val perPage = preferences.getString("per_page", "25")!!.toInt()
             setOnTouchListener { _, event ->
                 when(event.action) {
                     MotionEvent.ACTION_UP -> {
@@ -698,7 +721,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
@@ -720,19 +742,36 @@ class MainActivity : AppCompatActivity() {
         })
         searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
 
-        with(main_searchview as FloatingSearchView) {
+        with(main_searchview as FloatingSearchViewDayNight) {
             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("[]")
             }
 
+            setOnLeftMenuClickListener(object: FloatingSearchView.OnLeftMenuClickListener {
+                override fun onMenuOpened() {
+                    (this@MainActivity.main_recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
+                }
+
+                override fun onMenuClosed() {
+                    //Do Nothing
+                }
+            })
+
             setOnMenuItemClickListener {
                 when(it.itemId) {
-                    R.id.main_menu_settings -> startActivityForResult(Intent(this@MainActivity, SettingsActivity::class.java), REQUEST_SETTINGS)
+                    R.id.main_menu_settings -> startActivityForResult(Intent(this@MainActivity, SettingsActivity::class.java), R.id.request_settings.normalizeID())
+                    R.id.main_menu_thin -> {
+                        main_recyclerview.apply {
+                            (adapter as GalleryBlockAdapter).apply {
+                                isThin = !isThin
+                            }
+
+                            adapter = adapter       // Force to redraw
+                        }
+                    }
                     R.id.main_menu_sort_newest -> {
                         sortMode = SortMode.NEWEST
                         it.isChecked = true
@@ -770,7 +809,7 @@ class MainActivity : AppCompatActivity() {
                 clearSuggestions()
 
                 if (query.isEmpty() or query.endsWith(' ')) {
-                    swapSuggestions(json.parse(serializer, favoritesFile.readText()).map {
+                    swapSuggestions(Tags(Json.decodeFromString(favoritesFile.readText())).map {
                         TagSuggestion(it.tag, -1, "", it.area ?: "tag")
                     })
 
@@ -780,11 +819,13 @@ class MainActivity : AppCompatActivity() {
                 val currentQuery = query.split(" ").last().replace('_', ' ')
 
                 suggestionJob = CoroutineScope(Dispatchers.IO).launch {
-                    val suggestions = ArrayList(getSuggestionsForQuery(currentQuery).map { TagSuggestion(it) })
+                    val suggestions = kotlin.runCatching {
+                        getSuggestionsForQuery(currentQuery).map { TagSuggestion(it) }.toMutableList()
+                    }.getOrElse { mutableListOf() }
 
                     suggestions.filter {
                         val tag = "${it.n}:${it.s.replace(Regex("\\s"), "_")}"
-                        Tags(json.parse(serializer, favoritesFile.readText())).contains(tag)
+                        Tags(Json.decodeFromString(favoritesFile.readText())).contains(tag)
                     }.reversed().forEach {
                         suggestions.remove(it)
                         suggestions.add(0, it)
@@ -801,25 +842,28 @@ class MainActivity : AppCompatActivity() {
 
                 val tag = "${item.n}:${item.s.replace(Regex("\\s"), "_")}"
 
+                val color = TypedValue()
+                theme.resolveAttribute(R.attr.colorControlNormal, color, true)
+
                 leftIcon.setImageDrawable(
                     ResourcesCompat.getDrawable(
                         resources,
                         when(item.n) {
-                            "female" -> R.drawable.ic_gender_female
+                            "female" -> R.drawable.gender_female
-                            "male" -> R.drawable.ic_gender_male
+                            "male" -> R.drawable.gender_male
-                            "language" -> R.drawable.ic_translate
+                            "language" -> R.drawable.translate
-                            "group" -> R.drawable.ic_account_group
+                            "group" -> R.drawable.account_group
-                            "character" -> R.drawable.ic_account_star
+                            "character" -> R.drawable.account_star
-                            "series" -> R.drawable.ic_book_open
+                            "series" -> R.drawable.book_open
-                            "artist" -> R.drawable.ic_brush
+                            "artist" -> R.drawable.brush
-                            else -> R.drawable.ic_tag
+                            else -> R.drawable.tag
                         },
-                        null)
+                        context.theme)
                 )
 
                 with(suggestionView.findViewById<ImageView>(R.id.right_icon)) {
 
-                    if (Tags(json.parse(serializer, favoritesFile.readText())).contains(tag))
+                    if (Tags(Json.decodeFromString(favoritesFile.readText())).contains(tag))
                         setImageResource(R.drawable.ic_star_filled)
                     else
                         setImageResource(R.drawable.ic_star_empty)
@@ -830,7 +874,7 @@ class MainActivity : AppCompatActivity() {
 
                     isClickable = true
                     setOnClickListener {
-                        val favorites = Tags(json.parse(serializer, favoritesFile.readText()))
+                        val favorites = Tags(Json.decodeFromString(favoritesFile.readText()))
 
                         if (favorites.contains(tag)) {
                             setImageResource(R.drawable.ic_star_empty)
@@ -845,7 +889,7 @@ class MainActivity : AppCompatActivity() {
                             favorites.add(tag)
                         }
 
-                        favoritesFile.writeText(json.stringify(favorites))
+                        favoritesFile.writeText(Json.encodeToString(favorites.tags))
                     }
                 }
 
@@ -885,7 +929,7 @@ class MainActivity : AppCompatActivity() {
             setOnFocusChangeListener(object: FloatingSearchView.OnFocusChangeListener {
                 override fun onFocus() {
                     if (query.isEmpty() or query.endsWith(' '))
-                        swapSuggestions(json.parse(serializer, favoritesFile.readText()).map {
+                        swapSuggestions(Tags(Json.decodeFromString(favoritesFile.readText())).map {
                             TagSuggestion(it.tag, -1, "", it.area ?: "tag")
                         })
                 }
@@ -928,8 +972,26 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun fetchGalleries(query: String, sortMode: SortMode) {
-        val preference = PreferenceManager.getDefaultSharedPreferences(this)
+        val defaultQuery: String = Preferences["default_query"]
-        val defaultQuery = preference.getString("default_query", "")!!
+
+        if (query != queryStack.lastOrNull()) {
+            queryStack.remove(query)
+            queryStack.add(query)
+        }
+
+        if (query.isNotEmpty() && mode != Mode.SEARCH) {
+            Snackbar.make(this@MainActivity.main_recyclerview, R.string.search_all, Snackbar.LENGTH_SHORT).apply {
+                setAction(android.R.string.yes) {
+                    cancelFetch()
+                    clearGalleries()
+                    currentPage = 0
+                    mode = Mode.SEARCH
+                    queryStack.clear()
+                    fetchGalleries(query, sortMode)
+                    loadBlocks()
+                }
+            }.show()
+        }
 
         galleryIDs = null
 
@@ -944,58 +1006,54 @@ 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.reversed().also {
-                                totalItems = size
+                                totalItems = it.size
                             }
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            histories.filter { result.binarySearch(it) >= 0 }.apply {
+                            histories.reversed().filter { result.binarySearch(it) >= 0 }.also {
-                                totalItems = size
+                                totalItems = it.size
                             }
                         }
                     }
                 }
                 Mode.DOWNLOAD -> {
-                    val downloads = getDownloadDirectory(this@MainActivity)?.listFiles()?.filter { file ->
+                    val downloads = DownloadManager.getInstance(this@MainActivity).downloadFolderMap.keys.toList()
-                        file.isDirectory && (file.name!!.toIntOrNull() != null) && file.findFile(".metadata") != null
-                    }?.map {
-                        it.name!!.toInt()
-                    }?: listOf()
 
                     when {
-                        query.isEmpty() -> downloads.apply {
+                        query.isEmpty() -> downloads.reversed().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.reversed().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
                             }
                         }
                     }
@@ -1005,13 +1063,19 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun loadBlocks() {
-        val preference = PreferenceManager.getDefaultSharedPreferences(this)
+        val perPage = Preferences["per_page", "25"].toInt()
-        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 (e.message != "No result")
+                    FirebaseCrashlytics.getInstance().recordException(e)
 
-            if (galleryIDs.isNullOrEmpty()) { //No result
                 withContext(Dispatchers.Main) {
                     main_noresult.visibility = View.VISIBLE
                     main_progressbar.hide()
@@ -1024,16 +1088,16 @@ class MainActivity : AppCompatActivity() {
                 for (chunk in chunks)
                     chunk.map { galleryID ->
                         async {
-                            Cache(this@MainActivity).getGalleryBlock(galleryID)
+                            Cache.getInstance(this@MainActivity, galleryID).getGalleryBlock()?.let {
+                                galleryID
+                            }
                         }
                     }.forEach {
-                        val galleryBlock = it.await()
+                        it.await()?.also {
+                            withContext(Dispatchers.Main) {
+                                main_progressbar.hide()
 
-                        withContext(Dispatchers.Main) {
+                                galleries.add(it)
-                            main_progressbar.hide()
-
-                            if (galleryBlock != null) {
-                                galleries.add(galleryBlock)
                                 main_recyclerview.adapter!!.notifyItemInserted(galleries.size - 1)
                             }
                         }

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

@@ -18,11 +18,15 @@
 
 package xyz.quaver.pupil.ui
 
+import android.content.ComponentName
 import android.content.Intent
+import android.content.ServiceConnection
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
 import android.os.Bundle
+import android.os.IBinder
 import android.view.*
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -32,22 +36,26 @@ import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.crashlytics.android.Crashlytics
 import com.google.android.material.snackbar.Snackbar
-import io.fabric.sdk.android.Fabric
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 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.serialization.ImplicitReflectionSerializer
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import xyz.quaver.Code
-import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.ReaderAdapter
-import xyz.quaver.pupil.util.Histories
+import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.histories
-import xyz.quaver.pupil.util.download.DownloadWorker
+import xyz.quaver.pupil.services.DownloadService
+import xyz.quaver.pupil.util.Preferences
+import xyz.quaver.pupil.util.downloader.Cache
+import xyz.quaver.pupil.util.downloader.DownloadManager
 import java.util.*
 import kotlin.concurrent.schedule
+import kotlin.concurrent.timer
 
 class ReaderActivity : AppCompatActivity() {
 
@@ -67,40 +75,77 @@ class ReaderActivity : AppCompatActivity() {
         }
     }
 
+    private lateinit var cache: Cache
+    var downloader: DownloadService? = null
+    private val conn = object: ServiceConnection {
+        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
+            downloader = (service as DownloadService.Binder).service
+        }
+
+        override fun onServiceDisconnected(name: ComponentName?) {
+            downloader = null
+        }
+    }
+
     private val timer = Timer()
+    private var autoTimer: Timer? = null
 
     private val snapHelper = PagerSnapHelper()
 
     private var menu: Menu? = null
 
-    private lateinit var favorites: Histories
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_reader)
 
         title = getString(R.string.reader_loading)
         supportActionBar?.setDisplayHomeAsUpEnabled(false)
 
-        favorites = (application as Pupil).favorites
-
         window.setFlags(
             WindowManager.LayoutParams.FLAG_SECURE,
             WindowManager.LayoutParams.FLAG_SECURE)
 
-        setContentView(R.layout.activity_reader)
-
         handleIntent(intent)
-
+        cache = Cache.getInstance(this, galleryID)
-        if (Fabric.isInitialized())
+        FirebaseCrashlytics.getInstance().setCustomKey("GalleryID", galleryID)
-            Crashlytics.setInt("GalleryID", galleryID)
 
         if (galleryID == 0) {
             onBackPressed()
             return
         }
+        if (Preferences["cache_disable"]) {
+            reader_download_progressbar.visibility = View.GONE
+            CoroutineScope(Dispatchers.IO).launch {
+                val reader = cache.getReader()
+
+                launch(Dispatchers.Main) initDownloader@{
+                    if (reader == null) {
+                        Snackbar
+                            .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
+                            .show()
+                        return@initDownloader
+                    }
+
+                    histories.add(galleryID)
+                    (reader_recyclerview.adapter as ReaderAdapter).apply {
+                        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
+                        })
+                }
+            }
+        } else
+            initDownloader()
 
         initView()
-        initDownloader()
     }
 
     override fun onNewIntent(intent: Intent) {
@@ -113,14 +158,12 @@ class ReaderActivity : AppCompatActivity() {
             val uri = intent.data
             val lastPathSegment = uri?.lastPathSegment
             if (uri != null && lastPathSegment != null) {
-                val nonNumber = Regex("[^-?0-9]+")
-
                 galleryID = when (uri.host) {
-                    "hitomi.la" -> lastPathSegment.replace(nonNumber, "").toInt()
+                    "hitomi.la" ->
-                    "히요비.asia" -> lastPathSegment.toInt()
+                        Regex("([0-9]+).html").find(lastPathSegment)?.groupValues?.get(1)?.toIntOrNull() ?: 0
-                    "xn--9w3b15m8vo.asia" -> lastPathSegment.toInt()
+                    "hiyobi.me" -> lastPathSegment.toInt()
                     "e-hentai.org" -> uri.pathSegments[1].toInt()
-                    else -> return
+                    else -> 0
                 }
             }
         } else {
@@ -129,9 +172,7 @@ class ReaderActivity : AppCompatActivity() {
     }
 
     override fun onResume() {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
+        if (Preferences["security_mode"])
-
-        if (preferences.getBoolean("security_mode", false))
             window.setFlags(
                 WindowManager.LayoutParams.FLAG_SECURE,
                 WindowManager.LayoutParams.FLAG_SECURE)
@@ -141,7 +182,6 @@ class ReaderActivity : AppCompatActivity() {
         super.onResume()
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.reader, menu)
 
@@ -159,11 +199,11 @@ class ReaderActivity : AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
         when(item?.itemId) {
             R.id.reader_menu_page_indicator -> {
-                val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, findViewById(android.R.id.content), false)
+                val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, reader_layout, false)
                 with(view.dialog_number_picker) {
-                    minValue=1
+                    minValue = 1
-                    maxValue=reader_recyclerview.adapter?.itemCount ?: 0
+                    maxValue = cache.metadata.reader?.galleryInfo?.files?.size ?: 0
-                    value=currentPage
+                    value = currentPage
                 }
                 val dialog = AlertDialog.Builder(this).apply {
                     setView(view)
@@ -196,10 +236,13 @@ class ReaderActivity : AppCompatActivity() {
         super.onDestroy()
 
         timer.cancel()
-        (reader_recyclerview.adapter as ReaderAdapter).timer.cancel()
+        (reader_recyclerview?.adapter as? ReaderAdapter)?.timer?.cancel()
 
-        if (!Cache(this).isDownloading(galleryID))
+        if (!DownloadManager.getInstance(this).isDownloading(galleryID))
-            DownloadWorker.getInstance(this@ReaderActivity).cancel(galleryID)
+            DownloadService.cancel(this, galleryID)
+
+        if (downloader != null)
+            unbindService(conn)
     }
 
     override fun onBackPressed() {
@@ -235,32 +278,40 @@ class ReaderActivity : AppCompatActivity() {
     }
 
     private fun initDownloader() {
-        val worker = DownloadWorker.getInstance(this).apply {
+        DownloadService.download(this, galleryID, true)
-            queue.add(galleryID)
+        bindService(Intent(this, DownloadService::class.java), conn, BIND_AUTO_CREATE)
-        }
 
-        timer.schedule(0, 1000) {
+        timer.schedule(1000, 1000) {
-            if (worker.progress.indexOfKey(galleryID) < 0)  //loading
+            val downloader = downloader ?: return@schedule
+
+            if (downloader.progress.indexOfKey(galleryID) < 0)  //loading
                 return@schedule
 
-            if (worker.progress[galleryID] == null) {      //Gallery not found
+            if (downloader.progress[galleryID] == null) {      //Gallery not found
                 timer.cancel()
                 Snackbar
                     .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
                     .show()
             }
 
+            histories.add(galleryID)
+
             runOnUiThread {
                 reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
-                reader_download_progressbar.progress = worker.progress[galleryID]?.count { !it.isFinite() } ?: 0
+                reader_download_progressbar.progress = downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0
                 reader_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
 
                 if (title == getString(R.string.reader_loading)) {
-                    val reader = (reader_recyclerview.adapter as ReaderAdapter).reader
+                    val reader = cache.metadata.reader
 
                     if (reader != null) {
-                        title = reader.title
+                        with (reader_recyclerview.adapter as ReaderAdapter) {
-                        menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.size}"
+                            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) {
@@ -271,7 +322,7 @@ class ReaderActivity : AppCompatActivity() {
                     }
                 }
 
-                if (worker.progress[galleryID]?.all { !it.isFinite() } == true) {   //Download finished
+                if (downloader.isCompleted(galleryID)) {   //Download finished
                     reader_download_progressbar.visibility = View.GONE
 
                     animateDownloadFAB(false)
@@ -317,16 +368,53 @@ class ReaderActivity : AppCompatActivity() {
         }
 
         with(reader_fab_download) {
-            animateDownloadFAB(Cache(context).isDownloading(galleryID)) //If download in progress, animate button
+            animateDownloadFAB(DownloadManager.getInstance(this@ReaderActivity).getDownloadFolder(galleryID) != null) //If download in progress, animate button
 
             setOnClickListener {
-                if (Cache(context).isDownloading(galleryID)) {
+                if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("cache_disable", false))
-                   Cache(context).setDownloading(galleryID, false)
+                    Toast.makeText(context, R.string.settings_download_when_cache_disable_warning, Toast.LENGTH_SHORT).show()
+                else {
+                    val downloadManager = DownloadManager.getInstance(this@ReaderActivity)
 
-                    animateDownloadFAB(false)
+                    if (downloadManager.isDownloading(galleryID)) {
+                        downloadManager.deleteDownloadFolder(galleryID)
+                        animateDownloadFAB(false)
+                    } else {
+                        downloadManager.addDownloadFolder(galleryID)
+                        animateDownloadFAB(true)
+                    }
+                }
+            }
+        }
+
+        with(reader_fab_retry) {
+            setImageResource(R.drawable.refresh)
+            setOnClickListener {
+                downloader?.cancel(galleryID)
+                downloader?.download(galleryID)
+            }
+        }
+
+        with(reader_fab_auto) {
+            setImageResource(R.drawable.clock_start)
+            setOnClickListener {
+                if (autoTimer == null) {
+                    autoTimer = timer(initialDelay = 10000L, period = 10000L) {
+                        CoroutineScope(Dispatchers.Main).launch {
+                            with(this@ReaderActivity.reader_recyclerview) {
+                                val lastItem =
+                                    (layoutManager as LinearLayoutManager).findLastCompletelyVisibleItemPosition()
+
+                                if (lastItem < adapter!!.itemCount - 1)
+                                    (layoutManager as LinearLayoutManager).scrollToPosition(lastItem + 1)
+                            }
+                        }
+                    }
+                    setImageResource(R.drawable.clock_end)
                 } else {
-                    Cache(context).setDownloading(galleryID, true)
+                    autoTimer?.cancel()
-                    animateDownloadFAB(true)
+                    autoTimer = null
+                    setImageResource(R.drawable.clock_start)
                 }
             }
         }
@@ -356,6 +444,8 @@ class ReaderActivity : AppCompatActivity() {
 
             window.attributes = this
         }
+
+        reader_recyclerview.adapter = reader_recyclerview.adapter   // Force to redraw
     }
 
     private fun scrollMode(isScroll: Boolean) {
@@ -364,7 +454,7 @@ class ReaderActivity : AppCompatActivity() {
             reader_recyclerview.layoutManager = LinearLayoutManager(this)
         } else {
             snapHelper.attachToRecyclerView(reader_recyclerview)
-            reader_recyclerview.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
+            reader_recyclerview.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, Preferences["rtl", false])
         }
 
         (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
@@ -377,11 +467,10 @@ class ReaderActivity : AppCompatActivity() {
 
                 icon?.registerAnimationCallback(object : Animatable2Compat.AnimationCallback() {
                     override fun onAnimationEnd(drawable: Drawable?) {
-                        val worker = DownloadWorker.getInstance(context)
+                        if (downloader?.isCompleted(galleryID) == true) // If download is finished, stop animating
-                        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)
+                                labelText = getString(R.string.reader_fab_download_cancel)
                             }
                         else                                                            // Or continue animate
                             post {

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

@@ -18,30 +18,26 @@
 
 package xyz.quaver.pupil.ui
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
-import android.net.Uri
+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.documentfile.provider.DocumentFile
-import androidx.preference.PreferenceManager
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.settings_activity.*
-import kotlinx.serialization.ImplicitReflectionSerializer
+import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.parseList
 import net.rdrei.android.dirchooser.DirectoryChooserActivity
-import xyz.quaver.pupil.Pupil
+import xyz.quaver.io.FileX
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.fragment.LockFragment
+import xyz.quaver.pupil.favorites
+import xyz.quaver.pupil.ui.fragment.LockSettingsFragment
 import xyz.quaver.pupil.ui.fragment.SettingsFragment
-import xyz.quaver.pupil.util.REQUEST_DOWNLOAD_FOLDER
+import xyz.quaver.pupil.util.*
-import xyz.quaver.pupil.util.REQUEST_DOWNLOAD_FOLDER_OLD
-import xyz.quaver.pupil.util.REQUEST_LOCK
-import xyz.quaver.pupil.util.REQUEST_RESTORE
 import java.io.File
 import java.nio.charset.Charset
 
@@ -63,9 +59,7 @@ class SettingsActivity : AppCompatActivity() {
     }
 
     override fun onResume() {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
+        if (Preferences["security_mode"])
-
-        if (preferences.getBoolean("security_mode", false))
             window.setFlags(
                 WindowManager.LayoutParams.FLAG_SECURE,
                 WindowManager.LayoutParams.FLAG_SECURE)
@@ -82,33 +76,32 @@ class SettingsActivity : AppCompatActivity() {
         return true
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         when(requestCode) {
-            REQUEST_LOCK -> {
+            R.id.request_lock.normalizeID() -> {
                 if (resultCode == Activity.RESULT_OK) {
                     supportFragmentManager
                         .beginTransaction()
-                        .replace(R.id.settings, LockFragment())
+                        .replace(R.id.settings, LockSettingsFragment())
                         .addToBackStack("Lock")
                         .commitAllowingStateLoss()
                 }
             }
-            REQUEST_RESTORE -> {
+            R.id.request_restore.normalizeID() -> {
                 if (resultCode == Activity.RESULT_OK) {
                     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 {
+                        favorites.addAll(Json.decodeFromString<List<Int>>(str).also {
                             Snackbar.make(
                                 window.decorView,
-                                getString(R.string.settings_restore_successful, it.size),
+                                getString(R.string.settings_restore_success, it.size),
                                 Snackbar.LENGTH_LONG
                             ).show()
                         })
@@ -121,36 +114,22 @@ 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)
-
-                        if (DocumentFile.fromTreeUri(this, uri)?.canWrite() == false)
-                            Snackbar.make(settings, R.string.settings_dl_location_not_writable, Snackbar.LENGTH_LONG).show()
-                        else
-                            PreferenceManager.getDefaultSharedPreferences(this).edit()
-                                .putString("dl_location", uri.toString())
-                                .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", Uri.fromFile(File(directory)).toString())
-                            .apply()
-                }
-            }
             else -> super.onActivityResult(requestCode, resultCode, data)
         }
     }
+
+    @SuppressLint("InlinedApi")
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        when (requestCode) {
+            R.id.request_write_permission_and_saf.normalizeID() -> {
+                if (grantResults.firstOrNull() == PackageManager.PERMISSION_GRANTED) {
+                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
+                        putExtra("android.content.extra.SHOW_ADVANCED", true)
+                    }
+
+                    startActivityForResult(intent, R.id.request_download_folder.normalizeID())
+                }
+            }
+        }
+    }
 }

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

@@ -28,11 +28,11 @@ import android.view.LayoutInflater
 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
+import xyz.quaver.pupil.util.Preferences
 
 class DefaultQueryDialog(context : Context) : AlertDialog(context) {
 
@@ -45,17 +45,14 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
 
     private val excludeBL = "-male:yaoi"
     private val excludeGuro = listOf("-female:guro", "-male:guro")
-
+    private val excludeLoli = listOf("-female:loli", "-male:shota")
-    private lateinit var dialogView : View
 
     var onPositiveButtonClickListener : ((Tags) -> (Unit))? = null
 
     @SuppressLint("InflateParams")
     override fun onCreate(savedInstanceState: Bundle?) {
-        initDialog()
-
         setTitle(R.string.default_query_dialog_title)
-        setView(dialogView)
+        setView(build())
         setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ ->
             val newTags = Tags.parse(default_query_dialog_edittext.text.toString())
 
@@ -72,6 +69,11 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
                     newTags.add(tag)
                 }
 
+            if (default_query_dialog_loli_checkbox.isChecked)
+                excludeLoli.forEach { tag ->
+                    newTags.add(tag)
+                }
+
             onPositiveButtonClickListener?.invoke(newTags)
         }
 
@@ -79,15 +81,14 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
     }
 
     @SuppressLint("InflateParams")
-    private fun initDialog() {
+    private fun build() : View {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(context)
         val tags = Tags.parse(
-            preferences.getString("default_query", "") ?: ""
+            Preferences["default_query"]
         )
 
-        dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
 
-        with(dialogView.default_query_dialog_language_selector) {
+        with(view.default_query_dialog_language_selector) {
             adapter =
                 ArrayAdapter(
                     context,
@@ -110,13 +111,13 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
             }
         }
 
-        with(dialogView.default_query_dialog_BL_checkbox) {
+        with(view.default_query_dialog_BL_checkbox) {
             isChecked = tags.contains(excludeBL)
             if (tags.contains(excludeBL))
                 tags.remove(excludeBL)
         }
 
-        with(dialogView.default_query_dialog_guro_checkbox) {
+        with(view.default_query_dialog_guro_checkbox) {
             isChecked = excludeGuro.all { tags.contains(it) }
             if (excludeGuro.all { tags.contains(it) })
                 excludeGuro.forEach {
@@ -124,7 +125,15 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
                 }
         }
 
-        with(dialogView.default_query_dialog_edittext) {
+        with(view.default_query_dialog_loli_checkbox) {
+            isChecked = excludeLoli.all { tags.contains(it) }
+            if (excludeLoli.all { tags.contains(it) })
+                excludeLoli.forEach {
+                    tags.remove(it)
+                }
+        }
+
+        with(view.default_query_dialog_edittext) {
             setText(tags.toString(), android.widget.TextView.BufferType.EDITABLE)
             addTextChangedListener(object : TextWatcher {
                 override fun beforeTextChanged(
@@ -149,6 +158,8 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
                 }
             })
         }
+
+        return view
     }
 
 }

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

@@ -0,0 +1,74 @@
+/*
+ *     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.os.Bundle
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.dialog_download_folder_name.view.*
+import kotlinx.coroutines.runBlocking
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.util.Preferences
+import xyz.quaver.pupil.util.downloader.Cache
+import xyz.quaver.pupil.util.formatDownloadFolder
+import xyz.quaver.pupil.util.formatDownloadFolderTest
+import xyz.quaver.pupil.util.formatMap
+
+class DownloadFolderNameDialogFragment : DialogFragment() {
+
+    @SuppressLint("InflateParams")
+    private fun build(): View {
+        val galleryID = Cache.instances.let { if (it.size() == 0) 1199708 else it.keyAt((0 until it.size()).random()) }
+        val galleryBlock = runBlocking {
+            Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
+        }
+
+        return layoutInflater.inflate(R.layout.dialog_download_folder_name, null).apply {
+            message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolder() ?: "")
+            edittext.setText(Preferences["download_folder_name", "[-id-] -title-"])
+            edittext.addTextChangedListener {
+                message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolderTest(it.toString()) ?: "")
+            }
+            ok_button.setOnClickListener {
+                val newValue = edittext.text.toString()
+
+                if ((newValue as? String)?.contains("/") != false) {
+                    Snackbar.make(this, R.string.settings_invalid_download_folder_name, Snackbar.LENGTH_SHORT).show()
+                    return@setOnClickListener
+                }
+
+                Preferences["download_folder_name"] = edittext.text.toString()
+
+                dismiss()
+            }
+        }
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
+       Dialog(requireContext()).apply {
+           setContentView(build())
+           window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
+       }
+
+}

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

@@ -1,130 +0,0 @@
-/*
- *     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.Activity
-import android.app.Dialog
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.widget.LinearLayout
-import android.widget.RadioButton
-import androidx.appcompat.app.AlertDialog
-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.REQUEST_DOWNLOAD_FOLDER
-import xyz.quaver.pupil.util.REQUEST_DOWNLOAD_FOLDER_OLD
-import xyz.quaver.pupil.util.byteToString
-
-@SuppressLint("InflateParams")
-class DownloadLocationDialog(val activity: Activity) : AlertDialog(activity) {
-
-    private val preference = PreferenceManager.getDefaultSharedPreferences(context)
-    private val buttons = mutableListOf<Pair<RadioButton, Uri?>>()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        val view = layoutInflater.inflate(R.layout.dialog_dl_location, null) as LinearLayout
-
-        val externalFilesDirs = ContextCompat.getExternalFilesDirs(context, null)
-
-        externalFilesDirs.forEachIndexed { index, dir ->
-
-            dir ?: return@forEachIndexed
-
-            view.addView(layoutInflater.inflate(R.layout.item_dl_location, view, false).apply {
-                location_type.text = context.getString(when (index) {
-                    0 -> R.string.settings_dl_location_internal
-                    else -> R.string.settings_dl_location_removable
-                })
-                location_available.text = context.getString(
-                    R.string.settings_dl_location_available,
-                    byteToString(dir.freeSpace)
-                )
-                setOnClickListener {
-                    buttons.forEach { pair ->
-                        pair.first.isChecked = false
-                    }
-                    button.performClick()
-                    preference.edit().putString("dl_location", Uri.fromFile(dir).toString()).apply()
-                }
-                buttons.add(button to Uri.fromFile(dir))
-            })
-        }
-
-        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()
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                        putExtra("android.content.extra.SHOW_ADVANCED", true)
-                    }
-
-                    activity.startActivityForResult(intent, REQUEST_DOWNLOAD_FOLDER)
-
-                    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)
-        })
-
-        val pref = Uri.parse(preference.getString("dl_location", null))
-        val index = externalFilesDirs.indexOfFirst {
-            Uri.fromFile(it).toString() == pref.toString()
-        }
-
-        if (index < 0)
-            buttons.last().first.isChecked = true
-        else
-            buttons[index].first.isChecked = true
-
-        setTitle(R.string.settings_dl_location)
-
-        setView(view)
-
-        setButton(Dialog.BUTTON_POSITIVE, context.getText(android.R.string.ok)) { _, _ ->
-            dismiss()
-        }
-
-        super.onCreate(savedInstanceState)
-    }
-
-}

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

@@ -0,0 +1,196 @@
+/*
+ *     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.Activity
+import android.app.Dialog
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import android.widget.LinearLayout
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.item_download_folder.view.*
+import net.rdrei.android.dirchooser.DirectoryChooserActivity
+import net.rdrei.android.dirchooser.DirectoryChooserConfig
+import xyz.quaver.io.FileX
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.util.Preferences
+import xyz.quaver.pupil.util.byteToString
+import xyz.quaver.pupil.util.downloader.DownloadManager
+import xyz.quaver.pupil.util.migrate
+import xyz.quaver.pupil.util.normalizeID
+import java.io.File
+
+class DownloadLocationDialogFragment : DialogFragment() {
+    private val entries = mutableMapOf<File?, View>()
+
+    @SuppressLint("InflateParams")
+    private fun build() : View? {
+        val context = context ?: return null
+
+        val view = layoutInflater.inflate(R.layout.dialog_download_folder, null) as LinearLayout
+
+        val externalFilesDirs = ContextCompat.getExternalFilesDirs(context, null)
+
+        externalFilesDirs.forEachIndexed { index, dir ->
+            dir ?: return@forEachIndexed
+
+            view.addView(layoutInflater.inflate(R.layout.item_download_folder, view, false).apply {
+                location_type.text = context.getString(when (index) {
+                    0 -> R.string.settings_download_folder_internal
+                    else -> R.string.settings_download_folder_removable
+                })
+                location_available.text = context.getString(
+                    R.string.settings_download_folder_available,
+                    byteToString(dir.freeSpace)
+                )
+                setOnClickListener {
+                    entries.values.forEach {
+                        it.button.isChecked = false
+                    }
+                    button.performClick()
+                    Preferences["download_folder"] = dir.toUri().toString()
+                }
+                entries[dir] = this
+            })
+        }
+
+        view.addView(layoutInflater.inflate(R.layout.item_download_folder, view, false).apply {
+            location_type.text = context.getString(R.string.settings_download_folder_custom)
+            setOnClickListener {
+                entries.values.forEach {
+                    it.button.isChecked = false
+                }
+                button.performClick()
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
+                        putExtra("android.content.extra.SHOW_ADVANCED", true)
+                    }
+
+                    startActivityForResult(intent, R.id.request_download_folder.normalizeID())
+                } 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)
+                    }
+
+                    startActivityForResult(intent, R.id.request_download_folder_old.normalizeID())
+                }
+            }
+            entries[null] = this
+        })
+
+        val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
+        val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
+        entries[key]!!.button.isChecked = true
+        if (key == null) entries[key]!!.location_available.text = downloadFolder
+
+        return view
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val builder = AlertDialog.Builder(requireContext())
+
+        builder
+            .setTitle(R.string.settings_download_folder)
+            .setView(build())
+            .setPositiveButton(requireContext().getText(android.R.string.ok)) { _, _ ->
+                if (Preferences["download_folder", ""].isEmpty())
+                    Preferences["download_folder"] = context?.getExternalFilesDir(null)?.canonicalPath ?: ""
+
+                DownloadManager.getInstance(requireContext()).migrate()
+            }
+
+        isCancelable = false
+
+        return builder.create()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        when (requestCode) {
+            R.id.request_download_folder.normalizeID() -> {
+                if (resultCode == Activity.RESULT_OK) {
+                    val activity = activity ?: return
+                    val context = context ?: return
+                    val dialog = dialog ?: return
+
+                    data?.data?.also { uri ->
+                        val takeFlags: Int =
+                            activity.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)
+                            context.contentResolver.takePersistableUriPermission(uri, takeFlags)
+
+                        if (kotlin.runCatching { FileX(context, uri).canWrite() }.getOrDefault(false))
+                            Preferences["download_folder"] = uri.toString()
+                        else {
+                            Snackbar.make(
+                                dialog.window!!.decorView.rootView,
+                                R.string.settings_download_folder_not_writable,
+                                Snackbar.LENGTH_LONG
+                            ).show()
+
+                            val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
+                            val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
+                            entries[key]!!.button.isChecked = true
+                            if (key == null) entries[key]!!.location_available.text = downloadFolder
+                        }
+                    }
+                }
+            }
+            R.id.request_download_folder_old.normalizeID() -> {
+                val context = context ?: return
+                val dialog = dialog ?: return
+
+                if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
+                    val directory = data?.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR)!!
+
+                    if (!File(directory).canWrite()) {
+                        Snackbar.make(
+                            dialog.window!!.decorView.rootView,
+                            R.string.settings_download_folder_not_writable,
+                            Snackbar.LENGTH_LONG
+                        ).show()
+
+                        val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
+                        val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
+                        entries[key]!!.button.isChecked = true
+                        if (key == null) entries[key]!!.location_available.text = downloadFolder
+                    }
+                    else
+                        Preferences["download_folder"] = File(directory).canonicalPath
+                }
+            }
+            else -> super.onActivityResult(requestCode, resultCode, data)
+        }
+    }
+
+}

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

@@ -26,42 +26,34 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout.LayoutParams
 import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
+import androidx.viewpager2.widget.ViewPager2
-import com.google.android.material.chip.Chip
+import com.bumptech.glide.RequestManager
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.dialog_gallery.*
-import kotlinx.android.synthetic.main.gallery_details.view.*
+import kotlinx.android.synthetic.main.dialog_gallery_details.view.*
+import kotlinx.android.synthetic.main.dialog_gallery_dotindicator.view.*
 import kotlinx.android.synthetic.main.item_gallery_details.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import xyz.quaver.hitomi.Gallery
-import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.getGallery
 import xyz.quaver.pupil.BuildConfig
-import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
-import xyz.quaver.pupil.adapters.ThumbnailAdapter
+import xyz.quaver.pupil.adapters.ThumbnailPageAdapter
+import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.ui.ReaderActivity
+import xyz.quaver.pupil.ui.view.TagChip
 import xyz.quaver.pupil.util.ItemClickSupport
-import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.wordCapitalize
 
-class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(context) {
+class GalleryDialog(context: Context, private val glide: RequestManager, private val galleryID: Int) : Dialog(context) {
-
-    private val languages = context.resources.getStringArray(R.array.languages).map {
-        it.split("|").let { split ->
-            Pair(split[0], split[1])
-        }
-    }.toMap()
-
-    private val glide = Glide.with(context)
 
     val onChipClickedHandler = ArrayList<((Tag) -> (Unit))>()
 
@@ -82,7 +74,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
                 context.startActivity(Intent(context, ReaderActivity::class.java).apply {
                     putExtra("galleryID", galleryID)
                 })
-                (context.applicationContext as Pupil).histories.add(galleryID)
+                histories.add(galleryID)
             }
         }
 
@@ -90,7 +82,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
             try {
                 val gallery = getGallery(galleryID)
 
-                launch(Dispatchers.Main) {
+                gallery_cover.post {
                     gallery_progressbar.visibility = View.GONE
                     gallery_title.text = gallery.title
                     gallery_artist.text = gallery.artists.joinToString(", ") { it.wordCapitalize() }
@@ -112,7 +104,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
                         }
                     }
 
-                    Glide.with(context)
+                    glide
                         .load(gallery.cover)
                         .apply {
                             if (BuildConfig.CENSOR)
@@ -132,7 +124,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
     private fun addDetails(gallery: Gallery) {
         val inflater = LayoutInflater.from(context)
 
-        inflater.inflate(R.layout.gallery_details, gallery_contents, false).apply {
+        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
             gallery_details.setText(R.string.gallery_details)
 
             listOf(
@@ -166,28 +158,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
 
                     content.forEach { tag ->
                         gallery_details_tags.addView(
-                            Chip(context).apply {
+                            TagChip(context, tag).apply {
-                                chipIcon = when(tag.area) {
-                                    "male" -> {
-                                        setChipBackgroundColorResource(R.color.material_blue_700)
-                                        setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                        ContextCompat.getDrawable(context, R.drawable.ic_gender_male_white)
-                                    }
-                                    "female" -> {
-                                        setChipBackgroundColorResource(R.color.material_pink_600)
-                                        setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                                        ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white)
-                                    }
-                                    else -> null
-                                }
-
-                                text = when (tag.area) {
-                                    "language" -> languages[tag.tag]
-                                    else -> tag.tag.wordCapitalize()
-                                }
-
-                                setEnsureMinTouchTargetSize(false)
-
                                 setOnClickListener {
                                     onChipClickedHandler.forEach { handler ->
                                         handler.invoke(tag)
@@ -208,15 +179,21 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
     private fun addThumbnails(gallery: Gallery) {
         val inflater = LayoutInflater.from(context)
 
-        inflater.inflate(R.layout.gallery_details, gallery_contents, false).apply {
+        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
             gallery_details.setText(R.string.gallery_thumbnails)
 
-            RecyclerView(context).apply {
+            val pager = ViewPager2(context).apply {
-                layoutManager = GridLayoutManager(context, 3)
+                adapter = ThumbnailPageAdapter(glide, gallery.thumbnails)
-                adapter = ThumbnailAdapter(glide, gallery.thumbnails)
-            }.let {
-                gallery_details_contents.addView(it, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT))
             }
+
+            gallery_details_contents.addView(
+                pager,
+                LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
+            )
+
+            LayoutInflater.from(context).inflate(R.layout.dialog_gallery_dotindicator, gallery_details_contents)
+
+            gallery_dotindicator.setViewPager2(pager)
         }.let {
             gallery_contents.addView(it)
         }
@@ -224,9 +201,9 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
 
     private fun addRelated(gallery: Gallery) {
         val inflater = LayoutInflater.from(context)
-        val galleries = ArrayList<GalleryBlock>()
+        val galleries = ArrayList<Int>()
 
-        val adapter = GalleryBlockAdapter(context, galleries).apply {
+        val adapter = GalleryBlockAdapter(glide, galleries).apply {
             onChipClickedHandler.add { tag ->
                 this@GalleryDialog.onChipClickedHandler.forEach { handler ->
                     handler.invoke(tag)
@@ -234,37 +211,25 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
             }
         }
 
-        CoroutineScope(Dispatchers.Main).launch {
+        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
-            gallery.related.forEachIndexed { i, galleryID ->
-                async(Dispatchers.IO) {
-                    Cache(context).getGalleryBlock(galleryID)
-                }.let {
-                    val galleryBlock = it.await() ?: return@let
-
-                    galleries.add(galleryBlock)
-                    adapter.notifyItemInserted(i)
-                }
-            }
-        }
-
-        inflater.inflate(R.layout.gallery_details, gallery_contents, false).apply {
             gallery_details.setText(R.string.gallery_related)
 
             RecyclerView(context).apply {
                 layoutManager = LinearLayoutManager(context)
                 this.adapter = adapter
 
-                ItemClickSupport.addTo(this)
+                ItemClickSupport.addTo(this).apply {
-                    .setOnItemClickListener { _, position, _ ->
+                    onItemClickListener = { _, position, _ ->
                         context.startActivity(Intent(context, ReaderActivity::class.java).apply {
-                            putExtra("galleryID", galleries[position].id)
+                            putExtra("galleryID", galleries[position])
                         })
-                        (context.applicationContext as Pupil).histories.add(galleries[position].id)
+                        histories.add(galleries[position])
                     }
-                    .setOnItemLongClickListener { _, position, _ ->
+                    onItemLongClickListener = { _, position, _ ->
                         GalleryDialog(
                             context,
-                            galleries[position].id
+                            glide,
+                            galleries[position]
                         ).apply {
                             onChipClickedHandler.add { tag ->
                                 this@GalleryDialog.onChipClickedHandler.forEach { it.invoke(tag) }
@@ -273,12 +238,25 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
 
                         true
                     }
+                }
             }.let {
                 gallery_details_contents.addView(it, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT))
             }
         }.let {
             gallery_contents.addView(it)
         }
+
+        CoroutineScope(Dispatchers.IO).launch {
+            gallery.related.forEach { galleryID ->
+                Cache.getInstance(context, galleryID).getGalleryBlock()?.let {
+                    galleries.add(galleryID)
+                }
+            }
+
+            withContext(Dispatchers.Main) {
+                adapter.notifyDataSetChanged()
+            }
+        }
     }
 
 }

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

@@ -22,14 +22,15 @@ 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
+import xyz.quaver.pupil.util.Preferences
 
 class MirrorDialog(context: Context) : AlertDialog(context) {
 
@@ -56,21 +57,17 @@ class MirrorDialog(context: Context) : AlertDialog(context) {
         }
     }
 
-    private lateinit var recyclerView: RecyclerView
-
     @SuppressLint("InflateParams")
     override fun onCreate(savedInstanceState: Bundle?) {
-        initDialog()
-
         setTitle(R.string.settings_mirror_title)
-        setView(recyclerView)
+        setView(build())
         setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ -> }
 
         super.onCreate(savedInstanceState)
     }
 
-    private fun initDialog() {
+    private fun build() : View {
-        recyclerView = RecyclerView(context).apply recyclerview@{
+        return RecyclerView(context).apply recyclerview@{
             addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
             layoutManager = LinearLayoutManager(context)
             adapter = MirrorAdapter(context).apply adapter@{
@@ -85,10 +82,7 @@ class MirrorDialog(context: Context) : AlertDialog(context) {
                 }
 
                 onItemMoved = {
-                    PreferenceManager.getDefaultSharedPreferences(context)
+                    Preferences["mirrors"] = it.joinToString(">")
-                        .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 kotlinx.android.synthetic.main.dialog_proxy.view.*
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.client
+import xyz.quaver.pupil.clientBuilder
+import xyz.quaver.pupil.clientHolder
+import xyz.quaver.pupil.util.Preferences
+import xyz.quaver.pupil.util.ProxyInfo
+import xyz.quaver.pupil.util.getProxyInfo
+import xyz.quaver.pupil.util.proxyInfo
+import java.net.Proxy
+
+class ProxyDialog(context: Context) : Dialog(context) {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setContentView(build())
+        window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
+
+        super.onCreate(savedInstanceState)
+    }
+
+    @SuppressLint("InflateParams")
+    private fun build() : View {
+        val proxyInfo = getProxyInfo()
+
+        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 {
+                Preferences["proxy"] = Json.encodeToString(it)
+
+                clientBuilder
+                    .proxyInfo(it)
+                clientHolder = null
+                client
+            }
+
+            dismiss()
+        }
+
+        return view
+    }
+
+}

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

@@ -1,81 +0,0 @@
-/*
- *     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.fragment
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.LockActivity
-import xyz.quaver.pupil.util.Lock
-import xyz.quaver.pupil.util.LockManager
-
-class LockFragment : PreferenceFragmentCompat() {
-
-    override fun onResume() {
-        super.onResume()
-
-        val lockManager = LockManager(context!!)
-
-        findPreference<Preference>("lock_pattern")?.summary =
-            if (lockManager.contains(Lock.Type.PATTERN))
-                getString(R.string.settings_lock_enabled)
-            else
-                ""
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.lock_preferences, rootKey)
-
-        with(findPreference<Preference>("lock_pattern")) {
-            this!!
-
-            if (LockManager(context!!).contains(Lock.Type.PATTERN))
-                summary = getString(R.string.settings_lock_enabled)
-
-            onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                val lockManager = LockManager(context!!)
-
-                if (lockManager.contains(Lock.Type.PATTERN)) {
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_lock_remove_message)
-
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            lockManager.remove(Lock.Type.PATTERN)
-                            onResume()
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-                } else {
-                    val intent = Intent(context, LockActivity::class.java).apply {
-                        putExtra("mode", "add_lock")
-                        putExtra("type", "pattern")
-                    }
-
-                    startActivity(intent)
-                }
-
-                true
-            }
-        }
-    }
-}

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

@@ -0,0 +1,146 @@
+/*
+ *     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.fragment
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreferenceCompat
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.ui.LockActivity
+import xyz.quaver.pupil.util.Lock
+import xyz.quaver.pupil.util.LockManager
+import xyz.quaver.pupil.util.Preferences
+
+class LockSettingsFragment : PreferenceFragmentCompat() {
+
+    override fun onResume() {
+        super.onResume()
+
+        val lockManager = LockManager(requireContext())
+
+        findPreference<Preference>("lock_pattern")?.summary =
+            if (lockManager.contains(Lock.Type.PATTERN))
+                getString(R.string.settings_lock_enabled)
+            else
+                ""
+
+        findPreference<Preference>("lock_pin")?.summary =
+            if (lockManager.contains(Lock.Type.PIN))
+                getString(R.string.settings_lock_enabled)
+            else
+                ""
+
+        if (lockManager.isEmpty()) {
+            (findPreference<Preference>("lock_fingerprint") as SwitchPreferenceCompat).isChecked = false
+
+            Preferences["lock_fingerprint"] = false
+        }
+    }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.lock_preferences, rootKey)
+
+        with(findPreference<Preference>("lock_pattern")) {
+            this!!
+
+            if (LockManager(requireContext()).contains(Lock.Type.PATTERN))
+                summary = getString(R.string.settings_lock_enabled)
+
+            onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                val lockManager = LockManager(requireContext())
+
+                if (lockManager.contains(Lock.Type.PATTERN)) {
+                    AlertDialog.Builder(requireContext()).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_lock_remove_message)
+
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            lockManager.remove(Lock.Type.PATTERN)
+                            onResume()
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                } else {
+                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
+                        putExtra("mode", "add_lock")
+                        putExtra("type", "pattern")
+                    }
+
+                    startActivity(intent)
+                }
+
+                true
+            }
+        }
+
+        with(findPreference<Preference>("lock_pin")) {
+            this!!
+
+            if (LockManager(requireContext()).contains(Lock.Type.PIN))
+                summary = getString(R.string.settings_lock_enabled)
+
+            onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                val lockManager = LockManager(requireContext())
+
+                if (lockManager.contains(Lock.Type.PIN)) {
+                    AlertDialog.Builder(requireContext()).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_lock_remove_message)
+
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            lockManager.remove(Lock.Type.PIN)
+                            onResume()
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                } else {
+                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
+                        putExtra("mode", "add_lock")
+                        putExtra("type", "pin")
+                    }
+
+                    startActivity(intent)
+                }
+
+                true
+            }
+        }
+
+        with(findPreference<Preference>("lock_fingerprint")) {
+            this!!
+
+            setOnPreferenceChangeListener { _, newValue ->
+                this as SwitchPreferenceCompat
+
+                if (newValue == true && LockManager(requireContext()).isEmpty()) {
+                    isChecked = false
+
+                    Toast.makeText(requireContext(), R.string.settings_lock_fingerprint_without_lock, Toast.LENGTH_SHORT).show()
+                } else
+                    isChecked = newValue as Boolean
+
+                false
+            }
+        }
+    }
+}

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

@@ -0,0 +1,101 @@
+/*
+ *     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.fragment
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.EditText
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import com.google.android.material.snackbar.Snackbar
+import okhttp3.*
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.client
+import xyz.quaver.pupil.favorites
+import xyz.quaver.pupil.util.restore
+import java.io.File
+import java.io.IOException
+
+class ManageFavoritesFragment : PreferenceFragmentCompat() {
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.manage_favorites_preferences, rootKey)
+
+        initPreferences()
+    }
+
+    private fun initPreferences() {
+        val context = context ?: return
+
+        findPreference<Preference>("backup")?.setOnPreferenceClickListener {
+            val request = Request.Builder()
+                .url(context.getString(R.string.backup_url))
+                .post(
+                    FormBody.Builder()
+                        .add("f:1", File(ContextCompat.getDataDir(context), "favorites.json").readText())
+                        .build()
+                ).build()
+
+            client.newCall(request).enqueue(object: Callback {
+                override fun onFailure(call: Call, e: IOException) {
+                    val view = view ?: return
+                    Snackbar.make(view, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
+                }
+
+                override fun onResponse(call: Call, response: Response) {
+                    Intent(Intent.ACTION_SEND).apply {
+                        type = "text/plain"
+                        putExtra(Intent.EXTRA_TEXT, response.body()?.use { it.string() }?.replace("\n", ""))
+                    }.let {
+                        getContext()?.startActivity(Intent.createChooser(it, getString(R.string.settings_backup_share)))
+                    }
+                }
+            })
+
+            true
+        }
+        findPreference<Preference>("restore")?.setOnPreferenceClickListener {
+            val editText = EditText(context).apply {
+                setText(context.getString(R.string.backup_url), TextView.BufferType.EDITABLE)
+            }
+
+            AlertDialog.Builder(context)
+                .setTitle(R.string.settings_restore_title)
+                .setView(editText)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    restore(favorites, editText.text.toString(),
+                        onFailure = onFailure@{
+                            val view = view ?: return@onFailure
+                            Snackbar.make(view, R.string.settings_restore_failed, Snackbar.LENGTH_LONG).show()
+                        }, onSuccess = onSuccess@{
+                            val view = view ?: return@onSuccess
+                            Snackbar.make(view, context.getString(R.string.settings_restore_success, it.size), Snackbar.LENGTH_LONG).show()
+                        })
+                }.setNegativeButton(android.R.string.cancel) { _, _ ->
+                    // Do Nothing
+                }.show()
+
+            true
+        }
+    }
+
+}

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

@@ -0,0 +1,193 @@
+/*
+ *     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.fragment
+
+import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import xyz.quaver.io.FileX
+import xyz.quaver.io.util.deleteRecursively
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.histories
+import xyz.quaver.pupil.util.byteToString
+import xyz.quaver.pupil.util.downloader.DownloadManager
+import java.io.File
+
+class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClickListener {
+
+    private var job: Job? = null
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.manage_storage_preferences, rootKey)
+
+        initPreferences()
+    }
+
+    override fun onPreferenceClick(preference: Preference?): Boolean {
+        val context = context ?: return false
+
+        with(preference) {
+            this ?: return false
+
+            when (key) {
+                "delete_cache" -> {
+                    val dir = File(context.cacheDir, "imageCache")
+
+                    AlertDialog.Builder(context).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_clear_cache_alert_message)
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            if (dir.exists())
+                                dir.deleteRecursively()
+
+                            summary = context.getString(R.string.settings_storage_usage, byteToString(0))
+                            CoroutineScope(Dispatchers.IO).launch {
+                                var size = 0L
+
+                                dir.walk().forEach {
+                                    size += it.length()
+
+                                    launch(Dispatchers.Main) {
+                                        summary = context.getString(R.string.settings_storage_usage, byteToString(size))
+                                    }
+                                }
+                            }
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                }
+                "delete_downloads" -> {
+                    val dir = DownloadManager.getInstance(context).downloadFolder
+
+                    AlertDialog.Builder(context).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_clear_downloads_alert_message)
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            CoroutineScope(Dispatchers.IO).launch {
+                                job?.cancel()
+                                launch(Dispatchers.Main) {
+                                    summary = context.getString(R.string.settings_storage_usage_loading)
+                                }
+
+                                if (dir.exists())
+                                    dir.listFiles()?.forEach { (it as? FileX)?.deleteRecursively() }
+
+                                job = launch {
+                                    var size = 0L
+
+                                    launch(Dispatchers.Main) {
+                                        summary = context.getString(R.string.settings_storage_usage, byteToString(size))
+                                    }
+                                    dir.walk().forEach {
+                                        size += it.length()
+
+                                        launch(Dispatchers.Main) {
+                                            summary = context.getString(R.string.settings_storage_usage, byteToString(size))
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                }
+                "clear_history" -> {
+                    AlertDialog.Builder(context).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_clear_history_alert_message)
+                        setPositiveButton(android.R.string.yes) { _, _ ->
+                            histories.clear()
+                            summary = context.getString(R.string.settings_clear_history_summary, histories.size)
+                        }
+                        setNegativeButton(android.R.string.no) { _, _ -> }
+                    }.show()
+                }
+                else -> return false
+            }
+        }
+
+        return true
+    }
+
+    private fun initPreferences() {
+        val context = context ?: return
+
+        with(findPreference<Preference>("delete_cache")) {
+            this ?: return@with
+
+            val dir = File(context.cacheDir, "imageCache")
+
+            summary = context.getString(R.string.settings_storage_usage, byteToString(0))
+            CoroutineScope(Dispatchers.IO).launch {
+                var size = 0L
+
+                dir.walk().forEach {
+                    size += it.length()
+
+                    launch(Dispatchers.Main) {
+                        summary = context.getString(R.string.settings_storage_usage, byteToString(size))
+                    }
+                }
+            }
+
+            onPreferenceClickListener = this@ManageStorageFragment
+        }
+
+        with(findPreference<Preference>("delete_downloads")) {
+            this ?: return@with
+
+            val dir = DownloadManager.getInstance(context).downloadFolder
+
+            summary = context.getString(R.string.settings_storage_usage, byteToString(0))
+            job?.cancel()
+            job = CoroutineScope(Dispatchers.IO).launch {
+                var size = 0L
+
+                dir.walk().forEach {
+                    launch(Dispatchers.Main) {
+                        summary = context.getString(R.string.settings_storage_usage, byteToString(size))
+                    }
+
+                    size += it.length()
+                }
+            }
+
+            onPreferenceClickListener = this@ManageStorageFragment
+        }
+
+        with(findPreference<Preference>("clear_history")) {
+            this ?: return@with
+
+            summary = context.getString(R.string.settings_clear_history_summary, histories.size)
+
+            onPreferenceClickListener = this@ManageStorageFragment
+        }
+    }
+
+    override fun onDestroy() {
+        job?.cancel()
+        super.onDestroy()
+    }
+
+}

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

@@ -0,0 +1,53 @@
+/*
+ *     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.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.andrognito.pinlockview.PinLockListener
+import kotlinx.android.synthetic.main.fragment_pin_lock.view.*
+import xyz.quaver.pupil.R
+
+class PINLockFragment : Fragment(), PinLockListener {
+
+    var onPINEntered: ((String) -> Unit)? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_pin_lock, container, false).apply {
+            pin_lock_view.attachIndicatorDots(indicator_dots)
+            pin_lock_view.setPinLockListener(this@PINLockFragment)
+        }
+    }
+
+    override fun onComplete(pin: String?) {
+        onPINEntered?.invoke(pin!!)
+    }
+
+    override fun onEmpty() {
+
+    }
+
+    override fun onPinChange(pinLength: Int, intermediatePin: String?) {
+
+    }
+
+}

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

@@ -18,28 +18,22 @@
 
 package xyz.quaver.pupil.ui.fragment
 
-import android.content.Intent
+import android.content.*
-import android.content.SharedPreferences
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.content.ContextCompat
-import androidx.documentfile.provider.DocumentFile
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.PreferenceManager
+import androidx.preference.SwitchPreferenceCompat
-import com.google.android.material.snackbar.Snackbar
+import xyz.quaver.io.FileX
-import xyz.quaver.pupil.Pupil
+import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.R
 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.*
-import xyz.quaver.pupil.ui.dialog.DownloadLocationDialog
-import xyz.quaver.pupil.ui.dialog.MirrorDialog
 import xyz.quaver.pupil.util.*
-import java.io.File
+import xyz.quaver.pupil.util.downloader.DownloadManager
-
 
 class SettingsFragment :
     PreferenceFragmentCompat(),
@@ -47,16 +41,10 @@ class SettingsFragment :
     Preference.OnPreferenceChangeListener,
     SharedPreferences.OnSharedPreferenceChangeListener {
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(this)
-    }
-
     override fun onResume() {
         super.onResume()
 
-        val lockManager = LockManager(context!!)
+        val lockManager = LockManager(requireContext())
 
         findPreference<Preference>("app_lock")?.summary = if (lockManager.locks.isNullOrEmpty()) {
             getString(R.string.settings_lock_none)
@@ -71,12 +59,6 @@ class SettingsFragment :
         }
     }
 
-    private fun getDirSize(dir: DocumentFile) : String {
-        val size = dir.walk().map { it.length() }.sum()
-
-        return getString(R.string.settings_clear_summary, byteToString(size))
-    }
-
     override fun onPreferenceClick(preference: Preference?): Boolean {
         with (preference) {
             this ?: return false
@@ -85,84 +67,34 @@ class SettingsFragment :
                 "app_version" -> {
                     checkUpdate(activity as SettingsActivity, true)
                 }
-                "delete_cache" -> {
+                "download_folder" -> {
-                    val dir = DocumentFile.fromFile(File(context.cacheDir, "imageCache"))
+                    DownloadLocationDialogFragment().show(requireActivity().supportFragmentManager, "Download Location Dialog")
-
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_cache_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            if (dir.exists())
-                                dir.deleteRecursively()
-
-                            summary = getDirSize(dir)
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-                }
-                "delete_downloads" -> {
-                    val dir = getDownloadDirectory(context)!!
-
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_downloads_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            if (dir.exists())
-                                dir.deleteRecursively()
-
-                            summary = getDirSize(dir)
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-                }
-                "clear_history" -> {
-                    val histories = (context.applicationContext as Pupil).histories
-
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_history_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
-                            histories.clear()
-                            summary = getString(R.string.settings_clear_history_summary, histories.size)
-                        }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
-                    }.show()
-                }
-                "dl_location" -> {
-                    DownloadLocationDialog(activity!!).show()
                 }
                 "default_query" -> {
-                    DefaultQueryDialog(context).apply {
+                    DefaultQueryDialog(requireContext()).apply {
                         onPositiveButtonClickListener = { newTags ->
-                            sharedPreferences.edit().putString("default_query", newTags.toString()).apply()
+                            Preferences["default_query"] = newTags.toString()
                             summary = newTags.toString()
                         }
                     }.show()
                 }
                 "app_lock" -> {
-                    val intent = Intent(context, LockActivity::class.java)
+                    val intent = Intent(requireContext(), LockActivity::class.java)
-                    activity?.startActivityForResult(intent, REQUEST_LOCK)
+                    activity?.startActivityForResult(intent, R.id.request_lock.normalizeID())
                 }
                 "mirrors" -> {
-                    MirrorDialog(context)
+                    MirrorDialog(requireContext())
                         .show()
                 }
-                "backup" -> {
+                "proxy" -> {
-                    File(ContextCompat.getDataDir(context), "favorites.json").copyTo(
+                    ProxyDialog(requireContext())
-                        context,
+                        .show()
-                        getDownloadDirectory(context)?.createFile("null", "favorites.json")!!
+                }
+                "user_id" -> {
+                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
+                        ClipData.newPlainText("user_id", Preferences.get<String>("user_id"))
                     )
-
+                    Toast.makeText(context, R.string.settings_user_id_toast, Toast.LENGTH_SHORT).show()
-                    Snackbar.make(this@SettingsFragment.listView, R.string.settings_backup_snackbar, Snackbar.LENGTH_LONG)
-                        .show()
-                }
-                "restore" -> {
-                    val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
-                        addCategory(Intent.CATEGORY_OPENABLE)
-                        type = "*/*"
-                    }
-
-                    activity?.startActivityForResult(intent, REQUEST_RESTORE)
                 }
                 else -> return false
             }
@@ -176,6 +108,18 @@ class SettingsFragment :
             this ?: return false
 
             when (key) {
+                "nomedia" -> {
+                    val create = (newValue as? Boolean) ?: return false
+
+                    return kotlin.runCatching {
+                        val nomedia = DownloadManager.getInstance(context).downloadFolder.getChild(".nomedia")
+
+                        if (create)
+                            nomedia.createNewFile()
+                        else
+                            nomedia.delete()
+                    }.getOrDefault(false)
+                }
                 "dark_mode" -> {
                     AppCompatDelegate.setDefaultNightMode(when (newValue as Boolean) {
                         true -> AppCompatDelegate.MODE_NIGHT_YES
@@ -190,10 +134,21 @@ class SettingsFragment :
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        when (key) {
+        key ?: return
-            "dl_location" -> {
+
-                findPreference<Preference>(key)?.summary =
+        with(findPreference<Preference>(key)) {
-                    FileUtils.getPath(context, getDownloadDirectory(context!!)?.uri)
+            this ?: return
+
+            when (key) {
+                "proxy" -> {
+                    summary = context?.let { getProxyInfo().type.name }
+                }
+                "download_folder" -> {
+                    summary = FileX(context, Preferences.get<String>("download_folder")).canonicalPath
+                }
+                "download_folder_name" -> {
+                    summary = Preferences["download_folder_name", "[-id-] -title-"]
+                }
             }
         }
     }
@@ -201,9 +156,16 @@ class SettingsFragment :
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.root_preferences, rootKey)
 
+        Preferences.registerOnSharedPreferenceChangeListener(this)
+
         initPreferences()
     }
 
+    override fun onDestroy() {
+        Preferences.unregisterOnSharedPreferenceChangeListener(this)
+        super.onDestroy()
+    }
+
     private fun initPreferences() {
         for (i in 0 until preferenceScreen.preferenceCount) {
 
@@ -213,47 +175,44 @@ class SettingsFragment :
                 else
                     listOf(this)
             }.forEach { preference ->
-                with (preference) {
+                with (preference) with@{
 
                     when (key) {
                         "app_version" -> {
-                            val manager = context.packageManager
+                            val manager = requireContext().packageManager
-                            val info = manager.getPackageInfo(context.packageName, 0)
+                            val info = manager.getPackageInfo(requireContext().packageName, 0)
-                            summary = context.getString(R.string.settings_app_version_description, info.versionName)
+                            summary = requireContext().getString(R.string.settings_app_version_description, info.versionName)
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
-                        "delete_cache" -> {
+                        "download_folder_name" -> {
-                            val dir = DocumentFile.fromFile(File(context.cacheDir, "imageCache"))
+                            summary = Preferences["download_folder_name", "[-id-] -title-"]
-                            summary = getDirSize(dir)
+
+                            setOnPreferenceClickListener {
+                                DownloadFolderNameDialogFragment().show(requireActivity().supportFragmentManager, "Download Location Dialog")
+
+                                true
+                            }
+                        }
+                        "download_folder" -> {
+                            summary = FileX(context, Preferences.get<String>("download_folder")).canonicalPath
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
-                        "delete_downloads" -> {
+                        "nomedia" -> {
-                            val dir = getDownloadDirectory(context)!!
+                            (this as SwitchPreferenceCompat).isChecked = kotlin.runCatching {
-                            summary = getDirSize(dir)
+                                DownloadManager.getInstance(context).downloadFolder.getChild(".nomedia").exists()
+                            }.getOrDefault(false)
 
-                            onPreferenceClickListener = this@SettingsFragment
+                            onPreferenceChangeListener = this@SettingsFragment
-                        }
-                        "clear_history" -> {
-                            val histories = (activity!!.application as Pupil).histories
-                            summary = getString(R.string.settings_clear_history_summary, histories.size)
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "dl_location" -> {
-                            summary = FileUtils.getPath(context, getDownloadDirectory(context)?.uri)
-
-                            onPreferenceClickListener = this@SettingsFragment
                         }
                         "default_query" -> {
-                            val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+                            summary = Preferences.get<String>("default_query")
-                            summary = preferences.getString("default_query", "") ?: ""
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "app_lock" -> {
-                            val lockManager = LockManager(context)
+                            val lockManager = LockManager(requireContext())
                             summary =
                                 if (lockManager.locks.isNullOrEmpty()) {
                                     getString(R.string.settings_lock_none)
@@ -272,13 +231,19 @@ class SettingsFragment :
                         "mirrors" -> {
                             onPreferenceClickListener = this@SettingsFragment
                         }
+                        "proxy" -> {
+                            summary = getProxyInfo().type.name
+
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
                         "dark_mode" -> {
                             onPreferenceChangeListener = this@SettingsFragment
                         }
-                        "backup" -> {
+                        "old_import_galleries" -> {
                             onPreferenceClickListener = this@SettingsFragment
                         }
-                        "restore" -> {
+                        "user_id" -> {
+                            summary = Preferences.get<String>("user_id")
                             onPreferenceClickListener = this@SettingsFragment
                         }
                     }

app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt

@@ -0,0 +1,66 @@
+/*
+ *     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.view
+
+import android.content.Context
+import androidx.core.content.ContextCompat
+import com.google.android.material.chip.Chip
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.types.Tag
+import xyz.quaver.pupil.util.wordCapitalize
+
+class TagChip(context: Context, val tag: Tag) : Chip(context) {
+
+    private val languages = context.resources.getStringArray(R.array.languages).map {
+        it.split("|").let { split ->
+            Pair(split[0], split[1])
+        }
+    }.toMap()
+
+    init {
+        val tag = tag.let {
+            when {
+                it.area != null -> it
+                else -> Tag("tag", tag.tag)
+            }
+        }
+
+        chipIcon = when(tag.area) {
+            "male" -> {
+                setChipBackgroundColorResource(R.color.material_blue_700)
+                setTextColor(ContextCompat.getColor(context, android.R.color.white))
+                ContextCompat.getDrawable(context, R.drawable.gender_male_white)
+            }
+            "female" -> {
+                setChipBackgroundColorResource(R.color.material_pink_600)
+                setTextColor(ContextCompat.getColor(context, android.R.color.white))
+                ContextCompat.getDrawable(context, R.drawable.gender_female_white)
+            }
+            else -> null
+        }
+
+        text = when (tag.area) {
+            "language" -> languages[tag.tag]
+            else -> tag.tag.wordCapitalize()
+        }
+
+        setEnsureMinTouchTargetSize(false)
+    }
+
+}

app/src/main/java/xyz/quaver/pupil/util/FileUtils.java

@@ -1,178 +0,0 @@
-/*
- *     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;
-
-/*
- * Copyright (C) 2007-2008 OpenIntents.org
- *
- * 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.
- */
-
-import android.content.ContentUris;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
-
-/**
- * @version 2009-07-03
- * @author Peli
- * @version 2013-12-11
- * @author paulburke (ipaulpro)
- */
-public class FileUtils {
-    /**
-     * Get a file path from a Uri. This will get the the path for Storage Access
-     * Framework Documents, as well as the _data field for the MediaStore and
-     * other file-based ContentProviders.
-     *
-     * @param context The context.
-     * @param uri The Uri to query.
-     * @author paulburke
-     */
-    public static String getPath(final Context context, final Uri uri) {
-
-        // DocumentProvider
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && DocumentsContract.isDocumentUri(context, uri)) {
-            // ExternalStorageProvider
-            if (isExternalStorageDocument(uri)) {
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                if ("primary".equalsIgnoreCase(type)) {
-                    return context.getExternalFilesDir(null).getParentFile().getParentFile().getParentFile().getParent() + "/" + split[1];
-                }
-
-                // TODO handle non-primary volumes
-            }
-            // DownloadsProvider
-            else if (isDownloadsDocument(uri)) {
-
-                final String id = DocumentsContract.getDocumentId(uri);
-                final Uri contentUri = ContentUris.withAppendedId(
-                        Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
-
-                return getDataColumn(context, contentUri, null, null);
-            }
-            // MediaProvider
-            else if (isMediaDocument(uri)) {
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                Uri contentUri = null;
-                if ("image".equals(type)) {
-                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-                } else if ("video".equals(type)) {
-                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
-                } else if ("audio".equals(type)) {
-                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
-                }
-
-                final String selection = "_id=?";
-                final String[] selectionArgs = new String[] {
-                        split[1]
-                };
-
-                return getDataColumn(context, contentUri, selection, selectionArgs);
-            }
-        }
-        // MediaStore (and general)
-        else if ("content".equalsIgnoreCase(uri.getScheme())) {
-            return getDataColumn(context, uri, null, null);
-        }
-        // File
-        else if ("file".equalsIgnoreCase(uri.getScheme())) {
-            return uri.getPath();
-        }
-
-        return null;
-    }
-
-    /**
-     * Get the value of the data column for this Uri. This is useful for
-     * MediaStore Uris, and other file-based ContentProviders.
-     *
-     * @param context The context.
-     * @param uri The Uri to query.
-     * @param selection (Optional) Filter used in the query.
-     * @param selectionArgs (Optional) Selection arguments used in the query.
-     * @return The value of the _data column, which is typically a file path.
-     */
-    public static String getDataColumn(Context context, Uri uri, String selection,
-                                       String[] selectionArgs) {
-
-        Cursor cursor = null;
-        final String column = "_data";
-        final String[] projection = {
-                column
-        };
-
-        try {
-            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
-                    null);
-            if (cursor != null && cursor.moveToFirst()) {
-                final int column_index = cursor.getColumnIndexOrThrow(column);
-                return cursor.getString(column_index);
-            }
-        } finally {
-            if (cursor != null)
-                cursor.close();
-        }
-        return null;
-    }
-
-
-    /**
-     * @param uri The Uri to check.
-     * @return Whether the Uri authority is ExternalStorageProvider.
-     */
-    public static boolean isExternalStorageDocument(Uri uri) {
-        return "com.android.externalstorage.documents".equals(uri.getAuthority());
-    }
-
-    /**
-     * @param uri The Uri to check.
-     * @return Whether the Uri authority is DownloadsProvider.
-     */
-    public static boolean isDownloadsDocument(Uri uri) {
-        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
-    }
-
-    /**
-     * @param uri The Uri to check.
-     * @return Whether the Uri authority is MediaProvider.
-     */
-    public static boolean isMediaDocument(Uri uri) {
-        return "com.android.providers.media.documents".equals(uri.getAuthority());
-    }
-}

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

@@ -18,66 +18,63 @@
 
 package xyz.quaver.pupil.util
 
-import kotlinx.serialization.ImplicitReflectionSerializer
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-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>() {
+class GalleryList(private val file: File, private val list: MutableSet<Int> = mutableSetOf()) : MutableSet<Int> by list {
 
     init {
-        if (!file.exists())
+        if (!file.exists()) {
             file.parentFile?.mkdirs()
-
-        try {
-            load()
-        } catch (e: Exception) {
             save()
         }
+        load()
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
+    fun load() {
-    fun load() : Histories {
+        synchronized(this) {
-        return apply {
+            list.clear()
-            super.clear()
+            list.addAll(
-            addAll(
+                Json.decodeFromString<List<Int>>(file.bufferedReader().use { it.readText() })
-                Json(JsonConfiguration.Stable).parseList(
-                    file.bufferedReader().use { it.readText() }
-                )
             )
         }
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     fun save() {
-        file.writeText(Json(JsonConfiguration.Stable).stringify(this))
+        synchronized(this) {
+            file.writeText(Json.encodeToString(list))
+        }
     }
 
     override fun add(element: Int): Boolean {
         load()
 
-        if (contains(element))
+        return list.add(element).also {
-            super.remove(element)
+            save()
+        }
+    }
 
-        super.add(0, element)
+    override fun addAll(elements: Collection<Int>): Boolean {
+        load()
 
-        save()
+        return list.addAll(elements).also {
-
+            save()
-        return true
+        }
     }
 
     override fun remove(element: Int): Boolean {
         load()
-        val retval = super.remove(element)
-        save()
 
-        return retval
+        return list.remove(element).also {
+            save()
+        }
     }
 
     override fun clear() {
-        super.clear()
+        list.clear()
         save()
     }
+
 }

app/src/main/java/xyz/quaver/pupil/util/ItemClickSupport.java

@@ -1,107 +0,0 @@
-package xyz.quaver.pupil.util;
-
-import android.view.View;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import xyz.quaver.pupil.R;
-
-/*
-  Source: http://www.littlerobots.nl/blog/Handle-Android-RecyclerView-Clicks/
-  USAGE:
-
-  ItemClickSupport.addTo(mRecyclerView).setOnItemClickListener(new ItemClickSupport.OnItemClickListener() {
-      @Override
-      public void onItemClicked(RecyclerView recyclerView, int position, View v) {
-          // do it
-      }
-  });
-
-*/
-public class ItemClickSupport {
-    private final RecyclerView mRecyclerView;
-    private OnItemClickListener mOnItemClickListener;
-    private OnItemLongClickListener mOnItemLongClickListener;
-    private View.OnClickListener mOnClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if (mOnItemClickListener != null) {
-                RecyclerView.ViewHolder holder = mRecyclerView.getChildViewHolder(v);
-                mOnItemClickListener.onItemClicked(mRecyclerView, holder.getAdapterPosition(), v);
-            }
-        }
-    };
-    private View.OnLongClickListener mOnLongClickListener = new View.OnLongClickListener() {
-        @Override
-        public boolean onLongClick(View v) {
-            if (mOnItemLongClickListener != null) {
-                RecyclerView.ViewHolder holder = mRecyclerView.getChildViewHolder(v);
-                return mOnItemLongClickListener.onItemLongClicked(mRecyclerView, holder.getAdapterPosition(), v);
-            }
-            return false;
-        }
-    };
-    private RecyclerView.OnChildAttachStateChangeListener mAttachListener
-            = new RecyclerView.OnChildAttachStateChangeListener() {
-        @Override
-        public void onChildViewAttachedToWindow(@NonNull View view) {
-            if (mOnItemClickListener != null) {
-                view.setOnClickListener(mOnClickListener);
-            }
-            if (mOnItemLongClickListener != null) {
-                view.setOnLongClickListener(mOnLongClickListener);
-            }
-        }
-
-        @Override
-        public void onChildViewDetachedFromWindow(@NonNull View view) {
-
-        }
-    };
-
-    private ItemClickSupport(RecyclerView recyclerView) {
-        mRecyclerView = recyclerView;
-        mRecyclerView.setTag(R.id.item_click_support, this);
-        mRecyclerView.addOnChildAttachStateChangeListener(mAttachListener);
-    }
-
-    public static ItemClickSupport addTo(RecyclerView view) {
-        ItemClickSupport support = (ItemClickSupport) view.getTag(R.id.item_click_support);
-        if (support == null) {
-            support = new ItemClickSupport(view);
-        }
-        return support;
-    }
-
-    public static ItemClickSupport removeFrom(RecyclerView view) {
-        ItemClickSupport support = (ItemClickSupport) view.getTag(R.id.item_click_support);
-        if (support != null) {
-            support.detach(view);
-        }
-        return support;
-    }
-
-    public ItemClickSupport setOnItemClickListener(OnItemClickListener listener) {
-        mOnItemClickListener = listener;
-        return this;
-    }
-
-    public ItemClickSupport setOnItemLongClickListener(OnItemLongClickListener listener) {
-        mOnItemLongClickListener = listener;
-        return this;
-    }
-
-    private void detach(RecyclerView view) {
-        view.removeOnChildAttachStateChangeListener(mAttachListener);
-        view.setTag(R.id.item_click_support, null);
-    }
-
-    public interface OnItemClickListener {
-
-        void onItemClicked(RecyclerView recyclerView, int position, View v);
-    }
-
-    public interface OnItemLongClickListener {
-
-        boolean onItemLongClicked(RecyclerView recyclerView, int position, View v);
-    }
-}

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

@@ -0,0 +1,69 @@
+/*
+ *     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.view.View
+import androidx.recyclerview.widget.RecyclerView
+import xyz.quaver.pupil.R
+
+class ItemClickSupport(private val recyclerView: RecyclerView) {
+
+    var onItemClickListener: ((RecyclerView, Int, View) -> Unit)? = null
+    var onItemLongClickListener: ((RecyclerView, Int, View) -> Boolean)? = null
+
+    init {
+        recyclerView.apply {
+            setTag(R.id.item_click_support, this)
+            addOnChildAttachStateChangeListener(object: RecyclerView.OnChildAttachStateChangeListener {
+                override fun onChildViewAttachedToWindow(view: View) {
+                    onItemClickListener?.let { listener ->
+                        view.setOnClickListener {
+                            recyclerView.getChildViewHolder(view).let { holder ->
+                                listener.invoke(recyclerView, holder.adapterPosition, view)
+                            }
+                        }
+                    }
+                    onItemLongClickListener?.let { listener ->
+                        view.setOnLongClickListener {
+                            recyclerView.getChildViewHolder(view).let { holder ->
+                                listener.invoke(recyclerView, holder.adapterPosition, view)
+                            }
+                        }
+                    }
+                }
+
+                override fun onChildViewDetachedFromWindow(view: View) {
+                    // Do Nothing
+                }
+            })
+        }
+    }
+
+    fun detach() {
+        recyclerView.apply {
+            clearOnChildAttachStateChangeListeners()
+            setTag(R.id.item_click_support, null)
+        }
+    }
+
+    companion object {
+        fun addTo(view: RecyclerView) = view.let { removeFrom(it); ItemClickSupport(it) }
+        fun removeFrom(view: RecyclerView) = (view.tag as? ItemClickSupport)?.detach()
+    }
+}

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

@@ -0,0 +1,48 @@
+/*
+ *     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.SharedPreferences
+import kotlin.reflect.KClass
+
+lateinit var preferences: SharedPreferences
+
+object Preferences: SharedPreferences by preferences {
+
+    val defMap = mapOf(
+        String::class to "",
+        Int::class to -1,
+        Long::class to -1L,
+        Boolean::class to false,
+        Set::class to emptySet<Any>()
+    )
+
+    operator fun set(key: String, value: String) = edit().putString(key, value).apply()
+    operator fun set(key: String, value: Int) = edit().putInt(key, value).apply()
+    operator fun set(key: String, value: Long) = edit().putLong(key, value).apply()
+    operator fun set(key: String, value: Boolean) = edit().putBoolean(key, value).apply()
+    operator fun set(key: String, value: Set<String>) = edit().putStringSet(key, value).apply()
+
+    @Suppress("UNCHECKED_CAST")
+    inline operator fun <reified T: Any> get(key: String, defaultVal: T = defMap[T::class] as T): T = (all[key] as? T) ?: defaultVal
+
+    fun remove(key: String) {
+        edit().remove(key).apply()
+    }
+}

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

@@ -21,48 +21,51 @@ package xyz.quaver.pupil.util.download
 import android.content.Context
 import android.content.ContextWrapper
 import android.util.Base64
-import androidx.documentfile.provider.DocumentFile
+import android.util.SparseArray
 import androidx.preference.PreferenceManager
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.*
-import kotlinx.serialization.ImplicitReflectionSerializer
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.parse
+import xyz.quaver.Code
-import kotlinx.serialization.stringify
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
-import xyz.quaver.pupil.util.*
+import xyz.quaver.pupil.util.getCachedGallery
+import xyz.quaver.pupil.util.getDownloadDirectory
+import xyz.quaver.pupil.util.isParentOf
+import xyz.quaver.readBytes
+import java.io.BufferedInputStream
 import java.io.File
+import java.io.FileOutputStream
+import java.io.InputStream
 import java.net.URL
 
+@Deprecated("Use downloader.Cache instead")
 class Cache(context: Context) : ContextWrapper(context) {
 
+    companion object {
+        private val moving = mutableListOf<Int>()
+        private val readers = SparseArray<Reader?>()
+    }
+
     private val preference = PreferenceManager.getDefaultSharedPreferences(this)
 
     // Search in this order
     // Download -> Cache
-    fun getCachedGallery(galleryID: Int) : DocumentFile? {
+    fun getCachedGallery(galleryID: Int) = getCachedGallery(this, galleryID).also {
-        var file = getDownloadDirectory(this)?.findFile(galleryID.toString())
+        if (!it.exists())
-
+            it.mkdirs()
-        if (file?.exists() == true)
-            return file
-
-        file = DocumentFile.fromFile(File(cacheDir, "imageCache/$galleryID"))
-
-        return if (file.exists())
-             file
-        else
-             null
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     fun getCachedMetadata(galleryID: Int) : Metadata? {
-        val file = (getCachedGallery(galleryID) ?: return null).findFile(".metadata")
+        val file = File(getCachedGallery(galleryID), ".metadata")
 
-        if (file?.exists() != true)
+        if (!file.exists())
             return null
 
         return try {
-            Json.parse(file.readText(this))
+            Json.decodeFromString(file.readText())
         } catch (e: Exception) {
             //File corrupted
             file.delete()
@@ -70,25 +73,30 @@ class Cache(context: Context) : ContextWrapper(context) {
         }
     }
 
-    @UseExperimental(ImplicitReflectionSerializer::class)
     fun setCachedMetadata(galleryID: Int, metadata: Metadata) {
-        val file = getCachedGallery(galleryID)?.findFile(".metadata") ?:
+        if (preference.getBoolean("cache_disable", false))
-        DocumentFile.fromFile(File(cacheDir, "imageCache/$galleryID").also {
+            return
-            if (!it.exists())
-                it.mkdirs()
-        }).createFile("null", ".metadata") ?: return
 
-        file.writeText(this, Json.stringify(metadata))
+        val file = File(getCachedGallery(galleryID), ".metadata").also {
+            if (!it.exists())
+                it.createNewFile()
+        }
+
+        file.writeText(Json.encodeToString(metadata))
     }
 
     suspend fun getThumbnail(galleryID: Int): String? {
         val metadata = Cache(this).getCachedMetadata(galleryID)
 
+        @Suppress("BlockingMethodInNonBlockingContext")
         val thumbnail = if (metadata?.thumbnail == null)
             withContext(Dispatchers.IO) {
-                val thumbnails = getGalleryBlock(galleryID)?.thumbnails
+                val thumbnail = getGalleryBlock(galleryID)?.thumbnails?.firstOrNull() ?: return@withContext null
                 try {
-                    Base64.encodeToString(URL(thumbnails?.firstOrNull()).readBytes(), Base64.DEFAULT)
+                    val data = URL(thumbnail).readBytes().apply {
+                        if (isEmpty()) return@withContext null
+                    }
+                    Base64.encodeToString(data, Base64.DEFAULT)
                 } catch (e: Exception) {
                     null
                 }
@@ -107,17 +115,29 @@ class Cache(context: Context) : ContextWrapper(context) {
     suspend fun getGalleryBlock(galleryID: Int): GalleryBlock? {
         val metadata = Cache(this).getCachedMetadata(galleryID)
 
-        val galleryBlock = if (metadata?.galleryBlock == null)
+        val sources = listOf(
-           listOf(
+            { xyz.quaver.hitomi.getGalleryBlock(galleryID) },
-               { xyz.quaver.hitomi.getGalleryBlock(galleryID) },
+            { xyz.quaver.hiyobi.getGalleryBlock(galleryID) }
-               { xyz.quaver.hiyobi.getGalleryBlock(galleryID) }
+        )
-           ).map {
+
-               CoroutineScope(Dispatchers.IO).async {
+        val galleryBlock = if (metadata?.galleryBlock == null) {
-                   kotlin.runCatching {
+            withContext(Dispatchers.IO) {
-                       it.invoke()
+                var galleryBlock: GalleryBlock? = null
-                   }.getOrNull()
+
-               }
+                for (source in sources) {
-           }.awaitAll().filterNotNull()
+                    galleryBlock = try {
+                        source.invoke()
+                    } catch (e: Exception) {
+                        null
+                    }
+
+                    if (galleryBlock != null)
+                        break
+                }
+
+                galleryBlock
+            } ?: return null
+        }
         else
             metadata.galleryBlock
 
@@ -126,89 +146,145 @@ class Cache(context: Context) : ContextWrapper(context) {
             Metadata(Cache(this).getCachedMetadata(galleryID), galleryBlock = galleryBlock)
         )
 
-        val mirrors = preference.getString("mirrors", "")!!.split('>')
+        return galleryBlock
-
-        return galleryBlock.firstOrNull {
-            mirrors.contains(it.code.name)
-        } ?: galleryBlock.firstOrNull()
     }
 
     fun getReaderOrNull(galleryID: Int): Reader? {
-        val metadata = getCachedMetadata(galleryID)
+        return readers[galleryID] ?: getCachedMetadata(galleryID)?.reader
-
-        val mirrors = preference.getString("mirrors", "")!!.split('>')
-
-        return metadata?.readers?.firstOrNull {
-            mirrors.contains(it.code.name)
-        } ?: metadata?.readers?.firstOrNull()
     }
 
     suspend fun getReader(galleryID: Int): Reader? {
         val metadata = getCachedMetadata(galleryID)
+        val mirrors = preference.getString("mirrors", null)?.split('>') ?: listOf()
 
-        val readers = if (metadata?.readers == null) {
+        val sources = mapOf(
-             listOf(
+            Code.HITOMI to { xyz.quaver.hitomi.getReader(galleryID) },
-                { xyz.quaver.hitomi.getReader(galleryID) },
+            Code.HIYOBI to { xyz.quaver.hiyobi.getReader(galleryID) }
-                { xyz.quaver.hiyobi.getReader(galleryID) }
+        ).let {
-            ).map {
+            if (mirrors.isNotEmpty())
-                CoroutineScope(Dispatchers.IO).async {
+                it.toSortedMap{ o1, o2 ->
-                    kotlin.runCatching {
+                    mirrors.indexOf(o1.name) - mirrors.indexOf(o2.name)
-                        it.invoke()
-                    }.getOrNull()
                 }
-            }.awaitAll().filterNotNull()
+            else
-        } else {
+                it
-            metadata.readers
         }
 
-        if (readers.isNotEmpty())
+        val reader =
-            setCachedMetadata(
+            if (readers[galleryID] != null)
-                galleryID,
+                return readers[galleryID]
-                Metadata(Cache(this).getCachedMetadata(galleryID), readers = readers)
+            else if (metadata?.reader == null) {
-            )
+                var retval: Reader? = null
 
-        val mirrors = preference.getString("mirrors", "")!!.split('>')
+                for (source in sources) {
+                    retval = try {
+                        withContext(Dispatchers.IO) {
+                            withTimeoutOrNull(1000) {
+                                source.value.invoke()
+                            }
+                        }
+                    } catch (e: Exception) {
+                        FirebaseCrashlytics.getInstance().recordException(e)
+                        null
+                    }
 
-        return readers.firstOrNull {
+                    if (retval != null)
-            mirrors.contains(it.code.name)
+                        break
-        } ?: readers.firstOrNull()
+                }
+
+                retval
+            } else
+                metadata.reader
+
+        readers.put(galleryID, reader)
+
+        setCachedMetadata(
+            galleryID,
+            Metadata(Cache(this).getCachedMetadata(galleryID), readers = reader)
+        )
+
+        return reader
     }
 
-    fun getImages(galleryID: Int): List<DocumentFile?>? {
+    val imageNameRegex = Regex("""^\d+\..+$""")
-        val gallery = getCachedGallery(galleryID) ?: return null
+    fun getImages(galleryID: Int): List<File?>? {
-        val reader = getReaderOrNull(galleryID) ?: return null
+        val gallery = getCachedGallery(galleryID)
-        val images = gallery.listFiles()
 
-        return reader.galleryInfo.indices.map { index ->
+        return gallery.list { _, name ->
-            images.firstOrNull { file -> file.name?.startsWith(index.toString()) == true }
+            imageNameRegex.matches(name)
+        }?.map {
+            File(gallery, it)
         }
     }
 
-    fun putImage(galleryID: Int, name: String, data: ByteArray) {
+    val imageExtensions = listOf(
-        val cache = getCachedGallery(galleryID) ?:
+        "png",
-        DocumentFile.fromFile(File(cacheDir, "imageCache/$galleryID").also {
+        "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, index: Int, ext: String, data: InputStream) {
+        if (preference.getBoolean("cache_disable", false))
+            return
+
+        val cache = File(getCachedGallery(galleryID), "%05d.$ext".format(index)).also {
             if (!it.exists())
-                it.mkdirs()
+                it.createNewFile()
-        }) ?: return
+        }
 
-        if (!Regex("""^[0-9]+.+$""").matches(name))
+        try {
-            throw IllegalArgumentException("File name is not a number")
+            BufferedInputStream(data).use { inputStream ->
-
+                FileOutputStream(cache).use { outputStream ->
-        cache.createFile("null", name)?.writeBytes(this, data)
+                    inputStream.copyTo(outputStream)
+                }
+            }
+        } catch (e: Exception) {
+            cache.delete()
+        }
     }
 
     fun moveToDownload(galleryID: Int) {
-        val cache = getCachedGallery(galleryID)
+        if (preference.getBoolean("cache_disable", false))
+            return
 
-        if (cache != null) {
+        if (moving.contains(galleryID))
-            val download = getDownloadDirectory(this)!!
+            return
 
-            if (!download.isParentOf(cache)) {
+        CoroutineScope(Dispatchers.IO).launch {
-                cache.copyRecursively(this, download)
+            val cache = getCachedGallery(galleryID).also {
-                cache.deleteRecursively()
+                if (!it.exists())
+                    return@launch
             }
-        } else
+            val download = File(getDownloadDirectory(this@Cache), galleryID.toString())
-            getDownloadDirectory(this)?.createDirectory(galleryID.toString())
+
+            if (download.isParentOf(cache))
+                return@launch
+
+            FirebaseCrashlytics.getInstance().log("MOVING ${cache.canonicalPath} --> ${download.canonicalPath}")
+
+            cache.copyRecursively(download, true) { file, err ->
+                FirebaseCrashlytics.getInstance().log("MOVING ERROR ${file.canonicalPath} ${err.message}")
+                OnErrorAction.SKIP
+            }
+            FirebaseCrashlytics.getInstance().log("MOVED ${cache.canonicalPath}")
+
+            FirebaseCrashlytics.getInstance().log("DELETING ${cache.canonicalPath}")
+            cache.deleteRecursively()
+            FirebaseCrashlytics.getInstance().log("DELETED ${cache.canonicalPath}")
+        }
     }
 
     fun isDownloading(galleryID: Int) = getCachedMetadata(galleryID)?.isDownloading == true

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

@@ -23,30 +23,33 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
 import android.content.SharedPreferences
+import android.util.Log
 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 com.google.firebase.crashlytics.FirebaseCrashlytics
-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.hitomi.imageUrlFromImage
 import xyz.quaver.hiyobi.cookie
 import xyz.quaver.hiyobi.createImgList
 import xyz.quaver.hiyobi.user_agent
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.client
+import xyz.quaver.pupil.interceptors
 import xyz.quaver.pupil.ui.ReaderActivity
+import java.io.File
 import java.io.IOException
-import java.util.concurrent.Executors
 import java.util.concurrent.LinkedBlockingQueue
 
-@UseExperimental(ExperimentalCoroutinesApi::class)
+@Deprecated("Use DownloadService instead")
+@OptIn(ExperimentalCoroutinesApi::class)
 class DownloadWorker private constructor(context: Context) : ContextWrapper(context) {
 
     private val preferences : SharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
@@ -74,7 +77,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         private var bufferedSource : BufferedSource? = null
 
         override fun contentLength() = responseBody.contentLength()
-        override fun contentType() = responseBody.contentType() ?: null
+        override fun contentType() = responseBody.contentType()
 
         override fun source(): BufferedSource {
             if (bufferedSource == null)
@@ -84,7 +87,6 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         }
 
         private fun source(source: Source) = object: ForwardingSource(source) {
-
             var totalBytesRead = 0L
 
             override fun read(sink: Buffer, byteCount: Long): Long {
@@ -98,6 +100,24 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
 
         }
     }
+
+    init {
+        interceptors[Pair::class] =  { chain ->
+            val request = chain.request()
+            var response = chain.proceed(request)
+
+            var retry = 5
+            while (!response.isSuccessful && retry > 0) {
+                response = chain.proceed(request)
+                retry--
+            }
+
+            response.newBuilder()
+                .body(response.body()?.let {
+                    ProgressResponseBody(request.tag(), it, progressListener)
+                }).build()
+        }
+    }
     //endregion
 
     //region Singleton
@@ -126,124 +146,73 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
     * SECONDARY VALUE
     *  0 <= value < 100 -> Download in progress
     *  Float.POSITIVE_INFINITY -> Download completed
-    *  Float.NaN -> Exception
     */
     val progress = SparseArray<MutableList<Float>?>()
-    /*
+    val notification = SparseArray<NotificationCompat.Builder?>()
-    * 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?>()
-    @Volatile var nRunners = 0
-
-    private val client = OkHttpClient.Builder()
-        .addInterceptor { chain ->
-            val request = chain.request()
-            var response = chain.proceed(request)
-
-            var retry = preferences.getInt("retry", 3)
-            while (!response.isSuccessful && retry > 0) {
-                response = chain.proceed(request)
-                retry--
-            }
-
-            response.newBuilder()
-                .body(ProgressResponseBody(request.tag(), response.body(), progressListener))
-                .build()
-        }
-        .dispatcher(Dispatcher(Executors.newSingleThreadExecutor()))
-        .build()
 
     fun stop() {
         queue.clear()
 
         loop.cancel()
-        for (i in 0..worker.size()) {
+        for (i in 0 until worker.size()) {
             val galleryID = worker.keyAt(i)
 
             Cache(this@DownloadWorker).setDownloading(galleryID, false)
             worker[galleryID]?.cancel()
         }
 
-        client.dispatcher().cancelAll()
+        client.dispatcher().queuedCalls().filter {
+            it.request().tag() is Pair<*, *>
+        }.forEach {
+            it.cancel()
+        }
+        client.dispatcher().runningCalls().filter {
+            it.request().tag() is Pair<*, *>
+        }.forEach {
+            it.cancel()
+        }
 
         progress.clear()
-        exception.clear()
         notification.clear()
         notificationManager.cancelAll()
-
-        nRunners = 0
-
     }
 
     fun cancel(galleryID: Int) {
         queue.remove(galleryID)
         worker[galleryID]?.cancel()
 
-        client.dispatcher().queuedCalls()
+        client.dispatcher().queuedCalls().filter {
-            .filter {
+            ((it.request().tag() as Pair<*, *>).first as Int) == galleryID
-                @Suppress("UNCHECKED_CAST")
+        }.forEach {
-                (it.request().tag() as? Pair<Int, Int>)?.first == galleryID
+            it.cancel()
-            }
+        }
-            .forEach {
+        client.dispatcher().runningCalls().filter {
-                it.cancel()
+            ((it.request().tag() as Pair<*, *>).first as Int) == galleryID
-            }
+        }.forEach {
+            it.cancel()
+        }
 
         progress.remove(galleryID)
-        exception.remove(galleryID)
         notification.remove(galleryID)
         notificationManager.cancel(galleryID)
-
-        if (progress.indexOfKey(galleryID) >= 0) {
-            Cache(this@DownloadWorker).setDownloading(galleryID, false)
-            nRunners--
-        }
     }
 
-    fun isCompleted(galleryID: Int) = progress[galleryID]?.all { !it.isFinite() } == true
+    fun isCompleted(galleryID: Int) = progress[galleryID]?.all { it.isInfinite() } == true
 
     private fun queueDownload(galleryID: Int, reader: Reader, index: Int, callback: Callback) {
-        val cache = Cache(this@DownloadWorker).getImages(galleryID)
         val lowQuality = preferences.getBoolean("low_quality", false)
 
-        //Cache exists :P
-        cache?.get(index)?.let {
-            progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
-
-            notify(galleryID)
-
-            if (isCompleted(galleryID)) {
-                with(Cache(this@DownloadWorker)) {
-                    if (isDownloading(galleryID)) {
-                        moveToDownload(galleryID)
-                        setDownloading(galleryID, false)
-                    }
-                }
-                nRunners--
-            }
-
-            return
-        }
-
         val request = Request.Builder().apply {
             when (reader.code) {
                 Code.HITOMI -> {
                     url(
-                        urlFromUrlFromHash(
+                        imageUrlFromImage(
                             galleryID,
-                            reader.galleryInfo[index],
+                            reader.galleryInfo.files[index],
-                            if (lowQuality) "webp" else null
+                            !lowQuality
                         )
                     )
                     addHeader("Referer", getReferer(galleryID))
@@ -269,82 +238,107 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         //gallery doesn't exist
         if (reader == null) {
             progress.put(galleryID, null)
-            exception.put(galleryID, null)
 
             Cache(this@DownloadWorker).setDownloading(galleryID, false)
-            nRunners--
             return@launch
         }
 
-        progress.put(galleryID, reader.galleryInfo.map { 0F }.toMutableList())
+        val cache = Cache(this@DownloadWorker).getImages(galleryID)
-        exception.put(galleryID, reader.galleryInfo.map { null }.toMutableList())
 
-        notification[galleryID].setContentTitle(reader.title)
+        progress.put(galleryID, reader.galleryInfo.files.indices.map { index ->
+            if (cache?.firstOrNull { it?.nameWithoutExtension?.toIntOrNull()  == index } != null)
+                Float.POSITIVE_INFINITY
+            else
+                0F
+        }.toMutableList())
+
+        if (notification[galleryID] == null)
+            initNotification(galleryID)
+
+        notification[galleryID]?.setContentTitle(reader.galleryInfo.title)
         notify(galleryID)
 
-        for (i in reader.galleryInfo.indices) {
+        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())
+                    if (e.message?.contains("cancel", true) != false)
-                        Crashlytics.logException(e)
+                        return
 
-                    progress[galleryID]?.set(i, Float.NaN)
+                    cancel(galleryID)
-                    exception[galleryID]?.set(i, e)
+                    queue.add(galleryID)
-
-                    notify(galleryID)
-
-                    if (isCompleted(galleryID)) {
-                        val cache = Cache(this@DownloadWorker)
-                        if (cache.isDownloading(galleryID)) {
-                            cache.moveToDownload(galleryID)
-                            cache.setDownloading(galleryID, false)
-                        }
-                        nRunners--
-                    }
                 }
 
                 override fun onResponse(call: Call, response: Response) {
-                    response.body().use {
+                    val ext = call.request().url().encodedPath().split('.').last()
-                        val res = it.bytes()
-                        val ext =
-                            call.request().url().encodedPath().split('.').last()
 
-                        Cache(this@DownloadWorker).putImage(galleryID, "$i.$ext", res)
+                    try {
-                        progress[galleryID]?.set(i, Float.POSITIVE_INFINITY)
+                        response.body()!!.use {
-                    }
+                            Cache(this@DownloadWorker).putImage(galleryID, i, ext, it.byteStream())
-
-                    notify(galleryID)
-
-                    if (isCompleted(galleryID)) {
-                        val cache = Cache(this@DownloadWorker)
-                        if (cache.isDownloading(galleryID)) {
-                            cache.moveToDownload(galleryID)
-                            cache.setDownloading(galleryID, false)
                         }
-                        nRunners--
+                        progress[galleryID]?.set(i, Float.POSITIVE_INFINITY)
+
+                        notify(galleryID)
+
+                        CoroutineScope(Dispatchers.IO).launch {
+                            if (isCompleted(galleryID)) {
+                                with(Cache(this@DownloadWorker)) {
+                                    if (isDownloading(galleryID)) {
+                                        moveToDownload(galleryID)
+                                        setDownloading(galleryID, false)
+                                    }
+                                }
+                            }
+                        }
+                    } catch (e: Exception) {
+                        FirebaseCrashlytics.getInstance().apply {
+                            log("FAIL ON OK ${call.request().tag()} (${e.message})")
+                            setCustomKey("POS", "FAIL ON OK")
+                            recordException(e)
+                        }
+
+                        File(Cache(this@DownloadWorker).getCachedGallery(galleryID), "%05d.$ext".format(i)).delete()
+
+                        cancel(galleryID)
+                        queue.add(galleryID)
                     }
                 }
             }
 
-            queueDownload(galleryID, reader, i, callback)
+            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
+        val progress = progress[galleryID]?.count { it.isInfinite() } ?: 0
 
-        if (isCompleted(galleryID))
+        if (isCompleted(galleryID)) {
             notification[galleryID]
                 ?.setContentText(getString(R.string.reader_notification_complete))
+                ?.setSmallIcon(android.R.drawable.stat_sys_download_done)
                 ?.setProgress(0, 0, false)
-        else
+                ?.setOngoing(false)
+
+            notificationManager.cancel(galleryID)
+        } else
             notification[galleryID]
                 ?.setProgress(max, progress, false)
                 ?.setContentText("$progress/$max")
 
         if (Cache(this).isDownloading(galleryID) && notification[galleryID] != null)
-            notificationManager.notify(galleryID, notification[galleryID].build())
+            notification[galleryID]?.let { notificationManager.notify(galleryID, it.build()) }
         else
             notificationManager.cancel(galleryID)
     }
@@ -355,7 +349,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         }
         val pendingIntent = TaskStackBuilder.create(this).run {
             addNextIntentWithParentStack(intent)
-            getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
+            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT)
         }
 
         notification.put(galleryID, NotificationCompat.Builder(this, "download").apply {
@@ -364,24 +358,28 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
             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() || nRunners > preferences.getInt("max_download", 4))
+            if (queue.isEmpty())
                 continue
 
-            val galleryID = queue.poll() ?: continue
+            val galleryID = queue.peek() ?: continue
 
             if (progress.indexOfKey(galleryID) >= 0)    // Gallery already downloading!
-                continue
+                cancel(galleryID)
+
+            if (notification[galleryID] == null)
+                initNotification(galleryID)
 
-            initNotification(galleryID)
             if (Cache(this@DownloadWorker).isDownloading(galleryID))
-                notificationManager.notify(galleryID, notification[galleryID].build())
+                notification[galleryID]?.let { notificationManager.notify(galleryID, it.build()) }
+
             worker.put(galleryID, download(galleryID))
-            nRunners++
+            queue.poll()
         }
     }
 

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

@@ -22,23 +22,24 @@ import kotlinx.serialization.Serializable
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
 
+@Deprecated("Use downloader.Cache.Metadata instead")
 @Serializable
 data class Metadata(
-    val thumbnail: String? = null,
+    var thumbnail: String? = null,
-    val galleryBlock: List<GalleryBlock>? = null,
+    var galleryBlock: GalleryBlock? = null,
-    val readers: List<Reader>? = null,
+    var reader: Reader? = null,
-    val isDownloading: Boolean? = null
+    var isDownloading: Boolean? = null
 ) {
     constructor(
         metadata: Metadata?,
         thumbnail: String? = null,
-        galleryBlock: List<GalleryBlock>? = null,
+        galleryBlock: GalleryBlock? = null,
-        readers: List<Reader>? = null,
+        readers: Reader? = null,
         isDownloading: Boolean? = null
     ) : this(
         thumbnail ?: metadata?.thumbnail,
         galleryBlock ?: metadata?.galleryBlock,
-        readers ?: metadata?.readers,
+        readers ?: metadata?.reader,
         isDownloading ?: metadata?.isDownloading
     )
 }

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

@@ -0,0 +1,232 @@
+/*
+ *     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.downloader
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.util.SparseArray
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import okhttp3.Request
+import xyz.quaver.Code
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.Reader
+import xyz.quaver.io.FileX
+import xyz.quaver.io.util.getChild
+import xyz.quaver.io.util.readBytes
+import xyz.quaver.io.util.readText
+import xyz.quaver.io.util.writeBytes
+import xyz.quaver.pupil.client
+import xyz.quaver.pupil.util.Preferences
+
+@Serializable
+data class Metadata(
+    var galleryBlock: GalleryBlock? = null,
+    var reader: Reader? = null,
+    var imageList: MutableList<String?>? = null
+) {
+    fun copy(): Metadata = Metadata(galleryBlock, reader, imageList?.let { MutableList(it.size) { i -> it[i] } })
+}
+
+class Cache private constructor(context: Context, val galleryID: Int) : ContextWrapper(context) {
+
+    companion object {
+        val instances = SparseArray<Cache>()
+
+        fun getInstance(context: Context, galleryID: Int) =
+            instances[galleryID] ?: synchronized(this) {
+                instances[galleryID] ?: Cache(context, galleryID).also { instances.put(galleryID, it) }
+            }
+
+        @Synchronized
+        fun delete(galleryID: Int) {
+            instances[galleryID]?.cacheFolder?.deleteRecursively()
+            instances.delete(galleryID)
+        }
+    }
+
+    init {
+        cacheFolder.mkdirs()
+    }
+
+    var metadata = kotlin.runCatching {
+        findFile(".metadata")?.readText()?.let {
+            Json.decodeFromString<Metadata>(it)
+        }
+    }.getOrNull() ?: Metadata()
+
+    val downloadFolder: FileX?
+        get() = DownloadManager.getInstance(this).getDownloadFolder(galleryID)
+
+    val cacheFolder: FileX
+        get() = FileX(this, cacheDir, "imageCache/$galleryID").also {
+            if (!it.exists())
+                it.mkdirs()
+        }
+
+    fun findFile(fileName: String): FileX? =
+         downloadFolder?.let { downloadFolder -> downloadFolder.getChild(fileName).let {
+            if (it.exists()) it else null
+        } } ?: cacheFolder.getChild(fileName).let {
+            if (it.exists()) it else null
+        }
+
+    @Suppress("BlockingMethodInNonBlockingContext")
+    fun setMetadata(change: (Metadata) -> Unit) {
+        change.invoke(metadata)
+
+        val file = cacheFolder.getChild(".metadata")
+
+        kotlin.runCatching {
+            if (!file.exists()) {
+                file.createNewFile()
+            }
+            file.writeText(Json.encodeToString(metadata))
+        }
+    }
+
+    suspend fun getGalleryBlock(): GalleryBlock? {
+        val sources = listOf(
+            { xyz.quaver.hitomi.getGalleryBlock(galleryID) },
+            { xyz.quaver.hiyobi.getGalleryBlock(galleryID) }
+        )
+
+        return metadata.galleryBlock
+            ?: withContext(Dispatchers.IO) {
+                var galleryBlock: GalleryBlock? = null
+
+                for (source in sources) {
+                    galleryBlock = try {
+                        source.invoke()
+                    } catch (e: Exception) { null }
+
+                    if (galleryBlock != null)
+                        break
+                }
+
+                galleryBlock?.also {
+                    setMetadata { metadata -> metadata.galleryBlock = it }
+                }
+            }
+    }
+
+    @Suppress("BlockingMethodInNonBlockingContext")
+    suspend fun getThumbnail(): ByteArray? =
+        findFile(".thumbnail")?.readBytes()
+            ?: getGalleryBlock()?.thumbnails?.firstOrNull()?.let { withContext(Dispatchers.IO) {
+                kotlin.runCatching {
+                    val request = Request.Builder()
+                        .url(it)
+                        .build()
+
+                    client.newCall(request).execute().body()?.use { it.bytes() }
+                }.getOrNull()?.also { kotlin.run {
+                    cacheFolder.getChild(".thumbnail").writeBytes(it)
+                } }
+            } }
+
+    suspend fun getReader(): Reader? {
+        val mirrors = Preferences.get<String>("mirrors").let { if (it.isEmpty()) emptyList() else it.split('>') }
+
+        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{ o1, o2 -> mirrors.indexOf(o1.name) - mirrors.indexOf(o2.name) }
+            else
+                it
+        }
+
+        return metadata.reader
+            ?: withContext(Dispatchers.IO) {
+                var reader: Reader? = null
+
+                for (source in sources) {
+                    reader = try {
+                        source.value.invoke()
+                    } catch (e: Exception) {
+                        null
+                    }
+
+                   if (reader != null)
+                       break
+                }
+
+                reader?.also {
+                    setMetadata { metadata ->
+                        metadata.reader = it
+
+                        if (metadata.imageList == null)
+                            metadata.imageList = MutableList(reader.galleryInfo.files.size) { null }
+                    }
+                }
+            }
+    }
+
+    fun getImage(index: Int): FileX? =
+        metadata.imageList?.get(index)?.let { findFile(it) }
+
+    @Suppress("BlockingMethodInNonBlockingContext")
+    fun putImage(index: Int, fileName: String, data: ByteArray) {
+        val file = cacheFolder.getChild(fileName)
+
+        file.createNewFile()
+        file.writeBytes(data)
+        setMetadata { metadata -> metadata.imageList!![index] = fileName }
+    }
+
+    @Suppress("BlockingMethodInNonBlockingContext")
+    fun moveToDownload() = CoroutineScope(Dispatchers.IO).launch {
+        val downloadFolder = downloadFolder ?: return@launch
+
+        metadata.imageList?.forEach { imageName ->
+            imageName ?: return@forEach
+            val target = downloadFolder.getChild(imageName)
+            val source = cacheFolder.getChild(imageName)
+
+            if (!source.exists())
+                return@forEach
+
+            kotlin.runCatching {
+                target.createNewFile()
+                source.readBytes()?.let { target.writeBytes(it) }
+            }
+        }
+
+        val cacheMetadata = cacheFolder.getChild(".metadata")
+        val downloadMetadata = downloadFolder.getChild(".metadata")
+
+        if (cacheMetadata.exists()) {
+            kotlin.runCatching {
+                downloadMetadata.createNewFile()
+                downloadMetadata.writeText(Json.encodeToString(metadata))
+                cacheMetadata.delete()
+            }
+        }
+
+        cacheFolder.delete()
+    }
+}

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

@@ -0,0 +1,135 @@
+/*
+ *     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.downloader
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.util.Log
+import kotlinx.coroutines.runBlocking
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import okhttp3.Call
+import xyz.quaver.io.FileX
+import xyz.quaver.io.util.*
+import xyz.quaver.pupil.client
+import xyz.quaver.pupil.services.DownloadService
+import xyz.quaver.pupil.util.Preferences
+import xyz.quaver.pupil.util.formatDownloadFolder
+
+class DownloadManager private constructor(context: Context) : ContextWrapper(context) {
+
+    companion object {
+        @Volatile private var instance: DownloadManager? = null
+
+        fun getInstance(context: Context) =
+            instance ?: synchronized(this) {
+                instance ?: DownloadManager(context).also { instance = it }
+            }
+    }
+
+    val defaultDownloadFolder = FileX(this, getExternalFilesDir(null)!!)
+
+    val downloadFolder: FileX
+        get() = {
+            kotlin.runCatching {
+                FileX(this, Preferences.get<String>("download_folder"))
+            }.getOrElse {
+                Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
+                defaultDownloadFolder
+            }
+        }.invoke()
+
+    private var prevDownloadFolder: FileX? = null
+    private var downloadFolderMapInstance: MutableMap<Int, String>? = null
+    val downloadFolderMap: MutableMap<Int, String>
+        @Synchronized
+        get() {
+            if (prevDownloadFolder != downloadFolder) {
+                prevDownloadFolder = downloadFolder
+                downloadFolderMapInstance = {
+                    val file = downloadFolder.getChild(".download")
+
+                    val data = if (file.exists())
+                        kotlin.runCatching {
+                            file.readText()?.let { Json.decodeFromString<MutableMap<Int, String>>(it) }
+                        }.onFailure { file.delete() }.getOrNull()
+                    else
+                        null
+
+                    data ?: {
+                        file.createNewFile()
+                        file.writeText("{}")
+                        mutableMapOf<Int, String>()
+                    }.invoke()
+                }.invoke()
+            }
+
+            return downloadFolderMapInstance!!
+        }
+
+
+    @Synchronized
+    fun isDownloading(galleryID: Int): Boolean {
+        val isThisGallery: (Call) -> Boolean = { (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }
+
+        return downloadFolderMap.containsKey(galleryID)
+                && client.dispatcher().let { it.queuedCalls().any(isThisGallery) || it.runningCalls().any(isThisGallery) }
+    }
+
+    @Synchronized
+    fun getDownloadFolder(galleryID: Int): FileX? =
+        downloadFolderMap[galleryID]?.let { downloadFolder.getChild(it) }
+
+    @Synchronized
+    fun addDownloadFolder(galleryID: Int) {
+        if (downloadFolderMap.containsKey(galleryID))
+            return
+
+        val name = runBlocking {
+            Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
+        }?.formatDownloadFolder() ?: return
+
+        val folder = downloadFolder.getChild(name)
+
+        if (!folder.exists())
+            folder.mkdir()
+
+        downloadFolderMap[galleryID] = folder.name
+
+        downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
+        downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
+    }
+
+    @Synchronized
+    fun deleteDownloadFolder(galleryID: Int) {
+        if (!downloadFolderMap.containsKey(galleryID))
+            return
+
+        downloadFolderMap[galleryID]?.let {
+            kotlin.runCatching {
+                downloadFolder.getChild(it).delete()
+                downloadFolderMap.remove(galleryID)
+
+                downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
+                downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
+            }
+        }
+    }
+}

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

@@ -19,118 +19,32 @@
 package xyz.quaver.pupil.util
 
 import android.content.Context
-import android.net.Uri
+import android.os.storage.StorageManager
-import androidx.documentfile.provider.DocumentFile
+import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
+import androidx.core.net.toUri
 import java.io.File
+import java.io.FileOutputStream
+import java.lang.reflect.Array
 import java.net.URL
-import java.nio.charset.Charset
-import java.util.*
 
+@Deprecated("Use downloader.Cache instead")
 fun getCachedGallery(context: Context, galleryID: Int) =
-    getDownloadDirectory(context)?.findFile(galleryID.toString()) ?:
+    File(getDownloadDirectory(context), galleryID.toString()).let {
-    DocumentFile.fromFile(File(context.cacheDir, "imageCache/$galleryID"))
+        if (it.exists())
-
+            it
-fun getDownloadDirectory(context: Context) : DocumentFile? {
+        else
-    val uri = PreferenceManager.getDefaultSharedPreferences(context).getString("dl_location", null).let {
+            File(context.cacheDir, "imageCache/$galleryID")
-        Uri.parse(it)
     }
 
-    return if (uri.toString().startsWith("file"))
+@Deprecated("Use downloader.Cache instead")
-        DocumentFile.fromFile(File(uri.path!!))
+fun getDownloadDirectory(context: Context) =
-    else
+    Preferences.get<String>("dl_location").let {
-        DocumentFile.fromTreeUri(context, uri)
+        if (it.isNotEmpty() && !it.startsWith("content"))
-}
+            File(it)
-
+        else
-fun URL.download(context: Context, to: DocumentFile, onDownloadProgress: ((Long, Long) -> Unit)? = null) {
+            context.getExternalFilesDir(null)!!
-    context.contentResolver.openOutputStream(to.uri).use { out ->
-        out!!
-
-        with(openConnection()) {
-            val fileSize = contentLength.toLong()
-
-            getInputStream().use {
-
-                var bytesCopied: Long = 0
-                val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
-
-                var bytes = it.read(buffer)
-                while (bytes >= 0) {
-                    out.write(buffer, 0, bytes)
-                    bytesCopied += bytes
-                    onDownloadProgress?.invoke(bytesCopied, fileSize)
-                    bytes = it.read(buffer)
-                }
-
-            }
-        }
-
-    }
-}
-
-fun DocumentFile.isParentOf(file: DocumentFile?) : Boolean {
-    var parent = file?.parentFile
-    while (parent != null) {
-        if (this.uri.path == parent.uri.path)
-            return true
-
-        parent = parent.parentFile
     }
 
-    return false
+@Deprecated("Use FileX instead")
-}
+fun File.isParentOf(another: File) =
-
+    another.absolutePath.startsWith(this.absolutePath)
-fun DocumentFile.reader(context: Context, charset: Charset = Charsets.UTF_8) = context.contentResolver.openInputStream(uri)!!.reader(charset)
-fun DocumentFile.readBytes(context: Context) = context.contentResolver.openInputStream(uri)!!.readBytes()
-fun DocumentFile.readText(context: Context, charset: Charset = Charsets.UTF_8) = reader(context, charset).use { it.readText() }
-
-fun DocumentFile.writeBytes(context: Context, array: ByteArray) = context.contentResolver.openOutputStream(uri)!!.write(array)
-fun DocumentFile.writeText(context: Context, text: String, charset: Charset = Charsets.UTF_8) = writeBytes(context, text.toByteArray(charset))
-
-fun DocumentFile.copyRecursively(
-    context: Context,
-    target: DocumentFile
-) {
-    if (!exists())
-        throw Exception("The source file doesn't exist.")
-
-    if (this.isFile)
-        target.createFile("null", name!!)!!.writeBytes(
-            context,
-            readBytes(context)
-        )
-    else if (this.isDirectory) {
-        target.createDirectory(name!!).also { newTarget ->
-            listFiles().forEach { child ->
-                child.copyRecursively(context, newTarget!!)
-            }
-        }
-    }
-}
-
-fun DocumentFile.deleteRecursively() {
-
-    if (this.isDirectory)
-        listFiles().forEach {
-            it.deleteRecursively()
-        }
-
-    this.delete()
-}
-
-fun DocumentFile.walk(state: LinkedList<DocumentFile> = LinkedList()) : Queue<DocumentFile> {
-    if (state.isEmpty())
-        state.push(this)
-
-    listFiles().forEach {
-        state.push(it)
-
-        if (it.isDirectory) {
-            it.walk(state)
-        }
-    }
-
-    return state
-}
-
-fun File.copyTo(context: Context, target: DocumentFile) = target.writeBytes(context, this.readBytes())

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.decodeFromString
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
 import java.io.File
 import java.security.MessageDigest
 
@@ -42,7 +43,7 @@ fun hashWithSalt(password: String): Pair<String, String> {
     return Pair(hash(password+salt), salt)
 }
 
-val source = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+const val source = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
 
 @Serializable
 data class Lock(val type: Type, val hash: String, val salt: String) {
@@ -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 = Json.decodeFromString(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.encodeToString(locks?.toList() ?: listOf()))
     }
 
     fun add(lock: Lock) {

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

@@ -19,10 +19,30 @@
 package xyz.quaver.pupil.util
 
 import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import xyz.quaver.Code
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.Reader
+import xyz.quaver.hitomi.getReferer
+import xyz.quaver.hitomi.imageUrlFromImage
+import xyz.quaver.hiyobi.cookie
+import xyz.quaver.hiyobi.createImgList
+import xyz.quaver.hiyobi.user_agent
+import xyz.quaver.pupil.util.downloader.Cache
+import xyz.quaver.pupil.util.downloader.Metadata
 import java.util.*
 import kotlin.collections.ArrayList
 
-@UseExperimental(ExperimentalStdlibApi::class)
+@OptIn(ExperimentalStdlibApi::class)
 fun String.wordCapitalize() : String {
     val result = ArrayList<String>()
 
@@ -33,15 +53,15 @@ fun String.wordCapitalize() : String {
     return result.joinToString(" ")
 }
 
-fun byteToString(byte: Long, precision : Int = 1) : String {
+private val suffix = listOf(
+    "B",
+    "kB",
+    "MB",
+    "GB",
+    "TB" //really?
+)
 
-    val suffix = listOf(
+fun byteToString(byte: Long, precision : Int = 1) : String {
-        "B",
-        "kB",
-        "MB",
-        "GB",
-        "TB" //really?
-    )
     var size = byte.toDouble(); var suffixIndex = 0
 
     while (size >= 1024) {
@@ -50,5 +70,79 @@ fun byteToString(byte: Long, precision : Int = 1) : String {
     }
 
     return "%.${precision}f ${suffix[suffixIndex]}".format(size)
-
 }
+
+/**
+ * Convert android generated ID to requestCode
+ * to prevent java.lang.IllegalArgumentException: Can only use lower 16 bits for requestCode
+ *
+ * https://stackoverflow.com/questions/38072322/generate-16-bit-unique-ids-in-android-for-startactivityforresult
+ */
+fun Int.normalizeID() = this.and(0xFFFF)
+
+fun OkHttpClient.Builder.proxyInfo(proxyInfo: ProxyInfo) = this.apply {
+    proxy(proxyInfo.proxy())
+    proxyInfo.authenticator()?.let {
+        proxyAuthenticator(it)
+    }
+}
+
+val formatMap = mapOf<String, GalleryBlock.() -> (String)>(
+    "-id-" to { id.toString() },
+    "-title-" to { title },
+    "-artist-" to { artists.joinToString() }
+    // TODO
+)
+/**
+ * Formats download folder name with given Metadata
+ */
+fun GalleryBlock.formatDownloadFolder(): String =
+    Preferences["download_folder_name", "[-id-] -title-"].let {
+        formatMap.entries.fold(it) { str, (k, v) ->
+            str.replace(k, v.invoke(this), true)
+        }
+    }
+
+fun GalleryBlock.formatDownloadFolderTest(format: String): String =
+    format.let {
+        formatMap.entries.fold(it) { str, (k, v) ->
+            str.replace(k, v.invoke(this), true)
+        }
+    }
+
+fun Context.startForegroundServiceCompat(service: Intent) {
+    if (Build.VERSION.SDK_INT >= 26)
+        startForegroundService(service)
+    else
+        startService(service)
+}
+
+val Reader.requestBuilders: List<Request.Builder>
+    get() {
+        val galleryID = this.galleryInfo.id ?: 0
+        val lowQuality = Preferences["low_quality", true]
+
+        return when(code) {
+            Code.HITOMI -> {
+                this.galleryInfo.files.map {
+                    Request.Builder()
+                        .url(imageUrlFromImage(galleryID, it, !lowQuality))
+                        .header("Referer", getReferer(galleryID))
+                }
+            }
+            Code.HIYOBI -> {
+                createImgList(galleryID, this, lowQuality).map {
+                    Request.Builder()
+                        .url(it.path)
+                        .header("User-Agent", user_agent)
+                        .header("Cookie", cookie)
+                }
+            }
+        }
+    }
+
+fun String.ellipsize(n: Int): String =
+    if (this.length > n)
+        this.slice(0 until n) + "…"
+    else
+        this

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

@@ -0,0 +1,58 @@
+/*
+ *     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 kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+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.isNullOrBlank() || port == null)
+            return Proxy.NO_PROXY
+        else
+            Proxy(type, InetSocketAddress.createUnresolved(host, port))
+    }
+
+    fun authenticator(): Authenticator? = if (username.isNullOrBlank() || password.isNullOrBlank()) null else
+            Authenticator { _, response ->
+                val credential = Credentials.basic(username, password)
+
+                response.request().newBuilder()
+                    .header("Proxy-Authorization", credential)
+                    .build()
+            }
+
+}
+
+fun getProxyInfo(): ProxyInfo =
+    Json.decodeFromString(Preferences["proxy", Json.encodeToString(ProxyInfo(Proxy.Type.DIRECT))])

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

@@ -18,49 +18,72 @@
 
 package xyz.quaver.pupil.util
 
+import android.annotation.SuppressLint
+import android.app.DownloadManager
 import android.app.PendingIntent
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.webkit.MimeTypeMap
+import android.content.IntentFilter
+import android.net.Uri
+import android.util.Base64
+import android.util.Log
+import android.webkit.URLUtil
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import androidx.lifecycle.Lifecycle
 import androidx.preference.PreferenceManager
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.*
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.Request
+import okhttp3.Response
 import ru.noties.markwon.Markwon
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.Reader
+import xyz.quaver.hitomi.getGalleryBlock
+import xyz.quaver.hitomi.getReader
+import xyz.quaver.io.FileX
+import xyz.quaver.io.util.getChild
+import xyz.quaver.io.util.*
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.client
+import xyz.quaver.pupil.services.DownloadService
+import xyz.quaver.pupil.util.downloader.Cache
+import xyz.quaver.pupil.util.downloader.Metadata
+import java.io.File
+import java.io.IOException
 import java.net.URL
 import java.util.*
 
 fun getReleases(url: String) : JsonArray {
     return try {
         URL(url).readText().let {
-            Json(JsonConfiguration.Stable).parse(JsonArray.serializer(), it)
+            Json.parseToJsonElement(it).jsonArray
         }
     } catch (e: Exception) {
         JsonArray(emptyList())
     }
 }
 
-fun checkUpdate(context: Context, url: String) : JsonObject? {
+fun checkUpdate(url: String) : JsonObject? {
     val releases = getReleases(url)
 
     if (releases.isEmpty())
         return null
 
     return releases.firstOrNull {
-        if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("beta", false))
+        Preferences["beta"] || it.jsonObject["prerelease"]?.jsonPrimitive?.booleanOrNull == false
-            true
-        else
-            it.jsonObject["prerelease"]?.boolean == false
     }?.let {
-        if (it.jsonObject["tag_name"]?.content == BuildConfig.VERSION_NAME)
+        if (it.jsonObject["tag_name"]?.jsonPrimitive?.contentOrNull == BuildConfig.VERSION_NAME)
             null
         else
             it.jsonObject
@@ -69,14 +92,13 @@ fun checkUpdate(context: Context, url: String) : JsonObject? {
 
 fun getApkUrl(releases: JsonObject) : String? {
     return releases["assets"]?.jsonArray?.firstOrNull {
-        Regex("Pupil-v.+\\.apk").matches(it.jsonObject["name"]?.content ?: "")
+        Regex("Pupil-v.+\\.apk").matches(it.jsonObject["name"]?.jsonPrimitive?.contentOrNull ?: "")
     }.let {
-        it?.jsonObject?.get("browser_download_url")?.content
+        it?.jsonObject?.get("browser_download_url")?.jsonPrimitive?.contentOrNull
     }
 }
 
-const val UPDATE_NOTIFICATION_ID = 384823
+fun checkUpdate(context: Context, force: Boolean = false) {
-fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
 
     val preferences = PreferenceManager.getDefaultSharedPreferences(context)
     val ignoreUpdateUntil = preferences.getLong("ignore_update_until", 0)
@@ -85,7 +107,7 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
         return
 
     fun extractReleaseNote(update: JsonObject, locale: Locale) : String {
-        val markdown = update["body"]!!.content
+        val markdown = update["body"]!!.jsonPrimitive.content
 
         val target = when(locale.language) {
             "ko" -> "한국어"
@@ -123,12 +145,12 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
             }
         }
 
-        return context.getString(R.string.update_release_note, update["tag_name"]?.content, result.toString())
+        return context.getString(R.string.update_release_note, update["tag_name"]?.jsonPrimitive?.contentOrNull, result.toString())
     }
 
     CoroutineScope(Dispatchers.Default).launch {
         val update =
-            checkUpdate(context, context.getString(R.string.release_url)) ?: return@launch
+            checkUpdate(context.getString(R.string.release_url)) ?: return@launch
 
         val url = getApkUrl(update) ?: return@launch
 
@@ -138,53 +160,25 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
             setMessage(Markwon.create(context).toMarkdown(msg))
             setPositiveButton(android.R.string.yes) { _, _ ->
 
-                val notificationManager = NotificationManagerCompat.from(context)
+                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-                val builder = NotificationCompat.Builder(context, "download").apply {
+
-                    setContentTitle(context.getString(R.string.update_notification_description))
+                //Cancel any download queued before
-                    setSmallIcon(android.R.drawable.stat_sys_download)
+
-                    priority = NotificationCompat.PRIORITY_LOW
+                val id: Long = Preferences["update_download_id"]
+
+                if (id != -1L)
+                    downloadManager.remove(id)
+
+                val target = File(context.getExternalFilesDir(null), "Pupil.apk").also {
+                    it.delete()
                 }
 
-                CoroutineScope(Dispatchers.IO).launch io@{
+                val request = DownloadManager.Request(Uri.parse(url))
-                    val target = getDownloadDirectory(context)?.createFile("null", "Pupil.apk")!!
+                    .setTitle(context.getText(R.string.update_notification_description))
+                    .setDestinationUri(Uri.fromFile(target))
 
-                    try {
+                downloadManager.enqueue(request).also {
-                        URL(url).download(context, target) { progress, fileSize ->
+                    Preferences["update_download_id"] = it
-                            builder.setProgress(fileSize.toInt(), progress.toInt(), false)
-                            notificationManager.notify(UPDATE_NOTIFICATION_ID, builder.build())
-                        }
-                    } catch (e: Exception) {
-                        builder.apply {
-                            setContentText(context.getString(R.string.update_failed))
-                            setMessage(context.getString(R.string.update_failed_message))
-                            setSmallIcon(android.R.drawable.stat_sys_download_done)
-                        }
-
-                        notificationManager.cancel(UPDATE_NOTIFICATION_ID)
-                        notificationManager.notify(UPDATE_NOTIFICATION_ID, builder.build())
-
-                        return@io
-                    }
-
-                    val install = Intent(Intent.ACTION_VIEW).apply {
-                        flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION
-                        setDataAndType(target.uri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
-                    }
-
-                    builder.apply {
-                        setContentIntent(PendingIntent.getActivity(context, 0, install, 0))
-                        setProgress(0, 0, 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))
-                    }
-
-                    notificationManager.cancel(UPDATE_NOTIFICATION_ID)
-
-                    if (context.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED))
-                        context.startActivity(install)
-                    else
-                        notificationManager.notify(UPDATE_NOTIFICATION_ID, builder.build())
                 }
             }
             setNegativeButton(if (force) android.R.string.no else R.string.ignore_update) { _, _ ->
@@ -200,3 +194,137 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
         }
     }
 }
+
+fun restore(favorites: GalleryList, url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((List<Int>) -> Unit)? = null) {
+    if (!URLUtil.isValidUrl(url)) {
+        onFailure?.invoke(IllegalArgumentException())
+        return
+    }
+
+    val request = Request.Builder()
+        .url(url)
+        .get()
+        .build()
+
+    client.newCall(request).enqueue(object: Callback {
+        override fun onFailure(call: Call, e: IOException) {
+            onFailure?.invoke(e)
+        }
+
+        override fun onResponse(call: Call, response: Response) {
+            kotlin.runCatching {
+                Json.decodeFromString<List<Int>>(response.body().use { it?.string() } ?: "[]").let {
+                    favorites.addAll(it)
+                    onSuccess?.invoke(it)
+                }
+            }.onFailure { onFailure?.invoke(it) }
+        }
+    })
+}
+
+private var job: Job? = null
+private val receiver = object: BroadcastReceiver() {
+    val ACTION_CANCEL = "ACTION_IMPORT_CANCEL"
+    override fun onReceive(context: Context?, intent: Intent?) {
+        context ?: return
+
+        when (intent?.action) {
+            ACTION_CANCEL -> {
+                job?.cancel()
+                NotificationManagerCompat.from(context).cancel(R.id.notification_id_import)
+                context.unregisterReceiver(this)
+            }
+        }
+    }
+}
+@SuppressLint("RestrictedApi")
+fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
+    registerReceiver(receiver, IntentFilter().apply { addAction(receiver.ACTION_CANCEL) })
+
+    val notificationManager = NotificationManagerCompat.from(this)
+    val action = NotificationCompat.Action.Builder(0, getText(android.R.string.cancel),
+        PendingIntent.getBroadcast(this, R.id.notification_import_cancel_action.normalizeID(), Intent(receiver.ACTION_CANCEL), PendingIntent.FLAG_UPDATE_CURRENT)
+    ).build()
+    val notification = NotificationCompat.Builder(this, "import")
+        .setContentTitle(getText(R.string.import_old_galleries_notification))
+        .setProgress(0, 0, true)
+        .addAction(action)
+        .setSmallIcon(R.drawable.ic_notification)
+        .setOngoing(true)
+
+    DownloadService.cancel(this)
+
+    job?.cancel()
+    job = CoroutineScope(Dispatchers.IO).launch {
+        val downloadFolders = downloadFolder.listFiles { folder ->
+            (folder as? FileX)?.isDirectory == true && !downloadFolderMap.values.contains(folder.name)
+        }
+
+        if (downloadFolders.isNullOrEmpty()) return@launch
+
+        downloadFolders.forEachIndexed { index, folder ->
+            notification
+                .setContentText(getString(R.string.import_old_galleries_notification_text, index, downloadFolders.size))
+                .setProgress(index, downloadFolders.size, false)
+            notificationManager.notify(R.id.notification_id_import, notification.build())
+
+            kotlin.runCatching {
+                if (folder !is FileX) return@runCatching
+
+                val metadata = kotlin.runCatching {
+                    folder.getChild(".metadata").readText()?.let { Json.parseToJsonElement(it).jsonObject }
+                }.getOrNull()
+
+                val galleryID = folder.name.toIntOrNull() ?: return@runCatching
+
+                val galleryBlock: GalleryBlock? = kotlin.runCatching {
+                    metadata?.get("galleryBlock")?.let { Json.decodeFromJsonElement<GalleryBlock>(it) }
+                }.getOrNull() ?: getGalleryBlock(galleryID)
+                val reader: Reader? = kotlin.runCatching {
+                    metadata?.get("reader")?.let { Json.decodeFromJsonElement<Reader>(it) }
+                }.getOrNull() ?: getReader(galleryID)
+
+                metadata?.get("thumbnail")?.jsonPrimitive?.contentOrNull?.also { thumbnail ->
+                    val file = folder.getChild(".thumbnail").also {
+                        if (it.exists())
+                            it.delete()
+                        it.createNewFile()
+                    }
+
+                    file.writeBytes(Base64.decode(thumbnail, Base64.DEFAULT))
+                }
+
+                val list: MutableList<String?> =
+                    MutableList(reader!!.galleryInfo.files.size) { null }
+
+                folder.listFiles { file ->
+                    file?.nameWithoutExtension?.let {
+                        Regex("""\d{5}""").matches(it) && it.toIntOrNull() != null
+                    } == true
+                }?.forEach {
+                    list[it.nameWithoutExtension.toInt()] = it.name
+                }
+
+                folder.getChild(".metadata").also { if (it.exists()) it.delete(); it.createNewFile() }.writeText(
+                    Json.encodeToString(Metadata(galleryBlock, reader, list))
+                )
+
+                synchronized(Cache) {
+                    Cache.delete(galleryID)
+                }
+                downloadFolderMap[galleryID] = folder.name
+
+                downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile(); it.writeText(Json.encodeToString(downloadFolderMap)) }
+            }
+        }
+
+        notification
+            .setContentText(getText(R.string.import_old_galleries_notification_done))
+            .setProgress(0, 0, false)
+            .setOngoing(false)
+            .mActions.clear()
+        notificationManager.notify(R.id.notification_id_import, notification.build())
+
+        unregisterReceiver(receiver)
+    }
+}

app/src/main/res/anim/shake.xml

@@ -0,0 +1,24 @@
+<?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/>.
+  -->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromXDelta="0"
+    android:interpolator="@anim/shake_cycle"
+    android:toXDelta="10" />

app/src/main/res/anim/shake_cycle.xml

@@ -0,0 +1,21 @@
+<?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/>.
+  -->
+
+<cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:cycles="3" />

app/src/main/res/color/lock_fab.xml

@@ -0,0 +1,23 @@
+<?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/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@android:color/darker_gray"/>
+    <item android:color="@color/colorPrimary"/>
+</selector>