Merge branch 'dev' into master

# Conflicts:
#	app/release/app-release.apk
#	app/release/output-metadata.json

.gitignore

@@ -16,4 +16,5 @@
 /gh-pages
 
 #Private files
-**/google-services.json
+**/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,65 @@
+<?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>
+    <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

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

app/build.gradle

@@ -3,36 +3,42 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlinx-serialization'
+apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 
 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")
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
-        versionCode 43
+        versionCode 59
-        versionName "4.7"
+        versionName "5.0.3-hotfix1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         debug {
+            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
         }
         release {
             minifyEnabled true
@@ -43,57 +49,70 @@ android {
         }
     }
     kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
         freeCompilerArgs += '-Xuse-experimental=kotlin.Experimental'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    buildToolsVersion = '29.0.2'
+    buildToolsVersion = '29.0.3'
 }
 
 dependencies {
-    def markwonVersion = "3.0.1"
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    //implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    implementation "androidx.activity:activity-ktx:1.2.0-alpha08"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0"
+    implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha08'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation "androidx.biometric:biometric:1.0.1"
-    implementation 'com.android.support:multidex:1.0.3'
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
-    implementation 'com.google.android.material:material:1.2.0-alpha05'
+    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.google.android.gms:play-services-oss-licenses:17.0.0'
+    implementation 'com.google.android.gms:play-services-mlkit-face-detection:16.1.1'
     implementation 'com.github.arimorty:floatingsearchview:2.1.1'
     implementation 'com.github.clans:fab:1.6.4'
-
+    //implementation 'com.quiph.ui:recyclerviewfastscroller:0.2.1'
+    //noinspection GradleDependency
+    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 'com.gu:option:1.3'
     implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
-    implementation "ru.noties.markwon:core:${markwonVersion}"
+    //implementation 'com.andrognito.pinlockview:pinlockview:2.1.0'
+    implementation "ru.noties.markwon:core:3.1.0"
+    implementation ("xyz.quaver:libpupil:1.6") {
+        exclude group: 'org.jetbrains.kotlinx', module: 'kotlinx-serialization-core-jvm'
+    }
+    implementation "xyz.quaver:documentfilex:0.2.15"
     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 {
     experimental = true
-}
+}

app/proguard-rules.pro

@@ -23,8 +23,29 @@
 -dontobfuscate
 
 -keep public class * implements com.bumptech.glide.module.GlideModule
--keep public class * extends com.bumptech.glide.module.AppGlideModule
+-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": 59,
+      "versionName": "5.0.3-hotfix1",
+      "enabled": true,
+      "outputFile": "app-release.apk"
+    }
+  ]
+}

app/release/output.json

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

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

@@ -20,23 +20,10 @@
 
 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 org.junit.Test
 import org.junit.runner.RunWith
-import xyz.quaver.hiyobi.cookie
-import xyz.quaver.hiyobi.createImgList
-import xyz.quaver.hiyobi.getReader
-import xyz.quaver.hiyobi.user_agent
-import xyz.quaver.pupil.ui.LockActivity
-import xyz.quaver.pupil.util.download.Cache
-import xyz.quaver.pupil.util.download.DownloadWorker
-import java.net.URL
-import javax.net.ssl.HttpsURLConnection
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -51,63 +38,4 @@ class ExampleInstrumentedTest {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
     }
-
-    @Test
-    fun checkCacheDir() {
-        val activityTestRule = ActivityTestRule(LockActivity::class.java)
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-
-        ContextCompat.getExternalFilesDirs(appContext, null).forEachIndexed { index, file ->
-            Log.i("PUPILD", "$index: ${file?.absolutePath}")
-        }
-    }
-
-    @Test
-    fun test_doSearch() {
-        val reader = getReader( 1426382)
-
-        val data: ByteArray
-
-        with(URL(createImgList(1426382, reader)[0].path).openConnection() as HttpsURLConnection) {
-            setRequestProperty("User-Agent", user_agent)
-            setRequestProperty("Cookie", cookie)
-
-            data = inputStream.readBytes()
-        }
-
-        Log.d("Pupil", data.size.toString())
-    }
-
-    @Test
-    fun test_downloadWorker() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-
-        val galleryID = 515515
-
-        val worker = DownloadWorker.getInstance(context)
-
-        worker.queue.add(galleryID)
-
-        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)
-                break
-        }
-
-        Log.i("PUPILD", "DONE!!")
-    }
-
-    @Test
-    fun test_getReaderOrNull() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-
-        val galleryID = 1561552
-
-        runBlocking {
-            Log.i("PUPILD", Cache(context).getReader(galleryID)?.title ?: "null")
-        }
-
-        Log.i("PUPILD", Cache(context).getReaderOrNull(galleryID)?.title ?: "null")
-    }
 }

app/src/main/AndroidManifest.xml

@@ -6,8 +6,13 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="21"/>
-    <uses-permission 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" />
+    <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
 
     <application
         android:name=".Pupil"
@@ -18,8 +23,13 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
+        android:networkSecurityConfig="@xml/network_security_config"
         tools:replace="android:theme"
-        android:requestLegacyExternalStorage="true">
+        tools:ignore="UnusedAttribute">
+
+        <meta-data
+            android:name="com.google.mlkit.vision.DEPENDENCIES"
+            android:value="face" />
 
         <provider
             android:authorities="${applicationId}.provider"
@@ -33,6 +43,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 +65,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 +131,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 +200,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 +208,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 +229,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

@@ -0,0 +1,221 @@
+/*
+ *     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 com.arlib.floatingsearchview
+
+import android.content.Context
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
+import android.graphics.drawable.Animatable
+import android.os.Parcelable
+import android.text.Editable
+import android.text.TextWatcher
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
+import com.arlib.floatingsearchview.suggestions.SearchSuggestionsAdapter
+import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
+import com.arlib.floatingsearchview.util.view.SearchInputView
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.favoriteTags
+import xyz.quaver.pupil.types.*
+import java.util.*
+
+class FloatingSearchViewDayNight @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+    FloatingSearchView(context, attrs),
+    FloatingSearchView.OnSearchListener,
+    SearchSuggestionsAdapter.OnBindSuggestionCallback,
+    TextWatcher
+{
+
+    private val searchInputView = findViewById<SearchInputView>(R.id.search_bar_text)
+
+    var onHistoryDeleteClickedListener: ((String) -> Unit)? = null
+    var onFavoriteHistorySwitchClickListener: (() -> Unit)? = null
+
+    init {
+        searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
+
+        searchInputView.addTextChangedListener(this)
+        setOnSearchListener(this)
+        setOnBindSuggestionCallback(this)
+    }
+
+    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+
+    }
+
+    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+
+    }
+
+    override fun afterTextChanged(s: Editable?) {
+        s ?: return
+
+        if (s.any { it.isUpperCase() })
+            s.replace(0, s.length, s.toString().toLowerCase(Locale.getDefault()))
+    }
+
+    override fun onSuggestionClicked(searchSuggestion: SearchSuggestion?) {
+        when (searchSuggestion) {
+            is TagSuggestion -> {
+                with(searchInputView.text) {
+                    delete(if (lastIndexOf(' ') == -1) 0 else lastIndexOf(' ')+1, length)
+                    append("${searchSuggestion.n}:${searchSuggestion.s.replace(Regex("\\s"), "_")} ")
+                }
+            }
+            is Suggestion -> {
+                with(searchInputView.text) {
+                    clear()
+                    append(searchSuggestion.str)
+                }
+            }
+            is FavoriteHistorySwitch -> onFavoriteHistorySwitchClickListener?.invoke()
+        }
+    }
+
+    override fun onSearchAction(currentQuery: String?) {}
+
+    override fun onBindSuggestion(
+        suggestionView: View?,
+        leftIcon: ImageView?,
+        textView: TextView?,
+        item: SearchSuggestion?,
+        itemPosition: Int
+    ) {
+        when(item) {
+            is TagSuggestion -> {
+                val tag = "${item.n}:${item.s.replace(Regex("\\s"), "_")}"
+
+                leftIcon?.setImageDrawable(
+                    ResourcesCompat.getDrawable(
+                        resources,
+                        when(item.n) {
+                            "female" -> R.drawable.gender_female
+                            "male" -> R.drawable.gender_male
+                            "language" -> R.drawable.translate
+                            "group" -> R.drawable.account_group
+                            "character" -> R.drawable.account_star
+                            "series" -> R.drawable.book_open
+                            "artist" -> R.drawable.brush
+                            else -> R.drawable.tag
+                        },
+                        context.theme)
+                )
+
+                with(suggestionView?.findViewById<ImageView>(R.id.right_icon)) {
+                    this ?: return@with
+
+                    if (favoriteTags.contains(Tag.parse(tag)))
+                        setImageResource(R.drawable.ic_star_filled)
+                    else
+                        setImageResource(R.drawable.ic_star_empty)
+
+                    visibility = View.VISIBLE
+                    rotation = 0f
+
+                    isEnabled = true
+                    isClickable = true
+
+                    setOnClickListener {
+                        val tag = Tag.parse(tag)
+
+                        if (favoriteTags.contains(tag)) {
+                            setImageResource(R.drawable.ic_star_empty)
+                            favoriteTags.remove(tag)
+                        }
+                        else {
+                            setImageDrawable(
+                                AnimatedVectorDrawableCompat.create(context,
+                                    R.drawable.avd_star
+                                ))
+                            (drawable as Animatable).start()
+
+                            favoriteTags.add(tag)
+                        }
+                    }
+                }
+
+                if (item.t == -1) {
+                    textView?.text = item.s
+                } else {
+                    (suggestionView as? LinearLayout)?.let {
+                        val count = it.findViewById<TextView>(R.id.count)
+                        if (count == null)
+                            it.addView(
+                                LayoutInflater.from(context).inflate(R.layout.suggestion_count, suggestionView, false)
+                                    .apply {
+                                        this as TextView
+
+                                        text = item.t.toString()
+                                    }, 2
+                            )
+                        else
+                            count.text = item.t.toString()
+                    }
+                }
+            }
+            is FavoriteHistorySwitch -> {
+                leftIcon?.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.swap_horizontal, context.theme))
+            }
+            is Suggestion -> {
+                leftIcon?.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.history, context.theme))
+
+                with(suggestionView?.findViewById<ImageView>(R.id.right_icon)) {
+                    this ?: return@with
+
+                    setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.delete, context.theme))
+
+                    visibility = View.VISIBLE
+                    rotation = 0f
+
+                    isEnabled = true
+                    isClickable = true
+
+                    setOnClickListener {
+                        onHistoryDeleteClickedListener?.invoke(item.str)
+                    }
+                }
+            }
+            is LoadingSuggestion -> {
+                leftIcon?.setImageDrawable(CircularProgressDrawable(context).also {
+                    it.setStyle(CircularProgressDrawable.DEFAULT)
+                    it.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(context, R.color.colorAccent), PorterDuff.Mode.SRC_IN)
+                    it.start()
+                })
+            }
+            is NoResultSuggestion -> {
+                leftIcon?.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.close, context.theme))
+            }
+        }
+    }
+
+    // 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,46 +18,119 @@
 
 package xyz.quaver.pupil
 
-import android.app.Notification
+import android.app.*
-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 com.google.firebase.analytics.FirebaseAnalytics
-import xyz.quaver.proxy
+import com.google.firebase.crashlytics.FirebaseCrashlytics
-import xyz.quaver.pupil.util.Histories
+import kotlinx.coroutines.CoroutineScope
-import xyz.quaver.pupil.util.getProxy
+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.types.Tag
+import xyz.quaver.pupil.util.*
+import xyz.quaver.pupil.util.downloader.DownloadManager
+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: SavedSet<Int>
-    lateinit var favorites: Histories
+    private set
+lateinit var favorites: SavedSet<Int>
+    private set
+lateinit var favoriteTags: SavedSet<Tag>
+    private set
+lateinit var searchHistory: SavedSet<String>
+    private set
 
-    init {
+val interceptors = mutableMapOf<KClass<out Any>, PupilInterceptor>()
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+
+lateinit var clientBuilder: OkHttpClient.Builder
+
+var clientHolder: OkHttpClient? = null
+val client: OkHttpClient
+    get() = clientHolder ?: clientBuilder.build().also {
+        clientHolder = it
+        setClient(it)
     }
 
+class Pupil : Application() {
+
     override fun onCreate() {
-        val preference = PreferenceManager.getDefaultSharedPreferences(this)
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
 
-        proxy = getProxy(this)
+        preferences = PreferenceManager.getDefaultSharedPreferences(this)
 
-        try {
+        val userID = Preferences["user_id", ""].let {  userID ->
-            preference.getString("dl_location", null)
+            if (userID.isEmpty()) UUID.randomUUID().toString().also { Preferences["user_id"] = it }
-        } catch (e: Exception) {
+            else userID
-            preference.edit().remove("dl_location").apply()
         }
 
-        histories = Histories(File(ContextCompat.getDataDir(this), "histories.json"))
+        FirebaseCrashlytics.getInstance().setUserId(userID)
-        favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json"))
+
+        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 (it.startsWith("content") && 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()
+
+                DownloadManager.getInstance(this).migrate()
+            }
+        } catch (e: Exception) {
+            Preferences.remove("download_folder")
+        }
+
+        histories = SavedSet(File(ContextCompat.getDataDir(this), "histories.json"), 0)
+        favorites = SavedSet(File(ContextCompat.getDataDir(this), "favorites.json"), 0)
+        favoriteTags = SavedSet(File(ContextCompat.getDataDir(this), "favorites_tags.json"), Tag.parse(""))
+        searchHistory = SavedSet(File(ContextCompat.getDataDir(this), "search_histories.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)
@@ -72,17 +145,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

@@ -16,15 +16,26 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package xyz.quaver.pupil.util
+package xyz.quaver.pupil
 
-import kotlinx.serialization.json.Json
+import android.content.Context
-import kotlinx.serialization.json.JsonConfiguration
+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
 
-const val REQUEST_LOCK = 38238
+@GlideModule
-const val REQUEST_RESTORE = 16546
+class PupilGlideModule : AppGlideModule() {
-const val REQUEST_DOWNLOAD_FOLDER = 3874
-const val REQUEST_DOWNLOAD_FOLDER_OLD = 3425
-const val REQUEST_WRITE_PERMISSION_AND_SAF = 13900
 
-val json = Json(JsonConfiguration.Stable)
+    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

@@ -20,42 +20,47 @@ package xyz.quaver.pupil.adapters
 
 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.util.Base64
+import android.util.Log
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.bumptech.glide.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
-import com.google.android.material.chip.Chip
 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,45 +68,53 @@ 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
 
         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)
 
             CoroutineScope(Dispatchers.Main).launch {
-                if (reader == null) {
+                if (cache.metadata.reader == null || Preferences["cache_disable"]) {
-                    view.galleryblock_progressbar.visibility = View.GONE
+                    view.galleryblock_progressbar_layout.visibility = View.GONE
-                    view.galleryblock_progress_complete.visibility = View.GONE
+                    view.galleryblock_progress_complete.visibility = View.INVISIBLE
                     return@launch
                 }
 
                 with(view.galleryblock_progressbar) {
+                    val imageList = cache.metadata.imageList!!
 
-                    progress = cache.listFiles()?.count { file ->
+                    progress = imageList.filterNotNull().size
-                        Regex("^[0-9]+.+\$").matches(file.name)
+                    max = imageList.size
-                    } ?: 0
 
-                    if (visibility == View.GONE) {
+                    with(view.galleryblock_progressbar_layout) {
-                        visibility = View.VISIBLE
+                        if (visibility == View.GONE)
-                        max = reader.galleryInfo.files.size
+                            visibility = View.VISIBLE
                     }
 
                     if (progress == max) {
+                        val downloadManager = DownloadManager.getInstance(context)
+
                         if (completeFlag.get(galleryID, false)) {
                             with(view.galleryblock_progress_complete) {
-                                setImageResource(R.drawable.ic_progressbar)
+                                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, R.drawable.ic_progressbar_complete).apply {
+                                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
@@ -114,7 +127,11 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
             }
         }
 
-        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 {
@@ -126,51 +143,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 = Cache(context).getThumbnail(galleryBlock.id).let {
+                    val thumbnail = cache.getThumbnail()
-                        if (it != null)
-                            Base64.decode(it, Base64.DEFAULT)
-                        else
-                            null
-                    }
 
                     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 (reader != null) {
-                    val count = cache.listFiles()?.count {
-                        Regex("^[0-9]+.+\$").matches(it.name)
-                    } ?: 0
-
-                    with(galleryblock_progressbar) {
-                        max = reader.galleryInfo.files.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
@@ -202,41 +222,27 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
                 }
 
                 galleryblock_tag_group.removeAllViews()
-                galleryBlock.relatedTags.forEach {
+                CoroutineScope(Dispatchers.Default).launch {
-                    galleryblock_tag_group.addView(Chip(context).apply {
+                    galleryBlock.relatedTags.map {
-                        val tag = Tag.parse(it).let {  tag ->
+                        TagChip(context, Tag.parse(it)).apply {
-                            when {
+                            setOnClickListener { view ->
-                                tag.area != null -> tag
+                                for (callback in onChipClickedHandler)
-                                else -> Tag("tag", it)
+                                    callback.invoke((view as TagChip).tag)
                             }
                         }
-
+                    }.let { launch(Dispatchers.Main) { it.forEach { galleryblock_tag_group.addView(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)
-                        }
-                    })
                 }
 
                 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)
@@ -264,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
+                }
             }
         }
     }
@@ -313,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 {
@@ -341,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?) {}
@@ -366,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,68 +18,47 @@
 
 package xyz.quaver.pupil.adapters
 
-import android.content.Context
+import android.graphics.drawable.Drawable
-import android.graphics.BitmapFactory
 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.ListPreloader
+import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.RequestBuilder
-import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.crashlytics.android.Crashlytics
+import com.bumptech.glide.load.engine.GlideException
-import io.fabric.sdk.android.Fabric
+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.hitomi.getReferer
+import xyz.quaver.hitomi.imageUrlFromImage
+import xyz.quaver.hiyobi.createImgList
 import xyz.quaver.pupil.BuildConfig
 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 java.io.File
+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>() {
 
-    val glide = Glide.with(context)
-
-    //region Glide.RecyclerView
-    val sizeProvider = ListPreloader.PreloadSizeProvider<File> { _, _, position ->
-        Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.files?.getOrNull(position)?.let {
-            arrayOf(it.width, it.height).toIntArray()
-        }
-    }
-    val modelProvider = object: ListPreloader.PreloadModelProvider<File> {
-        override fun getPreloadItems(position: Int): MutableList<File> {
-            return listOf(Cache(context).getImages(galleryID)?.getOrNull(position)).filterNotNullTo(mutableListOf())
-        }
-
-        override fun getPreloadRequestBuilder(item: File): RequestBuilder<*>? {
-            return glide
-                .load(item)
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .skipMemoryCache(true)
-                .error(R.drawable.image_broken_variant)
-                .apply {
-                    if (BuildConfig.CENSOR)
-                        override(5, 8)
-                }
-        }
-    }
-    val preloader = RecyclerViewPreloader<File>(glide, modelProvider, sizeProvider, 10)
-    //endregion
-
     var reader: Reader? = null
     val timer = Timer()
 
+    private val glide = Glide.with(activity)
+
     var isFullScreen = false
 
     var onItemClickListener : ((Int) -> (Unit))? = null
@@ -94,75 +73,116 @@ class ReaderAdapter(private val context: Context,
         }
     }
 
+    private var cache: Cache? = null
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.view as ConstraintLayout
 
+        if (cache == null)
+            cache = Cache.getInstance(holder.view.context, galleryID)
+
         if (isFullScreen) {
-            holder.view.layoutParams.height = RecyclerView.LayoutParams.MATCH_PARENT
+            holder.view.layoutParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT
-            holder.view.container.layoutParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT
         } else {
-            holder.view.layoutParams.height = RecyclerView.LayoutParams.WRAP_CONTENT
+            holder.view.layoutParams.height = ConstraintLayout.LayoutParams.WRAP_CONTENT
-            holder.view.container.layoutParams.height = 0
+
+            (holder.view.progress_layout.layoutParams as ConstraintLayout.LayoutParams)
+                .dimensionRatio = "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
         }
 
         holder.view.image.setOnPhotoTapListener { _, _, _ ->
             onItemClickListener?.invoke(position)
         }
 
-        holder.view.container.setOnClickListener {
+        holder.view.setOnClickListener {
             onItemClickListener?.invoke(position)
         }
 
-        if (!isFullScreen)
-            (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
-                .dimensionRatio = "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
-
         holder.view.reader_index.text = (position+1).toString()
 
-        val images = Cache(context).getImage(galleryID, position)
+        if (Preferences["cache_disable"]) {
-        val progress = DownloadWorker.getInstance(context).progress[galleryID]?.get(position)
+            val lowQuality: Boolean = Preferences["low_quality"]
 
-        if (progress?.isInfinite() == true && images != null) {
+            val url = when (reader!!.code) {
-            holder.view.reader_item_progressbar.visibility = View.INVISIBLE
+                Code.HITOMI ->
-            holder.view.container.apply {
+                    GlideUrl(
-                val options = BitmapFactory.Options().apply {
+                        imageUrlFromImage(
-                    inJustDecodeBounds = true
+                            galleryID,
-                }
+                            reader!!.galleryInfo.files[position],
-
+                            !lowQuality
-                BitmapFactory.decodeFile(images.canonicalPath, options)
+                        )
-
+                    , LazyHeaders.Builder().addHeader("Referer", getReferer(galleryID)).build())
-                maxWidth = options.outWidth
+                Code.HIYOBI ->
-                maxHeight = options.outHeight
+                    GlideUrl(createImgList(galleryID, reader!!, lowQuality)[position].path)
+                else -> null
             }
-
+            holder.view.image.post {
-            glide
-                .load(images)
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .skipMemoryCache(true)
-                .dontTransform()
-                .error(R.drawable.image_broken_variant)
-                .apply {
-                    if (BuildConfig.CENSOR)
-                        override(5, 8)
-                }
-                .into(holder.view.image)
-        } else {
-            holder.view.reader_item_progressbar.visibility = View.VISIBLE
-            holder.view.container.apply {
-                maxWidth = Integer.MAX_VALUE
-                maxHeight = Integer.MAX_VALUE
-            }
-
-            if (progress?.isNaN() == true) {
-                if (Fabric.isInitialized())
-                    Crashlytics.logException(DownloadWorker.getInstance(context).exception[galleryID]?.get(position))
-
                 glide
-                    .load(R.drawable.image_broken_variant)
+                    .load(url!!)
+                    .diskCacheStrategy(DiskCacheStrategy.NONE)
+                    .skipMemoryCache(false)
+                    .error(R.drawable.image_broken_variant)
+                    .apply {
+                        if (BuildConfig.CENSOR)
+                            override(5, 8)
+                        else
+                            override(
+                                holder.view.context.resources.displayMetrics.widthPixels,
+                                holder.view.context.resources.getDimensionPixelSize(R.dimen.reader_max_height)
+                            )
+                    }
+                    .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)
 
-                return
+            if (progress?.isInfinite() == true && image != null) {
+                holder.view.reader_item_progressbar.visibility = View.INVISIBLE
+
+                CoroutineScope(Dispatchers.IO).launch {
+                    glide
+                        .load(image.uri)
+                        .diskCacheStrategy(DiskCacheStrategy.NONE)
+                        .skipMemoryCache(true)
+                        .apply {
+                            if (BuildConfig.CENSOR)
+                                override(5, 8)
+                            else
+                                override(
+                                    holder.view.context.resources.displayMetrics.widthPixels,
+                                    holder.view.context.resources.getDimensionPixelSize(R.dimen.reader_max_height)
+                                )
+                        }
+                        .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
+
+                glide.clear(holder.view.image)
+
                 holder.view.reader_item_progressbar.progress =
                     if (progress?.isInfinite() == true)
                         100
@@ -170,11 +190,11 @@ class ReaderAdapter(private val context: Context,
                         progress?.roundToInt() ?: 0
 
                 holder.view.image.setImageDrawable(null)
-            }
 
-            timer.schedule(1000) {
+                timer.schedule(1000) {
-                CoroutineScope(Dispatchers.Main).launch {
+                    CoroutineScope(Dispatchers.Main).launch {
-                    notifyItemChanged(position)
+                        notifyItemChanged(position)
+                    }
                 }
             }
         }

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,440 @@
+/*
+ *     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 androidx.core.content.ContextCompat
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+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.Preferences
+import xyz.quaver.pupil.util.downloader.Cache
+import xyz.quaver.pupil.util.downloader.DownloadManager
+import xyz.quaver.pupil.util.ellipsize
+import xyz.quaver.pupil.util.normalizeID
+import xyz.quaver.pupil.util.requestBuilders
+import java.io.IOException
+
+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.also { if (it.code() != 200) throw IOException() }.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
+        }
+
+        progress.put(galleryID, MutableList(reader.galleryInfo.files.size) { 0F })
+
+        FirebaseCrashlytics.getInstance().log(
+            """
+                GALLERYID: $galleryID
+                CACHE: ${cache.findFile(".metadata")}
+                PATTERN: ${Preferences["download_folder_name", ""]}
+                READER ID: ${reader.galleryInfo.id}
+                READER SIZE: ${reader.galleryInfo.files.size}
+                CACHE READER ID: ${cache.metadata.reader?.galleryInfo?.id}}
+                CACHE READER SIZE: ${cache.metadata.reader?.galleryInfo?.files?.size}
+            """.trimIndent()
+        )
+
+        cache.metadata.imageList?.let {
+            if (progress[galleryID]?.size != it.size) {
+                cache.metadata.imageList?.filterNotNull()?.forEach { file ->
+                    cache.findFile(file)?.delete()
+                }
+                cache.metadata.imageList = MutableList(reader.galleryInfo.files.size) { null }
+                return@let
+            }
+
+            it.forEachIndexed { index, image ->
+                progress[galleryID]?.set(index, if (image != null) Float.POSITIVE_INFINITY else 0F)
+            }
+        }
+
+        if (isCompleted(galleryID)) {
+            if (DownloadManager.getInstance(this@DownloadService)
+                    .getDownloadFolder(galleryID) != null )
+                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
+
+            notificationManager.cancel(galleryID)
+            startId?.let { stopSelf(it) }
+            return@launch
+        }
+
+        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) {
+            ContextCompat.startForegroundService(context, 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 {
+        startForeground(R.id.downloader_notification_id, serviceNotification.build())
+
+        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/Suggestions.kt

@@ -29,4 +29,25 @@ data class TagSuggestion(val s: String, val t: Int, val u: String, val n: String
     override fun getBody(): String {
         return s
     }
+}
+
+@Parcelize
+class Suggestion(val str: String) : SearchSuggestion {
+    override fun getBody() = str
+}
+
+@Parcelize
+class NoResultSuggestion(val str: String) : SearchSuggestion {
+    override fun getBody() = str
+}
+
+@Parcelize
+class LoadingSuggestion(val str: String) : SearchSuggestion {
+    override fun getBody() = str
+}
+
+@Parcelize
+@Suppress("PARCELABLE_PRIMARY_CONSTRUCTOR_IS_EMPTY")
+class FavoriteHistorySwitch(private val body: String) : SearchSuggestion {
+    override fun getBody() = body
 }

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

@@ -24,7 +24,7 @@ import kotlinx.serialization.Serializable
 data class Tag(val area: String?, val tag: String, val isNegative: Boolean = false) {
     companion object {
         fun parse(tag: String) : Tag {
-            if (tag.first() == '-') {
+            if (tag.firstOrNull() == '-') {
                 tag.substring(1).split(Regex(":"), 2).let {
                     return when(it.size) {
                         2 -> Tag(it[0], it[1], true)
@@ -62,12 +62,10 @@ data class Tag(val area: String?, val tag: String, val isNegative: Boolean = fal
         return false
     }
 
-    override fun hashCode(): Int {
+    override fun hashCode() = toString().hashCode()
-        return super.hashCode()
-    }
 }
 
-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 +75,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 +90,22 @@ 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/BaseActivity.kt

@@ -0,0 +1,72 @@
+/*
+ *     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
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.os.PersistableBundle
+import android.view.WindowManager
+import androidx.annotation.CallSuper
+import androidx.appcompat.app.AppCompatActivity
+import xyz.quaver.pupil.R
+import xyz.quaver.pupil.util.LockManager
+import xyz.quaver.pupil.util.Preferences
+import xyz.quaver.pupil.util.normalizeID
+
+open class BaseActivity : AppCompatActivity() {
+
+    private var locked: Boolean = true
+
+    @CallSuper
+    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
+        super.onCreate(savedInstanceState, persistentState)
+
+        locked = !LockManager(this).locks.isNullOrEmpty()
+    }
+
+    @CallSuper
+    override fun onResume() {
+        super.onResume()
+
+        if (Preferences["security_mode"])
+            window.setFlags(
+                WindowManager.LayoutParams.FLAG_SECURE,
+                WindowManager.LayoutParams.FLAG_SECURE)
+        else
+            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+
+        if (locked)
+            startActivityForResult(Intent(this, LockActivity::class.java), R.id.request_lock.normalizeID())
+    }
+
+    @CallSuper
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        when(requestCode) {
+            R.id.request_lock.normalizeID() -> {
+                if (resultCode == Activity.RESULT_OK)
+                    locked = false
+                else
+                    finish()
+            }
+            else -> super.onActivityResult(requestCode, resultCode, data)
+        }
+    }
+
+}

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

@@ -21,23 +21,161 @@ 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
 
+private var lastUnlocked = 0L
 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) {
+                        lastUnlocked = System.currentTimeMillis()
+                        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) {
+                        lastUnlocked = System.currentTimeMillis()
+                        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)
+                    lastUnlocked = System.currentTimeMillis()
+                    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 +188,8 @@ class LockActivity : AppCompatActivity() {
             return
         }
 
-        val mode = intent.getStringExtra("mode")
+        mode = intent.getStringExtra("mode")
-
+        val force = intent.getBooleanExtra("force", false)
-        lock_pattern.isEnabled = false
-        lock_pin.isEnabled = false
-        lock_fingerprint.isEnabled = false
-        lock_password.isEnabled = false
 
         when(mode) {
             null -> {
@@ -64,52 +198,82 @@ class LockActivity : AppCompatActivity() {
                     finish()
                     return
                 }
+
+                if (System.currentTimeMillis() - lastUnlocked < 5*60*1000 && !force) {
+                    lastUnlocked = System.currentTimeMillis()
+                    setResult(RESULT_OK)
+                    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,63 +18,51 @@
 
 package xyz.quaver.pupil.ui
 
-import android.app.Activity
+import android.annotation.SuppressLint
 import android.content.Intent
-import android.graphics.drawable.Animatable
 import android.net.Uri
 import android.os.Bundle
-import android.text.*
+import android.text.InputType
-import android.text.style.AlignmentSpan
+import android.view.*
-import android.view.KeyEvent
+import android.widget.*
-import android.view.MotionEvent
-import android.view.View
-import android.view.WindowManager
-import android.view.inputmethod.EditorInfo
-import android.widget.EditText
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 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.crashlytics.android.Crashlytics
+import com.bumptech.glide.Glide
 import com.google.android.material.appbar.AppBarLayout
-import io.fabric.sdk.android.Fabric
+import com.google.android.material.navigation.NavigationView
+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.list
-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.*
-import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
-import xyz.quaver.pupil.types.Tag
+import xyz.quaver.pupil.services.DownloadService
-import xyz.quaver.pupil.types.TagSuggestion
+import xyz.quaver.pupil.types.*
-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
 import kotlin.math.abs
 import kotlin.math.ceil
 import kotlin.math.min
 import kotlin.math.roundToInt
 
-class MainActivity : AppCompatActivity() {
+class MainActivity :
+    BaseActivity(),
+    FloatingSearchView.OnMenuItemClickListener,
+    NavigationView.OnNavigationItemSelectedListener
+{
 
     enum class Mode {
         SEARCH,
@@ -82,13 +70,13 @@ class MainActivity : AppCompatActivity() {
         DOWNLOAD,
         FAVORITE
     }
-    
+
     enum class SortMode {
         NEWEST,
         POPULAR
     }
 
-    private val galleries = ArrayList<GalleryBlock>()
+    private val galleries = ArrayList<Int>()
 
     private var query = ""
     set(value) {
@@ -98,72 +86,48 @@ 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?) {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
 
-        val lockManager = try {
+        if (intent.action == Intent.ACTION_VIEW) {
-            LockManager(this)
+            intent.dataString?.let { url ->
-        } catch (e: Exception) {
+                restore(url,
-            android.app.AlertDialog.Builder(this).apply {
+                    onFailure = {
-                setTitle(R.string.warning)
+                        Snackbar.make(this.main_recyclerview, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
-                setMessage(R.string.lock_corrupted)
+                    }, onSuccess = {
-                setPositiveButton(android.R.string.ok) { _, _ ->
+                        Snackbar.make(this.main_recyclerview, getString(R.string.settings_restore_success, it.size), Snackbar.LENGTH_LONG).show()
-                    finish()
+                    }
-                }
+                )
-            }.show()
-
-            return
-        }
-
-        if (lockManager.isNotEmpty())
-            startActivityForResult(Intent(this, LockActivity::class.java), REQUEST_LOCK)
-
-        val preference = PreferenceManager.getDefaultSharedPreferences(this)
-
-        if (Locale.getDefault().language == "ko") {
-            if (!preference.getBoolean("https_block_alert", false)) {
-                android.app.AlertDialog.Builder(this).apply {
-                    setTitle(R.string.https_block_alert_title)
-                    setMessage(R.string.https_block_alert)
-                    setPositiveButton(android.R.string.ok) { _, _ -> }
-                }.show()
-
-                preference.edit().putBoolean("https_block_alert", true).apply()
             }
         }
 
-        with(application as Pupil) {
+        if (Preferences["download_folder", ""].isEmpty())
-            this@MainActivity.histories = histories
+            DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
-            this@MainActivity.favorites = favorites
-        }
-
-        setContentView(R.layout.activity_main)
 
         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()
@@ -180,22 +144,8 @@ class MainActivity : AppCompatActivity() {
         (main_recyclerview?.adapter as? GalleryBlockAdapter)?.timer?.cancel()
     }
 
-    override fun onResume() {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
-
-        if (preferences.getBoolean("security_mode", false))
-            window.setFlags(
-                WindowManager.LayoutParams.FLAG_SECURE,
-                WindowManager.LayoutParams.FLAG_SECURE)
-        else
-            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-
-        super.onResume()
-    }
-
     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) {
@@ -232,9 +182,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()
@@ -242,10 +191,7 @@ class MainActivity : AppCompatActivity() {
                     loadBlocks()
                 }
             }
-            REQUEST_LOCK -> {
+            else -> super.onActivityResult(requestCode, resultCode, data)
-                if (resultCode != Activity.RESULT_OK)
-                    finish()
-            }
         }
     }
 
@@ -268,73 +214,19 @@ class MainActivity : AppCompatActivity() {
         )
 
         //NavigationView
-        main_nav_view.setNavigationItemSelectedListener {
+        main_nav_view.setNavigationItemSelectedListener(this)
-            runOnUiThread {
-                main_drawer_layout.closeDrawers()
 
-                when(it.itemId) {
+        with(main_fab_cancel) {
-                    R.id.main_drawer_home -> {
+            setImageResource(R.drawable.cancel)
-                        cancelFetch()
+            setOnClickListener {
-                        clearGalleries()
+                DownloadService.cancel(this@MainActivity)
-                        currentPage = 0
-                        query = ""
-                        mode = Mode.SEARCH
-                        fetchGalleries(query, sortMode)
-                        loadBlocks()
-                    }
-                    R.id.main_drawer_history -> {
-                        cancelFetch()
-                        clearGalleries()
-                        currentPage = 0
-                        query = ""
-                        mode = Mode.HISTORY
-                        fetchGalleries(query, sortMode)
-                        loadBlocks()
-                    }
-                    R.id.main_drawer_downloads -> {
-                        cancelFetch()
-                        clearGalleries()
-                        currentPage = 0
-                        query = ""
-                        mode = Mode.DOWNLOAD
-                        fetchGalleries(query, sortMode)
-                        loadBlocks()
-                    }
-                    R.id.main_drawer_favorite -> {
-                        cancelFetch()
-                        clearGalleries()
-                        currentPage = 0
-                        query = ""
-                        mode = Mode.FAVORITE
-                        fetchGalleries(query, sortMode)
-                        loadBlocks()
-                    }
-                    R.id.main_drawer_help -> {
-                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.help))))
-                    }
-                    R.id.main_drawer_github -> {
-                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.github))))
-                    }
-                    R.id.main_drawer_homepage -> {
-                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.home_page))))
-                    }
-                    R.id.main_drawer_email -> {
-                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.email))))
-                    }
-                    R.id.main_drawer_kakaotalk -> {
-                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.discord))))
-                    }
-                }
             }
-
-            true
         }
 
         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 {
@@ -359,24 +251,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()
             }
@@ -388,9 +314,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()
@@ -403,18 +330,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)
                         }
                     }
 
@@ -422,51 +347,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)
 
-                        Cache(context).getCachedGallery(galleryID).deleteRecursively()
+                    if (this@MainActivity.mode != Mode.SEARCH)
+                        runOnUiThread {
+                            cancelFetch()
+                            clearGalleries()
+                            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 {
@@ -485,11 +404,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 -> {
@@ -690,195 +609,83 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private var isFavorite = false
+    private val defaultSuggestions: List<SearchSuggestion>
+        get() = when {
+            isFavorite -> {
+                favoriteTags.map {
+                    TagSuggestion(it.tag, -1, "", it.area ?: "tag")
+                } + FavoriteHistorySwitch(getString(R.string.search_show_histories))
+            }
+            else -> {
+                searchHistory.map {
+                    Suggestion(it)
+                }.takeLast(20) + FavoriteHistorySwitch(getString(R.string.search_show_tags))
+            }
+        }.reversed()
+
     private var suggestionJob : Job? = null
     private fun setupSearchBar() {
-        val searchInputView = findViewById<SearchInputView>(R.id.search_bar_text)
+        with(main_searchview as FloatingSearchViewDayNight) {
-        //Change upper case letters to lower case
+            setOnLeftMenuClickListener(object: FloatingSearchView.OnLeftMenuClickListener {
-        searchInputView.addTextChangedListener(object: TextWatcher {
+                override fun onMenuOpened() {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                    (this@MainActivity.main_recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
-
-            }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-                s ?: return
-
-                if (s.any { it.isUpperCase() })
-                    s.replace(0, s.length, s.toString().toLowerCase(Locale.getDefault()))
-            }
-        })
-        searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
-
-        with(main_searchview as FloatingSearchView) {
-            val favoritesFile = File(ContextCompat.getDataDir(context), "favorites_tags.json")
-            val serializer = Tag.serializer().list
-
-            if (!favoritesFile.exists()) {
-                favoritesFile.createNewFile()
-                favoritesFile.writeText(json.stringify(serializer, Tags(listOf())))
-            }
-
-            setOnMenuItemClickListener {
-                when(it.itemId) {
-                    R.id.main_menu_settings -> startActivityForResult(Intent(this@MainActivity, SettingsActivity::class.java), REQUEST_SETTINGS)
-                    R.id.main_menu_sort_newest -> {
-                        sortMode = SortMode.NEWEST
-                        it.isChecked = true
-
-                        runOnUiThread {
-                            currentPage = 0
-
-                            cancelFetch()
-                            clearGalleries()
-                            fetchGalleries(query, sortMode)
-                            loadBlocks()
-                        }
-                    }
-                    R.id.main_menu_sort_popular -> {
-                        sortMode = SortMode.POPULAR
-                        it.isChecked = true
-
-                        runOnUiThread {
-                            currentPage = 0
-
-                            cancelFetch()
-                            clearGalleries()
-                            fetchGalleries(query, sortMode)
-                            loadBlocks()
-                        }
-                    }
                 }
+
+                override fun onMenuClosed() {
+                    //Do Nothing
+                }
+            })
+
+            onHistoryDeleteClickedListener = {
+                searchHistory.remove(it)
+                swapSuggestions(defaultSuggestions)
             }
+            onFavoriteHistorySwitchClickListener = {
+                isFavorite = !isFavorite
+                swapSuggestions(defaultSuggestions)
+            }
+
+            setOnMenuItemClickListener(this@MainActivity)
 
             setOnQueryChangeListener { _, query ->
                 this@MainActivity.query = query
 
                 suggestionJob?.cancel()
 
-                clearSuggestions()
-
                 if (query.isEmpty() or query.endsWith(' ')) {
-                    swapSuggestions(json.parse(serializer, favoritesFile.readText()).map {
+                    swapSuggestions(defaultSuggestions)
-                        TagSuggestion(it.tag, -1, "", it.area ?: "tag")
-                    })
 
                     return@setOnQueryChangeListener
                 }
 
+                swapSuggestions(listOf(LoadingSuggestion(getText(R.string.reader_loading).toString())))
+
                 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)
+                        favoriteTags.contains(Tag.parse(tag))
                     }.reversed().forEach {
                         suggestions.remove(it)
                         suggestions.add(0, it)
                     }
 
                     withContext(Dispatchers.Main) {
-                        swapSuggestions(suggestions)
+                        swapSuggestions(if (suggestions.isNotEmpty()) suggestions else listOf(NoResultSuggestion(getText(R.string.main_no_result).toString())))
                     }
                 }
             }
 
-            setOnBindSuggestionCallback { suggestionView, leftIcon, textView, item, _ ->
-                item as TagSuggestion
-
-                val tag = "${item.n}:${item.s.replace(Regex("\\s"), "_")}"
-
-                leftIcon.setImageDrawable(
-                    ResourcesCompat.getDrawable(
-                        resources,
-                        when(item.n) {
-                            "female" -> R.drawable.ic_gender_female
-                            "male" -> R.drawable.ic_gender_male
-                            "language" -> R.drawable.ic_translate
-                            "group" -> R.drawable.ic_account_group
-                            "character" -> R.drawable.ic_account_star
-                            "series" -> R.drawable.ic_book_open
-                            "artist" -> R.drawable.ic_brush
-                            else -> R.drawable.ic_tag
-                        },
-                        null)
-                )
-
-                with(suggestionView.findViewById<ImageView>(R.id.right_icon)) {
-
-                    if (Tags(json.parse(serializer, favoritesFile.readText())).contains(tag))
-                        setImageResource(R.drawable.ic_star_filled)
-                    else
-                        setImageResource(R.drawable.ic_star_empty)
-
-                    visibility = View.VISIBLE
-                    rotation = 0f
-                    isEnabled = true
-
-                    isClickable = true
-                    setOnClickListener {
-                        val favorites = Tags(json.parse(serializer, favoritesFile.readText()))
-
-                        if (favorites.contains(tag)) {
-                            setImageResource(R.drawable.ic_star_empty)
-                            favorites.remove(tag)
-                        }
-                        else {
-                            setImageDrawable(AnimatedVectorDrawableCompat.create(context,
-                                R.drawable.avd_star
-                            ))
-                            (drawable as Animatable).start()
-
-                            favorites.add(tag)
-                        }
-
-                        favoritesFile.writeText(json.stringify(serializer, favorites))
-                    }
-                }
-
-                if (item.t == -1) {
-                    textView.text = item.s
-                } else {
-                    val text = "${item.s}\n ${item.t}"
-
-                    val len = text.length
-                    val left = item.s.length
-
-                    textView.text = SpannableString(text).apply {
-                        val s = AlignmentSpan.Standard(Layout.Alignment.ALIGN_OPPOSITE)
-                        setSpan(s, left, len, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                        setSpan(SetLineOverlap(true), 1, len-2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                        setSpan(SetLineOverlap(false), len-1, len, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                    }
-                }
-            }
-
-            setOnSearchListener(object : FloatingSearchView.OnSearchListener {
-                override fun onSuggestionClicked(searchSuggestion: SearchSuggestion?) {
-                    if (searchSuggestion !is TagSuggestion)
-                        return
-
-                    with(searchInputView.text) {
-                        delete(if (lastIndexOf(' ') == -1) 0 else lastIndexOf(' ')+1, length)
-                        append("${searchSuggestion.n}:${searchSuggestion.s.replace(Regex("\\s"), "_")} ")
-                    }
-                }
-
-                override fun onSearchAction(currentQuery: String?) {
-                    //Do search on onFocusCleared()
-                }
-            })
-
             setOnFocusChangeListener(object: FloatingSearchView.OnFocusChangeListener {
                 override fun onFocus() {
                     if (query.isEmpty() or query.endsWith(' '))
-                        swapSuggestions(json.parse(serializer, favoritesFile.readText()).map {
+                        swapSuggestions(defaultSuggestions)
-                            TagSuggestion(it.tag, -1, "", it.area ?: "tag")
-                        })
                 }
 
                 override fun onFocusCleared() {
@@ -898,6 +705,113 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onActionMenuItemSelected(item: MenuItem?) {
+        when(item?.itemId) {
+            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
+                item.isChecked = true
+
+                runOnUiThread {
+                    currentPage = 0
+
+                    cancelFetch()
+                    clearGalleries()
+                    fetchGalleries(query, sortMode)
+                    loadBlocks()
+                }
+            }
+            R.id.main_menu_sort_popular -> {
+                sortMode = SortMode.POPULAR
+                item.isChecked = true
+
+                runOnUiThread {
+                    currentPage = 0
+
+                    cancelFetch()
+                    clearGalleries()
+                    fetchGalleries(query, sortMode)
+                    loadBlocks()
+                }
+            }
+        }
+    }
+
+    override fun onNavigationItemSelected(item: MenuItem): Boolean {
+        runOnUiThread {
+            main_drawer_layout.closeDrawers()
+
+            when(item.itemId) {
+                R.id.main_drawer_home -> {
+                    cancelFetch()
+                    clearGalleries()
+                    currentPage = 0
+                    query = ""
+                    queryStack.clear()
+                    mode = Mode.SEARCH
+                    fetchGalleries(query, sortMode)
+                    loadBlocks()
+                }
+                R.id.main_drawer_history -> {
+                    cancelFetch()
+                    clearGalleries()
+                    currentPage = 0
+                    query = ""
+                    queryStack.clear()
+                    mode = Mode.HISTORY
+                    fetchGalleries(query, sortMode)
+                    loadBlocks()
+                }
+                R.id.main_drawer_downloads -> {
+                    cancelFetch()
+                    clearGalleries()
+                    currentPage = 0
+                    query = ""
+                    queryStack.clear()
+                    mode = Mode.DOWNLOAD
+                    fetchGalleries(query, sortMode)
+                    loadBlocks()
+                }
+                R.id.main_drawer_favorite -> {
+                    cancelFetch()
+                    clearGalleries()
+                    currentPage = 0
+                    query = ""
+                    queryStack.clear()
+                    mode = Mode.FAVORITE
+                    fetchGalleries(query, sortMode)
+                    loadBlocks()
+                }
+                R.id.main_drawer_help -> {
+                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.help))))
+                }
+                R.id.main_drawer_github -> {
+                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.github))))
+                }
+                R.id.main_drawer_homepage -> {
+                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.home_page))))
+                }
+                R.id.main_drawer_email -> {
+                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.email))))
+                }
+                R.id.main_drawer_kakaotalk -> {
+                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.discord))))
+                }
+            }
+        }
+
+        return true
+    }
+
     private fun cancelFetch() {
         galleryIDs?.cancel()
         loadingJob?.cancel()
@@ -919,8 +833,29 @@ 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.isNotBlank())
+            searchHistory.add(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.ok) {
+                    cancelFetch()
+                    clearGalleries()
+                    currentPage = 0
+                    mode = Mode.SEARCH
+                    queryStack.clear()
+                    fetchGalleries(query, sortMode)
+                    loadBlocks()
+                }
+            }.show()
+        }
 
         galleryIDs = null
 
@@ -947,34 +882,28 @@ class MainActivity : AppCompatActivity() {
                 Mode.HISTORY -> {
                     when {
                         query.isEmpty() -> {
-                            histories.toList().also {
+                            histories.reversed().also {
                                 totalItems = it.size
                             }
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            histories.filter { result.binarySearch(it) >= 0 }.also {
+                            histories.reversed().filter { result.binarySearch(it) >= 0 }.also {
                                 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
-                    }?.sortedByDescending {
-                        it.lastModified()
-                    }?.map {
-                        it.name.toInt()
-                    } ?: emptyList()
 
                     when {
-                        query.isEmpty() -> downloads.also {
+                        query.isEmpty() -> downloads.reversed().also {
                             totalItems = it.size
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            downloads.filter { result.binarySearch(it) >= 0 }.also {
+                            downloads.reversed().filter { result.binarySearch(it) >= 0 }.also {
                                 totalItems = it.size
                             }
                         }
@@ -982,12 +911,12 @@ class MainActivity : AppCompatActivity() {
                 }
                 Mode.FAVORITE -> {
                     when {
-                        query.isEmpty() -> favorites.toList().also {
+                        query.isEmpty() -> favorites.reversed().also {
                             totalItems = it.size
                         }
                         else -> {
                             val result = doSearch(query).sorted()
-                            favorites.filter { result.binarySearch(it) >= 0 }.also {
+                            favorites.reversed().filter { result.binarySearch(it) >= 0 }.also {
                                 totalItems = it.size
                             }
                         }
@@ -998,8 +927,7 @@ 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 = try {
@@ -1009,8 +937,8 @@ class MainActivity : AppCompatActivity() {
                 }
             } catch (e: Exception) {
 
-                if (Fabric.isInitialized() && e.message != "No result")
+                if (e.message != "No result")
-                    Crashlytics.logException(e)
+                    FirebaseCrashlytics.getInstance().recordException(e)
 
                 withContext(Dispatchers.Main) {
                     main_noresult.visibility = View.VISIBLE
@@ -1024,16 +952,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)
                             }
                         }
@@ -1041,4 +969,14 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
+
+    override fun onLowMemory() {
+        super.onLowMemory()
+        Glide.get(this).onLowMemory()
+    }
+
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        Glide.get(this).onTrimMemory(level)
+    }
 }

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

@@ -18,13 +18,24 @@
 
 package xyz.quaver.pupil.ui
 
+import android.Manifest
+import android.content.ComponentName
 import android.content.Intent
+import android.content.ServiceConnection
+import android.content.pm.PackageManager
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
+import android.os.Build
 import android.os.Bundle
+import android.os.IBinder
 import android.view.*
+import android.view.animation.Animation
+import android.view.animation.AnticipateInterpolator
+import android.view.animation.OvershootInterpolator
+import android.view.animation.TranslateAnimation
+import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -32,23 +43,35 @@ 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.bumptech.glide.Glide
 import com.google.android.material.snackbar.Snackbar
-import io.fabric.sdk.android.Fabric
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.mlkit.vision.face.Face
+import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
 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.android.synthetic.main.reader_eye_card.view.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+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.camera
+import xyz.quaver.pupil.util.closeCamera
+import xyz.quaver.pupil.util.downloader.Cache
+import xyz.quaver.pupil.util.downloader.DownloadManager
+import xyz.quaver.pupil.util.startCamera
 import java.util.*
 import kotlin.concurrent.schedule
 
-class ReaderActivity : AppCompatActivity() {
+class ReaderActivity : BaseActivity() {
 
     private var galleryID = 0
     private var currentPage = 0
@@ -59,47 +82,94 @@ class ReaderActivity : AppCompatActivity() {
         field = value
 
         (reader_recyclerview.adapter as ReaderAdapter).isFullScreen = value
+    }
 
-        reader_progressbar.visibility = when {
+    private lateinit var cache: Cache
-            value -> View.VISIBLE
+    var downloader: DownloadService? = null
-            else -> View.GONE
+    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 val snapHelper = PagerSnapHelper()
-
     private var menu: Menu? = null
 
-    private lateinit var favorites: Histories
+    private val requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
+        if (isGranted)
+            toggleCamera()
+        else
+            AlertDialog.Builder(this)
+                .setTitle(R.string.error)
+                .setMessage(R.string.camera_denied)
+                .setPositiveButton(android.R.string.ok) { _, _ ->}
+                .show()
+    }
+
+    enum class Eye {
+        LEFT,
+        RIGHT
+    }
+
+    private var cameraEnabled = false
+    private var eyeType: Eye? = null
+    private var eyeCount: Int = 0
+    private var eyeTime: Long = 0L
 
     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) {
@@ -112,14 +182,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 {
@@ -127,19 +195,6 @@ class ReaderActivity : AppCompatActivity() {
         }
     }
 
-    override fun onResume() {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
-
-        if (preferences.getBoolean("security_mode", false))
-            window.setFlags(
-                WindowManager.LayoutParams.FLAG_SECURE,
-                WindowManager.LayoutParams.FLAG_SECURE)
-        else
-            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-
-        super.onResume()
-    }
-
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.reader, menu)
 
@@ -154,14 +209,14 @@ class ReaderActivity : AppCompatActivity() {
         return true
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when(item?.itemId) {
+        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)
@@ -190,14 +245,29 @@ class ReaderActivity : AppCompatActivity() {
         return true
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        if (cameraEnabled)
+            startCamera(this, cameraCallback)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        closeCamera()
+    }
+
     override fun onDestroy() {
         super.onDestroy()
 
         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() {
@@ -233,31 +303,32 @@ 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(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 = Cache(this@ReaderActivity).getReaderOrNull(galleryID)
+                    val reader = cache.metadata.reader
 
                     if (reader != null) {
-
                         with (reader_recyclerview.adapter as ReaderAdapter) {
                             this.reader = reader
                             notifyDataSetChanged()
@@ -275,7 +346,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)
@@ -300,7 +371,6 @@ class ReaderActivity : AppCompatActivity() {
                 }
             }
 
-            addOnScrollListener((adapter as ReaderAdapter).preloader)
             addOnScrollListener(object: RecyclerView.OnScrollListener() {
                 override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                     super.onScrolled(recyclerView, dx, dy)
@@ -316,22 +386,55 @@ class ReaderActivity : AppCompatActivity() {
                         return
                     currentPage = layoutManager.findFirstVisibleItemPosition()+1
                     menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${recyclerView.adapter!!.itemCount}"
-                    this@ReaderActivity.reader_progressbar.progress = currentPage
+
                 }
             })
         }
 
         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)) {
-                } else {
+                        downloadManager.deleteDownloadFolder(galleryID)
-                    Cache(context).setDownloading(galleryID, true)
+                        animateDownloadFAB(false)
-                    animateDownloadFAB(true)
+                    } else {
+                        downloadManager.addDownloadFolder(galleryID)
+                        DownloadService.download(context, galleryID, true)
+                        animateDownloadFAB(true)
+                    }
+                }
+            }
+        }
+
+        with(reader_fab_retry) {
+            setImageResource(R.drawable.refresh)
+            setOnClickListener {
+                DownloadService.download(context, galleryID)
+            }
+        }
+
+        with(reader_fab_auto) {
+            setImageResource(R.drawable.eye_white)
+            setOnClickListener {
+                when {
+                    ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED -> {
+                        toggleCamera()
+                    }
+                    Build.VERSION.SDK_INT >= 23 && shouldShowRequestPermissionRationale(Manifest.permission.CAMERA) -> {
+                        AlertDialog.Builder(this@ReaderActivity)
+                            .setTitle(R.string.warning)
+                            .setMessage(R.string.camera_denied)
+                            .setPositiveButton(android.R.string.ok) { _, _ ->}
+                            .show()
+                    }
+                    else ->
+                        requestPermissionLauncher.launch(Manifest.permission.CAMERA)
                 }
             }
         }
@@ -353,14 +456,28 @@ class ReaderActivity : AppCompatActivity() {
                 flags = flags or WindowManager.LayoutParams.FLAG_FULLSCREEN
                 supportActionBar?.hide()
                 this@ReaderActivity.reader_fab.visibility = View.INVISIBLE
+                this@ReaderActivity.scroller.let {
+                    it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_height)
+                    it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_width)
+                    it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb_horizontal)
+                    it.fastScrollDirection = RecyclerViewFastScroller.FastScrollDirection.HORIZONTAL
+                }
             } else {
                 flags = flags and WindowManager.LayoutParams.FLAG_FULLSCREEN.inv()
                 supportActionBar?.show()
                 this@ReaderActivity.reader_fab.visibility = View.VISIBLE
+                this@ReaderActivity.scroller.let {
+                    it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_width)
+                    it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_height)
+                    it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb)
+                    it.fastScrollDirection = RecyclerViewFastScroller.FastScrollDirection.VERTICAL
+                }
             }
 
             window.attributes = this
         }
+
+        reader_recyclerview.adapter = reader_recyclerview.adapter   // Force to redraw
     }
 
     private fun scrollMode(isScroll: Boolean) {
@@ -369,7 +486,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)
@@ -382,11 +499,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 {
@@ -404,4 +520,137 @@ class ReaderActivity : AppCompatActivity() {
             }
         }
     }
+
+    val cameraCallback: (List<Face>) -> Unit = callback@{ faces ->
+        eye_card.dot.let {
+            it.visibility = View.VISIBLE
+            CoroutineScope(Dispatchers.Main).launch {
+                delay(50)
+                it.visibility = View.INVISIBLE
+            }
+        }
+
+        if (faces.size != 1)
+            ContextCompat.getDrawable(this, R.drawable.eye_off).let {
+                with(eye_card) {
+                    left_eye.setImageDrawable(it)
+                    right_eye.setImageDrawable(it)
+                }
+
+                return@callback
+            }
+
+        val (left, right) = Pair(
+            faces[0].rightEyeOpenProbability?.let { it > 0.4 } == true,
+            faces[0].leftEyeOpenProbability?.let { it > 0.4 } == true
+        )
+
+        with(eye_card) {
+            left_eye.setImageDrawable(
+                ContextCompat.getDrawable(
+                    context,
+                    if (left) R.drawable.eye else R.drawable.eye_closed
+                )
+            )
+            right_eye.setImageDrawable(
+                ContextCompat.getDrawable(
+                    context,
+                    if (right) R.drawable.eye else R.drawable.eye_closed
+                )
+            )
+        }
+
+        when {
+            // Both closed / opened
+            !left.xor(right) -> {
+                eyeType = null
+                eyeCount = 0
+                eyeTime = 0L
+            }
+            !left -> {
+                if (eyeType != Eye.LEFT) {
+                    eyeType = Eye.LEFT
+                    eyeCount = 0
+                    eyeTime = System.currentTimeMillis()
+                }
+                eyeCount++
+            }
+            !right -> {
+                if (eyeType != Eye.RIGHT) {
+                    eyeType = Eye.RIGHT
+                    eyeCount = 0
+                    eyeTime = System.currentTimeMillis()
+                }
+                eyeCount++
+            }
+        }
+
+        if (eyeCount > 3 && System.currentTimeMillis() - eyeTime > 500) {
+            (this@ReaderActivity.reader_recyclerview.layoutManager as LinearLayoutManager).let {
+                it.scrollToPositionWithOffset(when(eyeType!!) {
+                    Eye.RIGHT -> {
+                        if (it.reverseLayout) currentPage - 2 else currentPage
+                    }
+                    Eye.LEFT -> {
+                        if (it.reverseLayout) currentPage else currentPage - 2
+                    }
+                }, 0)
+            }
+
+            eyeType = null
+            eyeCount = 0
+            eyeTime = 0L
+        }
+    }
+
+    private fun toggleCamera() {
+        val eyes = this@ReaderActivity.eye_card
+        when (camera) {
+            null -> {
+                reader_fab_auto.labelText = getString(R.string.reader_fab_auto_cancel)
+                reader_fab_auto.setImageResource(R.drawable.eye_off_white)
+                eyes.apply {
+                    visibility = View.VISIBLE
+                    TranslateAnimation(0F, 0F, -100F, 0F).apply {
+                        duration = 500
+                        fillAfter = false
+                        interpolator = OvershootInterpolator()
+                    }.let { startAnimation(it) }
+                }
+                startCamera(this, cameraCallback)
+                cameraEnabled = true
+            }
+            else -> {
+                reader_fab_auto.labelText = getString(R.string.reader_fab_auto)
+                reader_fab_auto.setImageResource(R.drawable.eye_white)
+                eyes.apply {
+                    TranslateAnimation(0F, 0F, 0F, -100F).apply {
+                        duration = 500
+                        fillAfter = false
+                        interpolator = AnticipateInterpolator()
+                        setAnimationListener(object: Animation.AnimationListener {
+                            override fun onAnimationStart(p0: Animation?) {}
+                            override fun onAnimationRepeat(p0: Animation?) {}
+
+                            override fun onAnimationEnd(p0: Animation?) {
+                                eyes.visibility = View.GONE
+                            }
+                        })
+                    }.let { startAnimation(it) }
+                }
+                closeCamera()
+                cameraEnabled = false
+            }
+        }
+    }
+
+    override fun onLowMemory() {
+        super.onLowMemory()
+        Glide.get(this).onLowMemory()
+    }
+
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        Glide.get(this).onTrimMemory(level)
+    }
 }

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

@@ -22,34 +22,25 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
-import androidx.preference.PreferenceManager
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.settings_activity.*
+import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.list
+import kotlinx.serialization.json.Json
-import kotlinx.serialization.serializer
-import net.rdrei.android.dirchooser.DirectoryChooserActivity
-import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.fragment.LockFragment
+import xyz.quaver.pupil.favorites
+import xyz.quaver.pupil.ui.fragment.LockSettingsFragment
 import xyz.quaver.pupil.ui.fragment.SettingsFragment
-import xyz.quaver.pupil.util.*
+import xyz.quaver.pupil.util.Preferences
-import java.io.File
+import xyz.quaver.pupil.util.normalizeID
 import java.nio.charset.Charset
 
-class SettingsActivity : AppCompatActivity() {
+class SettingsActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_SECURE,
-            WindowManager.LayoutParams.FLAG_SECURE)
-
         setContentView(R.layout.settings_activity)
         supportFragmentManager
             .beginTransaction()
@@ -58,118 +49,24 @@ class SettingsActivity : AppCompatActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 
-    override fun onResume() {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
+        when (item.itemId) {
-
-        if (preferences.getBoolean("security_mode", false))
-            window.setFlags(
-                WindowManager.LayoutParams.FLAG_SECURE,
-                WindowManager.LayoutParams.FLAG_SECURE)
-        else
-            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        super.onResume()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.itemId) {
             android.R.id.home -> onBackPressed()
         }
 
         return true
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when(requestCode) {
-            REQUEST_LOCK -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    supportFragmentManager
-                        .beginTransaction()
-                        .replace(R.id.settings, LockFragment())
-                        .addToBackStack("Lock")
-                        .commitAllowingStateLoss()
-                }
-            }
-            REQUEST_RESTORE -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    val uri = data?.data ?: return
-
-                    try {
-                        val str = contentResolver.openInputStream(uri).use { inputStream ->
-                            inputStream!!
-
-                            inputStream.readBytes().toString(Charset.defaultCharset())
-                        }
-
-                        (application as Pupil).favorites.addAll(json.parse(Int.serializer().list, str).also {
-                            Snackbar.make(
-                                window.decorView,
-                                getString(R.string.settings_restore_successful, it.size),
-                                Snackbar.LENGTH_LONG
-                            ).show()
-                        })
-                    } catch (e: Exception) {
-                        Snackbar.make(
-                            window.decorView,
-                            R.string.settings_restore_failed,
-                            Snackbar.LENGTH_LONG
-                        ).show()
-                    }
-                }
-            }
-            REQUEST_DOWNLOAD_FOLDER -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    data?.data?.also { uri ->
-                        val takeFlags: Int =
-                            intent.flags and (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
-                            contentResolver.takePersistableUriPermission(uri, takeFlags)
-
-                        val file = uri.toFile(this)
-
-                        if (file?.canWrite() != true)
-                            Snackbar.make(
-                                settings,
-                                R.string.settings_dl_location_not_writable,
-                                Snackbar.LENGTH_LONG
-                            ).show()
-                        else
-                            PreferenceManager.getDefaultSharedPreferences(this).edit()
-                                .putString("dl_location", file.canonicalPath)
-                                .apply()
-                    }
-                }
-            }
-            REQUEST_DOWNLOAD_FOLDER_OLD -> {
-                if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
-                    val directory = data?.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR)!!
-
-                    if (!File(directory).canWrite())
-                        Snackbar.make(
-                            settings,
-                            R.string.settings_dl_location_not_writable,
-                            Snackbar.LENGTH_LONG
-                        ).show()
-                    else
-                        PreferenceManager.getDefaultSharedPreferences(this).edit()
-                            .putString("dl_location", File(directory).canonicalPath)
-                            .apply()
-                }
-            }
-            else -> super.onActivityResult(requestCode, resultCode, data)
-        }
-    }
-
     @SuppressLint("InlinedApi")
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         when (requestCode) {
-            REQUEST_WRITE_PERMISSION_AND_SAF -> {
+            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, REQUEST_DOWNLOAD_FOLDER)
+                    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,6 +45,7 @@ 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")
 
     var onPositiveButtonClickListener : ((Tags) -> (Unit))? = null
 
@@ -68,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)
         }
 
@@ -76,9 +82,8 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
 
     @SuppressLint("InflateParams")
     private fun build() : View {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(context)
         val tags = Tags.parse(
-            preferences.getString("default_query", "") ?: ""
+            Preferences["default_query"]
         )
 
         val view = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
@@ -120,6 +125,14 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
                 }
         }
 
+        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 {

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,138 +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.Manifest
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.Dialog
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
-import android.os.Bundle
-import android.view.View
-import android.widget.LinearLayout
-import android.widget.RadioButton
-import androidx.appcompat.app.AlertDialog
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
-import kotlinx.android.synthetic.main.item_dl_location.view.*
-import net.rdrei.android.dirchooser.DirectoryChooserActivity
-import net.rdrei.android.dirchooser.DirectoryChooserConfig
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.*
-import java.io.File
-
-@SuppressLint("InflateParams")
-class DownloadLocationDialog(val activity: Activity) : AlertDialog(activity) {
-
-    private val preference = PreferenceManager.getDefaultSharedPreferences(context)
-    private val buttons = mutableListOf<Pair<RadioButton, File?>>()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        setTitle(R.string.settings_dl_location)
-
-        setView(build())
-
-        setButton(Dialog.BUTTON_POSITIVE, context.getText(android.R.string.ok)) { _, _ -> }
-
-        super.onCreate(savedInstanceState)
-    }
-
-    private fun build() : View {
-        val view = layoutInflater.inflate(R.layout.dialog_dl_location, null) as LinearLayout
-
-        val externalFilesDirs = ContextCompat.getExternalFilesDirs(context, null)
-
-        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", dir.canonicalPath).apply()
-                }
-                buttons.add(button to 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) {
-
-                    if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
-                        ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_WRITE_PERMISSION_AND_SAF)
-                    else {
-                        val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                            putExtra("android.content.extra.SHOW_ADVANCED", true)
-                        }
-
-                        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)
-        })
-
-        externalFilesDirs.indexOfFirst {
-            it.canonicalPath == getDownloadDirectory(context).canonicalPath
-        }.let { index ->
-            if (index < 0)
-                buttons.first().first.isChecked = true
-            else
-                buttons[index].first.isChecked = true
-        }
-
-        return view
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/dialog/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)?.toUri()?.toString() ?: ""
+
+                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).toURI().toString()
+                }
+            }
+            else -> super.onActivityResult(requestCode, resultCode, data)
+        }
+    }
+
+}

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

@@ -18,50 +18,42 @@
 
 package xyz.quaver.pupil.ui.dialog
 
-import android.app.Dialog
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout.LayoutParams
+import androidx.appcompat.app.AlertDialog
 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) : AlertDialog(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)
@@ -131,8 +123,8 @@ 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

@@ -24,13 +24,13 @@ 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) {
 
@@ -82,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

@@ -27,23 +27,24 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
-import androidx.preference.PreferenceManager
+import androidx.appcompat.app.AlertDialog
 import kotlinx.android.synthetic.main.dialog_proxy.view.*
-import xyz.quaver.proxy
+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.json
+import xyz.quaver.pupil.util.proxyInfo
 import java.net.Proxy
 
-class ProxyDialog(context: Context) : Dialog(context) {
+class ProxyDialog(context: Context) : AlertDialog(context) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        val view = build()
+        setContentView(build())
-
-        setTitle(R.string.settings_proxy_title)
-        setContentView(view)
-
         window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
 
         super.onCreate(savedInstanceState)
@@ -51,7 +52,7 @@ class ProxyDialog(context: Context) : Dialog(context) {
 
     @SuppressLint("InflateParams")
     private fun build() : View {
-        val proxyInfo = getProxyInfo(context)
+        val proxyInfo = getProxyInfo()
 
         val view = LayoutInflater.from(context).inflate(R.layout.dialog_proxy, null)
 
@@ -116,12 +117,12 @@ class ProxyDialog(context: Context) : Dialog(context) {
             }
 
             ProxyInfo(type, addr, port, username, password).let {
+                Preferences["proxy"] = Json.encodeToString(it)
 
-                PreferenceManager.getDefaultSharedPreferences(context).edit().putString("proxy",
+                clientBuilder
-                    json.stringify(ProxyInfo.serializer(), it)
+                    .proxyInfo(it)
-                ).apply()
+                clientHolder = null
-
+                client
-                proxy = it.proxy()
             }
 
             dismiss()

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.ok) { _, _ ->
+                            lockManager.remove(Lock.Type.PATTERN)
+                            onResume()
+                        }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
+                    }.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.ok) { _, _ ->
+                            lockManager.remove(Lock.Type.PIN)
+                            onResume()
+                        }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
+                    }.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,106 @@
+/*
+ *     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) {
+                    if (response.code() != 200) {
+                        response.close()
+                        return
+                    }
+
+                    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(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.ok) { _, _ ->
+                            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.cancel) { _, _ -> }
+                    }.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.ok) { _, _ ->
+                            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.cancel) { _, _ -> }
+                    }.show()
+                }
+                "clear_history" -> {
+                    AlertDialog.Builder(context).apply {
+                        setTitle(R.string.warning)
+                        setMessage(R.string.settings_clear_history_alert_message)
+                        setPositiveButton(android.R.string.ok) { _, _ ->
+                            histories.clear()
+                            summary = context.getString(R.string.settings_clear_history_summary, histories.size)
+                        }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
+                    }.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,29 @@
 
 package xyz.quaver.pupil.ui.fragment
 
-import android.content.Intent
+import android.app.Activity
-import android.content.SharedPreferences
+import android.content.*
 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.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.PreferenceManager
+import androidx.preference.SwitchPreferenceCompat
+import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import com.google.android.material.snackbar.Snackbar
-import xyz.quaver.pupil.Pupil
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import xyz.quaver.io.FileX
+import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.favorites
 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.ui.dialog.ProxyDialog
 import xyz.quaver.pupil.util.*
-import java.io.File
+import xyz.quaver.pupil.util.downloader.DownloadManager
-
+import java.nio.charset.Charset
 
 class SettingsFragment :
     PreferenceFragmentCompat(),
@@ -47,16 +48,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 +66,6 @@ class SettingsFragment :
         }
     }
 
-    private fun getDirSize(dir: File) : 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,88 +74,36 @@ class SettingsFragment :
                 "app_version" -> {
                     checkUpdate(activity as SettingsActivity, true)
                 }
-                "delete_cache" -> {
+                "download_folder" -> {
-                    val dir = File(context.cacheDir, "imageCache")
+                    DownloadLocationDialogFragment().show(parentFragmentManager, "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).apply {
-                    activity?.startActivityForResult(intent, REQUEST_LOCK)
+                        putExtra("force", true)
+                    }
+                    startActivityForResult(intent, R.id.request_lock.normalizeID())
                 }
                 "mirrors" -> {
-                    MirrorDialog(context)
+                    MirrorDialog(requireContext())
                         .show()
                 }
                 "proxy" -> {
-                    ProxyDialog(context)
+                    ProxyDialog(requireContext())
                         .show()
                 }
-                "backup" -> {
+                "user_id" -> {
-                    File(ContextCompat.getDataDir(context), "favorites.json").copyTo(
+                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
-                        File(getDownloadDirectory(context), "favorites.json"),
+                        ClipData.newPlainText("user_id", Preferences.get<String>("user_id"))
-                        true
                     )
-
+                    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
             }
@@ -180,6 +117,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
@@ -201,10 +150,13 @@ class SettingsFragment :
 
             when (key) {
                 "proxy" -> {
-                    summary = getProxyInfo(context).type.name
+                    summary = context?.let { getProxyInfo().type.name }
                 }
-                "dl_location" -> {
+                "download_folder" -> {
-                    summary = getDownloadDirectory(context!!).canonicalPath
+                    summary = FileX(context, Preferences.get<String>("download_folder")).canonicalPath
+                }
+                "download_folder_name" -> {
+                    summary = Preferences["download_folder_name", "[-id-] -title-"]
                 }
             }
         }
@@ -213,9 +165,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) {
 
@@ -225,46 +184,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 = 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 = getDownloadDirectory(context).canonicalPath
-
-                            onPreferenceClickListener = this@SettingsFragment
                         }
                         "default_query" -> {
-                            summary = PreferenceManager.getDefaultSharedPreferences(context).getString("default_query", "") ?: ""
+                            summary = Preferences.get<String>("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)
@@ -284,23 +241,45 @@ class SettingsFragment :
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "proxy" -> {
-                            summary = getProxyInfo(context).type.name
+                            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
                         }
+                        "oss" -> {
+                            setOnPreferenceClickListener {
+                                context?.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
+                                true
+                            }
+                        }
                     }
 
                 }
             }
         }
     }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        when(requestCode) {
+            R.id.request_lock.normalizeID() -> {
+                if (resultCode == Activity.RESULT_OK) {
+                    parentFragmentManager
+                        .beginTransaction()
+                        .replace(R.id.settings, LockSettingsFragment())
+                        .addToBackStack("Lock")
+                        .commitAllowingStateLoss()
+                }
+            }
+            else -> super.onActivityResult(requestCode, resultCode, data)
+        }
+    }
 }

app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.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.ui.view
+
+import android.annotation.SuppressLint
+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
+
+@SuppressLint("ViewConstructor")
+class TagChip(context: Context, tag: Tag) : Chip(context) {
+
+    val tag: Tag =
+        tag.let {
+            when {
+                it.area != null -> it
+                else -> Tag("tag", tag.tag)
+            }
+        }
+
+    private val languages = context.resources.getStringArray(R.array.languages).map {
+        it.split("|").let { split ->
+            Pair(split[0], split[1])
+        }
+    }.toMap()
+
+    init {
+        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/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/SavedSet.kt

@@ -0,0 +1,88 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil.util
+
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.json.Json
+import java.io.File
+
+class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = mutableSetOf()) : MutableSet<T> by set {
+
+    @Suppress("UNCHECKED_CAST")
+    @OptIn(ExperimentalSerializationApi::class)
+    val serializer: KSerializer<List<T>>
+        get() = ListSerializer(serializer(any::class.java) as KSerializer<T>)
+
+    init {
+        if (!file.exists()) {
+            file.parentFile?.mkdirs()
+            save()
+        }
+        load()
+    }
+
+    fun load() {
+        synchronized(this) {
+            set.clear()
+            kotlin.runCatching {
+                Json.decodeFromString(serializer, file.readText())
+            }.onSuccess {
+                set.addAll(it)
+            }
+        }
+    }
+
+    @OptIn(ExperimentalSerializationApi::class)
+    fun save() {
+        synchronized(this) {
+            file.writeText(Json.encodeToString(serializer, set.toList()))
+        }
+    }
+
+    override fun add(element: T): Boolean {
+        load()
+
+        return set.add(element).also {
+            save()
+        }
+    }
+
+    override fun addAll(elements: Collection<T>): Boolean {
+        load()
+
+        return set.addAll(elements).also {
+            save()
+        }
+    }
+
+    override fun remove(element: T): Boolean {
+        load()
+
+        return set.remove(element).also {
+            save()
+        }
+    }
+
+    override fun clear() {
+        set.clear()
+        save()
+    }
+
+}

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

@@ -0,0 +1,119 @@
+/*
+ *     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/>.
+ */
+
+@file:Suppress("DEPRECATION", "Recycle")
+
+package xyz.quaver.pupil.util
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.graphics.ImageFormat
+import android.graphics.SurfaceTexture
+import android.hardware.Camera
+import android.view.Surface
+import android.view.WindowManager
+import com.google.android.gms.tasks.Task
+import com.google.mlkit.vision.common.InputImage
+import com.google.mlkit.vision.face.Face
+import com.google.mlkit.vision.face.FaceDetection
+import com.google.mlkit.vision.face.FaceDetectorOptions
+
+/** Check if this device has a camera */
+private fun Context.checkCameraHardware() =
+    this.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
+
+private fun openFrontCamera() : Pair<Camera?, Int> {
+    var camera: Camera? = null
+    var cameraID: Int = -1
+
+    val cameraInfo = Camera.CameraInfo()
+
+    for (i in 0 until Camera.getNumberOfCameras()) {
+        Camera.getCameraInfo(i, cameraInfo)
+        if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT)
+            runCatching { Camera.open(i) }.getOrNull()?.let { camera = it; cameraID = i }
+
+        if (camera != null) break
+    }
+
+    return Pair(camera, cameraID)
+}
+
+val orientations = mapOf(
+    Surface.ROTATION_0 to 0,
+    Surface.ROTATION_90 to 90,
+    Surface.ROTATION_180 to 180,
+    Surface.ROTATION_270 to 270,
+)
+
+private fun getRotation(context: Context, cameraID: Int): Int {
+    val cameraRotation = Camera.CameraInfo().also { Camera.getCameraInfo(cameraID, it) }.orientation
+    val rotation = orientations[(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay.rotation] ?: error("")
+
+    return (cameraRotation + rotation) % 360
+}
+
+var camera: Camera? = null
+var surfaceTexture: SurfaceTexture? = null
+private val detector = FaceDetection.getClient(
+    FaceDetectorOptions.Builder()
+        .setClassificationMode(FaceDetectorOptions.CLASSIFICATION_MODE_ALL)
+        .build()
+)
+private var process: Task<List<Face>>? = null
+
+fun startCamera(context: Context, callback: (List<Face>) -> Unit) {
+    if (camera != null) closeCamera()
+
+    val cameraID = openFrontCamera().let { (cam, cameraID) ->
+        cam ?: return
+        camera = cam
+        cameraID
+    }
+
+    with (camera!!) {
+        parameters = parameters.apply {
+            setPreviewSize(640, 480)
+            previewFormat = ImageFormat.NV21
+        }
+
+        setPreviewTexture(surfaceTexture ?: SurfaceTexture(0).also {
+            surfaceTexture = it
+        })
+        startPreview()
+        setPreviewCallback { bytes, _ ->
+            if (process?.isComplete == false)
+                return@setPreviewCallback
+
+            val rotation = getRotation(context, cameraID)
+
+            val image = InputImage.fromByteArray(bytes, 640, 480, rotation, InputImage.IMAGE_FORMAT_NV21)
+            process = detector.process(image)
+                .addOnSuccessListener(callback)
+        }
+    }
+}
+
+fun closeCamera() {
+    camera?.setPreviewCallback(null)
+    camera?.stopPreview()
+    surfaceTexture?.release()
+    surfaceTexture = null
+    camera?.release()
+    camera = null
+}

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

@@ -1,266 +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.download
-
-import android.content.Context
-import android.content.ContextWrapper
-import android.util.Base64
-import android.util.SparseArray
-import androidx.preference.PreferenceManager
-import com.crashlytics.android.Crashlytics
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
-import kotlinx.io.InputStream
-import xyz.quaver.Code
-import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.Reader
-import xyz.quaver.proxy
-import xyz.quaver.pupil.util.getCachedGallery
-import xyz.quaver.pupil.util.getDownloadDirectory
-import xyz.quaver.pupil.util.json
-import java.io.File
-import java.io.FileOutputStream
-import java.net.URL
-import java.util.concurrent.locks.Lock
-import java.util.concurrent.locks.ReentrantLock
-
-class Cache(context: Context) : ContextWrapper(context) {
-
-    private val locks = SparseArray<Lock>()
-    private fun lock(galleryID: Int) {
-        synchronized(locks) {
-            if (locks.indexOfKey(galleryID) < 0)
-                locks.put(galleryID, ReentrantLock())
-        }
-
-        locks[galleryID].lock()
-    }
-
-    private fun unlock(galleryID: Int) {
-        locks[galleryID]?.unlock()
-    }
-
-    private val preference = PreferenceManager.getDefaultSharedPreferences(this)
-
-    // Search in this order
-    // Download -> Cache
-    fun getCachedGallery(galleryID: Int) = getCachedGallery(this, galleryID).also {
-        if (!it.exists())
-            it.mkdirs()
-    }
-
-    fun getCachedMetadata(galleryID: Int) : Metadata? {
-        val file = File(getCachedGallery(galleryID), ".metadata")
-
-        if (!file.exists())
-            return null
-
-        return try {
-            json.parse(Metadata.serializer(), file.readText())
-        } catch (e: Exception) {
-            //File corrupted
-            file.delete()
-            null
-        }
-    }
-
-    fun setCachedMetadata(galleryID: Int, metadata: Metadata) {
-        val file = File(getCachedGallery(galleryID), ".metadata").also {
-            if (!it.exists())
-                it.createNewFile()
-        }
-
-        file.writeText(json.stringify(Metadata.serializer(), metadata))
-    }
-
-    suspend fun getThumbnail(galleryID: Int): String? {
-        val metadata = Cache(this).getCachedMetadata(galleryID)
-
-        val thumbnail = if (metadata?.thumbnail == null)
-            withContext(Dispatchers.IO) {
-                val thumbnails = getGalleryBlock(galleryID)?.thumbnails
-                try {
-                    Base64.encodeToString(URL(thumbnails?.firstOrNull()).openConnection(proxy).getInputStream().use {
-                        it.readBytes()
-                    }, Base64.DEFAULT)
-                } catch (e: Exception) {
-                    null
-                }
-            }
-        else
-            metadata.thumbnail
-
-        setCachedMetadata(
-            galleryID,
-            Metadata(Cache(this).getCachedMetadata(galleryID), thumbnail = thumbnail)
-        )
-
-        return thumbnail
-    }
-
-    suspend fun getGalleryBlock(galleryID: Int): GalleryBlock? {
-        val metadata = Cache(this).getCachedMetadata(galleryID)
-
-        val sources = listOf(
-            { xyz.quaver.hitomi.getGalleryBlock(galleryID) },
-            { xyz.quaver.hiyobi.getGalleryBlock(galleryID) }
-        )
-
-        val galleryBlock = if (metadata?.galleryBlock == null) {
-            CoroutineScope(Dispatchers.IO).async {
-                var galleryBlock: GalleryBlock? = null
-
-                for (source in sources) {
-                    galleryBlock = try {
-                        source.invoke()
-                    } catch (e: Exception) {
-                        null
-                    }
-
-                    if (galleryBlock != null)
-                        break
-                }
-
-                galleryBlock
-            }.await() ?: return null
-        }
-        else
-            metadata.galleryBlock
-
-        setCachedMetadata(
-            galleryID,
-            Metadata(Cache(this).getCachedMetadata(galleryID), galleryBlock = galleryBlock)
-        )
-
-        return galleryBlock
-    }
-
-    fun getReaderOrNull(galleryID: Int): Reader? {
-        return getCachedMetadata(galleryID)?.reader
-    }
-
-    suspend fun getReader(galleryID: Int): Reader? {
-        val metadata = getCachedMetadata(galleryID)
-        val mirrors = preference.getString("mirrors", null)?.split('>') ?: listOf()
-
-        val sources = mapOf(
-            Code.HITOMI to { xyz.quaver.hitomi.getReader(galleryID) },
-            Code.HIYOBI to { xyz.quaver.hiyobi.getReader(galleryID) }
-        ).let {
-            if (mirrors.isNotEmpty())
-                it.toSortedMap(
-                    Comparator { o1, o2 ->
-                        mirrors.indexOf(o1.name) - mirrors.indexOf(o2.name)
-                    }
-                )
-            else
-                it
-        }
-
-        val reader = if (metadata?.reader == null) {
-            CoroutineScope(Dispatchers.IO).async {
-                var retval: Reader? = null
-
-                for (source in sources) {
-                    retval = try {
-                        source.value.invoke()
-                    } catch (e: Exception) {
-                        Crashlytics.logException(e)
-                        null
-                    }
-
-                    if (retval != null)
-                        break
-                }
-
-                retval
-            }.await() ?: return null
-        } else
-            metadata.reader
-
-        setCachedMetadata(
-            galleryID,
-            Metadata(Cache(this).getCachedMetadata(galleryID), readers = reader)
-        )
-
-        return reader
-    }
-
-    val imageNameRegex = Regex("""^\d+\..+$""")
-    fun getImages(galleryID: Int): List<File?>? {
-        val gallery = getCachedGallery(galleryID)
-
-        return gallery.list { _, name ->
-            imageNameRegex.matches(name)
-        }?.map {
-            File(gallery, it)
-        }
-    }
-
-    val imageExtensions = listOf(
-        "png",
-        "jpg",
-        "webp",
-        "gif"
-    )
-    fun getImage(galleryID: Int, index: Int): File? {
-        val gallery = getCachedGallery(galleryID)
-
-        for (ext in imageExtensions) {
-            File(gallery, "%05d.$ext".format(index)).let {
-                if (it.exists())
-                    return it
-            }
-        }
-
-        return null
-    }
-
-
-    fun putImage(galleryID: Int, index: Int, ext: String, data: InputStream) {
-        val cache = File(getCachedGallery(galleryID), "%05d.$ext".format(index)).also {
-            if (!it.exists())
-                it.createNewFile()
-        }
-
-        data.use {
-            it.copyTo(FileOutputStream(cache))
-        }
-    }
-
-    fun moveToDownload(galleryID: Int) {
-        val cache = getCachedGallery(galleryID).also {
-            if (!it.exists())
-                return
-        }
-        val download = File(getDownloadDirectory(this), galleryID.toString())
-
-        cache.copyRecursively(download, true) { _, _ -> OnErrorAction.SKIP }
-        cache.deleteRecursively()
-    }
-
-    fun isDownloading(galleryID: Int) = getCachedMetadata(galleryID)?.isDownloading == true
-
-    fun setDownloading(galleryID: Int, isDownloading: Boolean) {
-        setCachedMetadata(galleryID, Metadata(getCachedMetadata(galleryID), isDownloading = isDownloading))
-    }
-
-}

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

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

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

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

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

@@ -0,0 +1,248 @@
+/*
+ *     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.*
+import xyz.quaver.pupil.client
+import xyz.quaver.pupil.util.Preferences
+import java.io.IOException
+
+@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().also { if (it.code() != 200) throw IOException() }.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
+
+        if (downloadFolder.getChild(".metadata").exists())
+            return@launch
+
+        metadata.imageList?.forEach { imageName ->
+            imageName ?: return@forEach
+            val target = downloadFolder.getChild(imageName)
+            val source = cacheFolder.getChild(imageName)
+
+            if (!source.exists() || target.exists())
+                return@forEach
+
+            kotlin.runCatching {
+                target.createNewFile()
+                target.outputStream()?.use { target -> source.inputStream()?.use { source ->
+                    source.copyTo(target)
+                } }
+            }
+        }
+
+        val cacheThumbnail = cacheFolder.getChild(".thumbnail")
+        val downloadThumbnail = downloadFolder.getChild(".thumbnail")
+
+        if (cacheThumbnail.exists() && !downloadThumbnail.exists()) {
+            kotlin.runCatching {
+                downloadThumbnail.createNewFile()
+                downloadThumbnail.outputStream()?.use { target -> cacheThumbnail.inputStream()?.use { source ->
+                    source.copyTo(target)
+                } }
+                cacheThumbnail.delete()
+            }
+        }
+
+        val cacheMetadata = cacheFolder.getChild(".metadata")
+        val downloadMetadata = downloadFolder.getChild(".metadata")
+
+        if (cacheMetadata.exists() && !downloadMetadata.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,130 @@
+/*
+ *     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()
+                        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) {
+        val name = runBlocking {
+            Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
+        }?.formatDownloadFolder() ?: return
+
+        val folder = downloadFolder.getChild(name)
+
+        if (folder.exists())
+            return
+
+        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) {
+        downloadFolderMap[galleryID]?.let {
+            kotlin.runCatching {
+                downloadFolder.getChild(it).deleteRecursively()
+                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

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

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

@@ -1,81 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import kotlinx.serialization.list
-import kotlinx.serialization.serializer
-import java.io.File
-
-class Histories(private val file: File) : ArrayList<Int>() {
-
-    val serializer = Int.serializer().list
-
-    init {
-        if (!file.exists())
-            file.parentFile?.mkdirs()
-
-        try {
-            load()
-        } catch (e: Exception) {
-            save()
-        }
-    }
-
-    fun load() : Histories {
-        return apply {
-            super.clear()
-            addAll(
-                json.parse(
-                    serializer,
-                    file.bufferedReader().use { it.readText() }
-                )
-            )
-        }
-    }
-
-    fun save() {
-        file.writeText(json.stringify(serializer, this))
-    }
-
-    override fun add(element: Int): Boolean {
-        load()
-
-        if (contains(element))
-            super.remove(element)
-
-        super.add(0, element)
-
-        save()
-
-        return true
-    }
-
-    override fun remove(element: Int): Boolean {
-        load()
-        val retval = super.remove(element)
-        save()
-
-        return retval
-    }
-
-    override fun clear() {
-        super.clear()
-        save()
-    }
-}

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

@@ -22,9 +22,9 @@ import android.content.Context
 import android.content.ContextWrapper
 import androidx.core.content.ContextCompat
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.list
 import java.io.File
 import java.security.MessageDigest
 
@@ -43,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) {
@@ -82,7 +82,7 @@ class LockManager(base: Context): ContextWrapper(base) {
             lock.writeText("[]")
         }
 
-        locks = ArrayList(json.parse(Lock.serializer().list, lock.readText()))
+        locks = Json.decodeFromString(lock.readText())
     }
 
     private fun save() {
@@ -91,7 +91,7 @@ class LockManager(base: Context): ContextWrapper(base) {
         if (!lock.exists())
             lock.createNewFile()
 
-        lock.writeText(json.stringify(Lock.serializer().list, 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,22 @@
 package xyz.quaver.pupil.util
 
 import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.content.ContextCompat
+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.createImgList
 import java.util.*
 import kotlin.collections.ArrayList
 
-@UseExperimental(ExperimentalStdlibApi::class)
+@OptIn(ExperimentalStdlibApi::class)
 fun String.wordCapitalize() : String {
     val result = ArrayList<String>()
 
@@ -33,15 +45,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 +62,70 @@ 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)
+        }
+    }.replace(Regex("""[*\\|"?><:/]"""), "")
+
+fun GalleryBlock.formatDownloadFolderTest(format: String): String =
+    format.let {
+        formatMap.entries.fold(it) { str, (k, v) ->
+            str.replace(k, v.invoke(this), true)
+        }
+    }.replace(Regex("""[*\\|"?><:/]"""), "")
+
+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)
+                }
+            }
+        }
+    }
+
+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

@@ -19,8 +19,10 @@
 package xyz.quaver.pupil.util
 
 import android.content.Context
-import androidx.preference.PreferenceManager
 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
@@ -35,29 +37,22 @@ data class ProxyInfo(
     val password: String? = null
 ) {
     fun proxy() : Proxy {
-        return if (host == null || port == null)
+        return if (host.isNullOrBlank() || port == null)
             return Proxy.NO_PROXY
         else
             Proxy(type, InetSocketAddress.createUnresolved(host, port))
     }
 
-    fun authenticator() = Authenticator { _, response ->
+    fun authenticator(): Authenticator? = if (username.isNullOrBlank() || password.isNullOrBlank()) null else
-        val credential = Credentials.basic(username, password)
+            Authenticator { _, response ->
+                val credential = Credentials.basic(username, password)
 
-        response.request().newBuilder()
+                response.request().newBuilder()
-            .header("Proxy-Authorization", credential)
+                    .header("Proxy-Authorization", credential)
-            .build()
+                    .build()
-    }
+            }
 
 }
 
-fun getProxy(context: Context) =
+fun getProxyInfo(): ProxyInfo =
-    getProxyInfo(context).proxy()
+    Json.decodeFromString(Preferences["proxy", Json.encodeToString(ProxyInfo(Proxy.Type.DIRECT))])
-
-fun getProxyInfo(context: Context) =
-    PreferenceManager.getDefaultSharedPreferences(context).getString("proxy", null).let {
-        if (it == null)
-            ProxyInfo(Proxy.Type.DIRECT)
-        else
-            json.parse(ProxyInfo.serializer(), it)
-    }

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

@@ -18,54 +18,73 @@
 
 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.core.content.FileProvider
-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.json.JsonArray
+import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.boolean
+import kotlinx.serialization.json.*
-import kotlinx.serialization.json.content
+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.favorites
+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.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
@@ -74,14 +93,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)
@@ -90,7 +108,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" -> "한국어"
@@ -128,12 +146,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
 
@@ -141,61 +159,30 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
             setTitle(R.string.update_title)
             val msg = extractReleaseNote(update, Locale.getDefault())
             setMessage(Markwon.create(context).toMarkdown(msg))
-            setPositiveButton(android.R.string.yes) { _, _ ->
+            setPositiveButton(android.R.string.ok) { _, _ ->
 
-                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"]
-                    setOngoing(true)
+
+                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 = File(getDownloadDirectory(context), "Pupil.apk")
+                    .setTitle(context.getText(R.string.update_notification_description))
+                    .setDestinationUri(Uri.fromFile(target))
 
-                    try {
+                downloadManager.enqueue(request).also {
-                        URL(url).download(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)
-                            setOngoing(false)
-                        }
-
-                        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(FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", target), 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))
-                        setOngoing(false)
-                    }
-
-                    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) { _, _ ->
+            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore_update) { _, _ ->
                 if (!force)
                     preferences.edit()
                         .putLong("ignore_update_until", System.currentTimeMillis() + 604800000)
@@ -207,4 +194,143 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
             dialog.show()
         }
     }
+}
+
+fun restore(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.also { if (it.code() != 200) throw IOException() }.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.isDirectory && !downloadFolderMap.values.contains(folder.name)
+        }?.map {
+            if (it !is FileX)
+                FileX(this@migrate, it)
+            else
+                it
+        }
+
+        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 {
+                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())
+
+        kotlin.runCatching {
+            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

@@ -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,5 @@
   ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:cycles="3" />
-    android:layout_height="wrap_content"
-    android:columnCount="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>