build apk

improve japanese
build apk
2025-02-24 23:55:55 -08:00 · 2025-02-24 23:47:44 -08:00 · 2025-02-24 23:38:14 -08:00 · 2025-02-24 23:38:14 -08:00 · 2025-02-24 23:38:14 -08:00 · 2025-02-24 23:38:14 -08:00
103 changed files with 4180 additions and 1844 deletions
--- a/.github/workflows/watchdiff.yml
+++ b/.github/workflows/watchdiff.yml
@@ -1,23 +0,0 @@
 # This is a basic workflow that is manually triggered
 name: Watch hitomi.la file changes
 on:
  schedule:
    - cron: "*/10 * * * *"
 jobs:
  watchdiff:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
        with:
          ref: watchdiff
      - name: Download files
        run: ./fetch.sh
      - name: Commit and Push
        id: push
        run: |
            git config --global user.name 'Watchdiff bot'
            git config --global user.email 'tom5079@naver.com'
            { git add . && git commit -m "File update" && git push; } | tail -1 | grep -q "nothing to commit"
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,33 @@
 # Gradle files
 .gradle/
 build/
 # Local configuration file (sdk path, etc)
 local.properties
 # Log/OS Files
 *.log
 # Android Studio generated files and folders
 captures/
 .externalNativeBuild/
 .cxx/
 *.apk
 output.json
 # IntelliJ
 *.iml
-.gradle
+.idea/
-/local.properties
+misc.xml
-/.idea/caches
+deploymentTargetDropDown.xml
-/.idea/libraries
+render.experimental.xml
 /.idea/modules.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 .DS_Store
 /build
 /captures
 .externalNativeBuild
-#Github pages
+# Keystore files
-/gh-pages
+*.jks
 *.keystore
-#Private files
+# Google Services (e.g. APIs or Firebase)
-**/google-services.json
+google-services.json
-**/credentials.json
+
 # Android Profiling
 *.hprof
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,139 +0,0 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <option name="RIGHT_MARGIN" value="120" />
    <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">
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
      </indentOptions>
      <arrangement>
        <rules>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>xmlns:android</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>xmlns:.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:id</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:name</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>name</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>style</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
              <order>ANDROID_ATTRIBUTE_ORDER</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>.*</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
        </rules>
      </arrangement>
    </codeStyleSettings>
    <codeStyleSettings language="kotlin">
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </codeStyleSettings>
  </code_scheme>
 </component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +0,0 @@
 <component name="ProjectCodeStyleConfiguration">
  <state>
    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
  </state>
 </component>
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="CompilerConfiguration">
    <bytecodeTargetLevel target="11" />
  </component>
 </project>
--- a/.idea/copyright/GPL.xml
+++ b/.idea/copyright/GPL.xml
@@ -1,6 +0,0 @@
 <component name="CopyrightManager">
  <copyright>
    <option name="notice" value="    Pupil, Hitomi.la viewer for Android&#10;    Copyright (C) &amp;#36;today.year  tom5079&#10;&#10;    This program is free software: you can redistribute it and/or modify&#10;    it under the terms of the GNU General Public License as published by&#10;    the Free Software Foundation, either version 3 of the License, or&#10;    (at your option) any later version.&#10;&#10;    This program is distributed in the hope that it will be useful,&#10;    but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;    GNU General Public License for more details.&#10;&#10;    You should have received a copy of the GNU General Public License&#10;    along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;." />
    <option name="myName" value="GPL" />
  </copyright>
 </component>
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,7 +0,0 @@
 <component name="CopyrightManager">
  <settings>
    <module2copyright>
      <element module="Project Files" copyright="GPL" />
    </module2copyright>
  </settings>
 </component>
--- a/.idea/dictionaries/tom50.xml
+++ b/.idea/dictionaries/tom50.xml
@@ -1,7 +0,0 @@
 <component name="ProjectDictionaryState">
  <dictionary name="tom50">
    <words>
      <w>hitomi</w>
    </words>
  </dictionary>
 </component>
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
 </project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,22 +0,0 @@
 <?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="GRADLE" />
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
        <option name="gradleHome" value="/usr/share/java/gradle" />
        <option name="gradleJvm" value="11" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
          </set>
        </option>
        <option name="resolveModulePerSourceSet" value="false" />
      </GradleProjectSettings>
    </option>
  </component>
 </project>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +0,0 @@
 <component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
    <inspection_tool class="AndroidLintNewerVersionAvailable" enabled="true" level="WARNING" enabled_by_default="true" />
  </profile>
 </component>
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -1,90 +0,0 @@
 <?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>
    <remote-repository>
      <option name="id" value="maven3" />
      <option name="name" value="maven3" />
      <option name="url" value="https://dl.bintray.com/tom5079/maven" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven3" />
      <option name="name" value="maven3" />
      <option name="url" value="http://dl.bintray.com/piasy/maven" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven2" />
      <option name="name" value="maven2" />
      <option name="url" value="https://guardian.github.io/maven/repo-releases/" />
    </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="maven2" />
      <option name="name" value="maven2" />
      <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots" />
    </remote-repository>
  </component>
 </project>
--- a/.idea/kotlinCodeInsightSettings.xml
+++ b/.idea/kotlinCodeInsightSettings.xml
@@ -1,7 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="KotlinCodeInsightWorkspaceSettings">
    <option name="addUnambiguousImportsOnTheFly" value="true" />
    <option name="optimizeImportsOnTheFly" value="true" />
  </component>
 </project>
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="Kotlin2JvmCompilerArguments">
    <option name="jvmTarget" value="1.8" />
  </component>
 </project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,16 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="DesignSurface">
    <option name="filePathToZoomLevelMap">
      <map>
        <entry key="app/src/main/res/layout/reader_activity.xml" value="0.14351851851851852" />
      </map>
    </option>
  </component>
  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
    <option name="id" value="Android" />
  </component>
 </project>
--- a/.idea/scopes/Pupil.xml
+++ b/.idea/scopes/Pupil.xml
@@ -1,3 +0,0 @@
 <component name="DependencyValidationManager">
  <scope name="Pupil" pattern="file[app]:*/" />
 </component>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
  </component>
 </project>
--- a/README.md
+++ b/README.md
@@ -2,10 +2,11 @@
 *Pupil, Hitomi.la viewer for Android*
 ![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
-[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.2.16/Pupil-v5.2.16.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.16/Pupil-v5.2.16.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.3.16/Pupil-v5.3.16.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.3.16/Pupil-v5.3.16.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)
 # Features
 ![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.jpg?raw=true)
 # Installation
@@ -16,11 +17,13 @@ or Build app yourself
 # Manual
-[Manual](https://tom5079.github.io/Pupil/2019/06/06/manual-kr.html) is only available in Korean. Consider using translator.
+[Manual](https://tom5079.github.io/Pupil/2019/06/06/manual-kr.html) is only available in Korean.
 Consider using translator.
 # Contribution
 Any kind of contribution is appreciated. Feel free to leave PR!
 ## Tag Translation
 Head over to [tags branch](https://github.com/tom5079/Pupil/tree/tags)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,142 +0,0 @@
 apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 apply plugin: "kotlin-kapt"
 apply plugin: "kotlin-parcelize"
 apply plugin: "kotlinx-serialization"
 apply plugin: "com.google.android.gms.oss-licenses-plugin"
 if (file("google-services.json").exists()) {
    logger.lifecycle("Firebase Enabled")
    apply plugin: "com.google.gms.google-services"
    apply plugin: "com.google.firebase.crashlytics"
    apply plugin: "com.google.firebase.firebase-perf"
 } else {
    logger.lifecycle("Firebase Disabled")
 }
 ext {
    okhttp_version = "3.12.12"
 }
 configurations {
    all {
        resolutionStrategy {
            eachDependency { DependencyResolveDetails details ->
                if (details.requested.group == "com.squareup.okhttp3" && details.requested.name == "okhttp") {
                    // OkHttp drops support before 5.0 since 3.13.0
                    details.useVersion okhttp_version
                }
            }
        }
    }
 }
 android {
    compileSdkVersion 31
    defaultConfig {
        applicationId "xyz.quaver.pupil"
        minSdkVersion 16
        targetSdkVersion 31
        versionCode 69
        versionName "5.2.17"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
    }
    buildTypes {
        debug {
            defaultConfig.minSdkVersion 21
            minifyEnabled false
            shrinkResources false
            debuggable true
            applicationIdSuffix ".debug"
            versionNameSuffix "-DEBUG"
            ext.enableCrashlytics = false
            ext.alwaysUpdateBuildId = false
        }
        release {
            minifyEnabled true
            shrinkResources true
            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
        }
    }
    buildFeatures {
        viewBinding true
    }
    kotlinOptions {
        jvmTarget = JavaVersion.VERSION_1_8.toString()
        freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
 }
 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0"
    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
    implementation "androidx.appcompat:appcompat:1.4.0"
    implementation "androidx.activity:activity-ktx:1.4.0"
    implementation "androidx.fragment:fragment-ktx:1.4.0"
    implementation "androidx.preference:preference-ktx:1.1.1"
    implementation "androidx.recyclerview:recyclerview:1.2.1"
    implementation "androidx.constraintlayout:constraintlayout:2.1.2"
    implementation "androidx.gridlayout:gridlayout:1.0.0"
    implementation "androidx.biometric:biometric:1.1.0"
    implementation "androidx.work:work-runtime-ktx:2.7.1"
    implementation "com.daimajia.swipelayout:library:1.2.0@aar"
    implementation "com.google.android.material:material:1.4.0"
    implementation platform('com.google.firebase:firebase-bom:29.0.3')
    implementation "com.google.firebase:firebase-analytics-ktx"
    implementation "com.google.firebase:firebase-crashlytics-ktx"
    implementation "com.google.firebase:firebase-perf-ktx"
    implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
    implementation "com.google.android.gms:play-services-mlkit-face-detection:16.2.1"
    implementation "com.github.clans:fab:1.6.4"
    //implementation "com.quiph.ui:recyclerviewfastscroller:0.2.1"
    implementation 'com.github.piasy:BigImageViewer:1.8.1'
    implementation 'com.github.piasy:FrescoImageLoader:1.8.1'
    implementation 'com.github.piasy:FrescoImageViewFactory:1.8.1'
    implementation 'com.facebook.fresco:imagepipeline-okhttp3:2.6.0'
    //noinspection GradleDependency
    implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
    implementation "com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2"
    implementation "net.rdrei.android.dirchooser:library:3.2@aar"
    implementation "com.gu:option:1.3"
    implementation "com.andrognito.patternlockview:patternlockview:1.0.0"
    //implementation "com.andrognito.pinlockview:pinlockview:2.1.0"
    implementation "ru.noties.markwon:core:3.1.0"
    implementation "org.jsoup:jsoup:1.14.3"
    implementation "com.google.guava:guava:31.0.1-android"
    implementation "xyz.quaver:documentfilex:0.7.2"
    implementation "xyz.quaver:floatingsearchview:1.1.7"
    testImplementation "junit:junit:4.13.2"
    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
    androidTestImplementation "androidx.test.ext:junit:1.1.3"
    androidTestImplementation "androidx.test:rules:1.4.0"
    androidTestImplementation "androidx.test:runner:1.4.0"
    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
 }
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -0,0 +1,129 @@
 plugins {
    alias(libs.plugins.android.application)
    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.kotlinx.serialization)
    alias(libs.plugins.kotlin.compose)
    alias(libs.plugins.gms.oss.licenses)
    alias(libs.plugins.gms.google.services)
    alias(libs.plugins.firebase.crashlytics)
    alias(libs.plugins.firebase.perf)
    id("kotlin-parcelize")
 }
 android {
    namespace = "xyz.quaver.pupil"
    compileSdk = 35
    defaultConfig {
        applicationId = "xyz.quaver.pupil"
        minSdk = 21
        targetSdk = 35
        versionCode = 70
        versionName = "5.3.16"
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
    }
    buildFeatures {
        buildConfig = true
        compose = true
    }
    buildTypes {
        debug {
            isMinifyEnabled = false
            isShrinkResources = false
            isDebuggable = true
            applicationIdSuffix = ".debug"
            versionNameSuffix = "-DEBUG"
            extra.apply {
                set("enableCrashlytics", false)
                set("alwaysUpdateBuildId", false)
            }
        }
        release {
            isMinifyEnabled = true
            isShrinkResources = true
            proguardFiles(
                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro"
            )
        }
    }
    buildFeatures {
        viewBinding = true
    }
    kotlinOptions {
        jvmTarget = JavaVersion.VERSION_11.toString()
    }
    compileOptions {
        sourceCompatibility = JavaVersion.VERSION_11
        targetCompatibility = JavaVersion.VERSION_11
    }
 }
 dependencies {
    implementation(libs.kotlin.stdlib.jdk8)
    implementation(libs.kotlinx.coroutines.android)
    implementation(libs.kotlinx.serialization.json)
    implementation(libs.kotlinx.datetime)
    implementation(libs.androidx.compose.runtime)
    implementation(libs.core.ktx)
    implementation(libs.appcompat)
    implementation(libs.activity.ktx)
    implementation(libs.fragment.ktx)
    implementation(libs.preference.ktx)
    implementation(libs.recyclerview)
    implementation(libs.constraintlayout)
    implementation(libs.gridlayout)
    implementation(libs.biometric)
    implementation(libs.work.runtime.ktx)
    implementation(libs.library)
    implementation(libs.material)
    implementation(platform(libs.firebase.bom))
    implementation(libs.firebase.analytics.ktx)
    implementation(libs.firebase.crashlytics.ktx)
    implementation(libs.firebase.perf.ktx)
    implementation(libs.play.services.oss.licenses)
    implementation(libs.play.services.mlkit.face.detection)
    implementation(libs.fab)
    implementation(libs.bigimageviewer)
    implementation(libs.frescoimageloader)
    implementation(libs.frescoimageviewfactory)
    implementation(libs.imagepipeline.okhttp3)
    //noinspection GradleDependency
    implementation(libs.okhttp)
    implementation(libs.ktor.network)
    implementation(libs.dotsindicator)
    implementation(libs.pinlockview)
    implementation(libs.patternlockview)
    implementation(libs.core)
    implementation(libs.ripplebackground.library)
    implementation(libs.recyclerview.fastscroller)
    implementation(libs.jsoup)
    implementation(libs.documentfilex)
    implementation(libs.floatingsearchview)
    testImplementation(libs.junit)
    testImplementation(libs.kotlinx.coroutines.test)
    androidTestImplementation(libs.ext.junit)
    androidTestImplementation(libs.rules)
    androidTestImplementation(libs.runner)
    androidTestImplementation(libs.espresso.core)
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -34,3 +34,4 @@
 -keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
 -keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
 -keep class xyz.quaver.pupil.** { *; }
 -keep class app.cash.zipline.** { *; }
--- a/app/release/baselineProfiles/0/app-release.dm
+++ b/app/release/baselineProfiles/0/app-release.dm
--- a/app/release/baselineProfiles/1/app-release.dm
+++ b/app/release/baselineProfiles/1/app-release.dm
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,10 +11,27 @@
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 69,
+      "versionCode": 70,
-      "versionName": "5.2.17",
+      "versionName": "5.3.16",
      "outputFile": "app-release.apk"
    }
  ],
-  "elementType": "File"
+  "elementType": "File",
  "baselineProfiles": [
    {
      "minApi": 28,
      "maxApi": 30,
      "baselineProfiles": [
        "baselineProfiles/1/app-release.dm"
      ]
    },
    {
      "minApi": 31,
      "maxApi": 2147483647,
      "baselineProfiles": [
        "baselineProfiles/0/app-release.dm"
      ]
    }
  ],
  "minSdkVersionForDexing": 21
 }
--- a/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
@@ -20,18 +20,18 @@
 package xyz.quaver.pupil
 import android.os.Build
 import android.util.Log
 import android.webkit.*
 import android.widget.Toast
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.runBlocking
-import com.google.firebase.crashlytics.FirebaseCrashlytics
+import okhttp3.OkHttpClient
-import kotlinx.coroutines.*
+import okhttp3.Request
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import xyz.quaver.pupil.hitomi.*
 import java.util.*
 import java.util.concurrent.TimeUnit
 /**
 * Instrumented test, which will execute on an Android device.
@@ -40,81 +40,144 @@ import xyz.quaver.pupil.hitomi.*
 */
@RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
 //    @Before
 //    fun init() {
 //        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
 //    }
    @Before
    fun init() {
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        clientBuilder = OkHttpClient.Builder()
            .readTimeout(0, TimeUnit.SECONDS)
            .writeTimeout(0, TimeUnit.SECONDS)
            .callTimeout(0, TimeUnit.SECONDS)
            .connectTimeout(0, TimeUnit.SECONDS)
            .addInterceptor { chain ->
                val request = chain.request().newBuilder()
                    .header("Referer", "https://hitomi.la/")
                    .build()
-        runBlocking {
+                chain.proceed(request)
            withContext(Dispatchers.Main) {
                initWebView(appContext)
            }
            }
    }
    @Test
-    fun test_getGalleryIDsFromNozomi() {
+    fun test_empty() {
-        runBlocking {
+        print(
-            val result = getGalleryIDsFromNozomi(null, "boten", "all")
+            "".trim()
-
+                .replace(Regex("""^\?"""), "")
-            Log.d("PUPILD", "getGalleryIDsFromNozomi: ${result.size}")
+                .lowercase(Locale.getDefault())
                .split(Regex("\\s+"))
                .map {
                    it.replace('_', ' ')
                })
    }
    @Test
    fun test_nozomi() {
        val nozomi = getGalleryIDsFromNozomi(null, "index", "all")
        Log.d("PUPILD", nozomi.size.toString())
    }
    @Test
-    fun test_getGalleryIDsForQuery() {
+    fun test_search() {
-        runBlocking {
+        val ids = getGalleryIDsForQuery("language:korean").reversed()
            val result = getGalleryIDsForQuery("female:crotch tattoo")
-            Log.d("PUPILD", "getGalleryIDsForQuery: ${result.size}")
+        print(ids.size)
        }
    }
    @Test
-    fun test_getSuggestionsForQuery() {
+    fun test_suggestions() {
-        runBlocking {
+        val suggestions = getSuggestionsForQuery("language:g")
            val result = getSuggestionsForQuery("fem")
-            Log.d("PUPILD", "getSuggestionsForQuery: ${result.size}")
+        print(suggestions)
        }
    }
    @Test
-    fun test_urlFromUrlFromHash() {
+    fun test_doSearch() {
-        runBlocking {
+        val r = runBlocking {
-            val galleryInfo = getGalleryInfo(2102416)
+            doSearch("language:korean")
            val result = galleryInfo.files.map {
                imageUrlFromImage(2102416, it, false)
        }
-            Log.d("PUPILD", result.toString())
+        Log.d("PUPILD", r.take(10).toString())
        }
    }
 //    @Test
 //    fun test_getBlock() {
 //        val galleryBlock = getGalleryBlock(2097576)
 //
 //        print(galleryBlock)
 //    }
 //
 //    @Test
 //    fun test_getGallery() {
 //        val gallery = getGallery(2097751)
 //
 //        print(gallery)
 //    }
    @Test
    fun test_getGalleryInfo() {
-        runBlocking {
+        val info = getGalleryInfo(1469394)
            val galleryInfo = getGalleryInfo(2102416)
-            Log.d("PUPILD", galleryInfo.toString())
+        print(info)
        }
    }
    @Test
-    fun test_getGallery() {
+    fun test_getReader() {
-        runBlocking {
+        val reader = getGalleryInfo(2128654)
            val gallery = getGallery(2109479)
-            Log.d("PUPILD", gallery.toString())
+        Log.d("PUPILD", reader.toString())
        }
    }
    @Test
-    fun test_getGalleryBlock() {
+    fun test_getImages() { runBlocking {
-        runBlocking {
+        val galleryID = 2128654
            val block = getGalleryBlock(2013877)
-            Log.d("PUPILD", block.toString())
+        val images = getGalleryInfo(galleryID).files.map {
-        }
+            imageUrlFromImage(galleryID, it,false)
        }
        Log.d("PUPILD", images.toString())
 //        images.forEachIndexed { index, image ->
 //            println("Testing $index/${images.size}: $image")
 //            val response = client.newCall(
 //                Request.Builder()
 //                    .url(image)
 //                    .header("Referer", "https://hitomi.la/")
 //                    .build()
 //            ).execute()
 //
 //            assertEquals(200, response.code())
 //
 //            println("$index/${images.size} Passed")
 //        }
    } }
 //    @Test
 //    fun test_urlFromUrlFromHash() {
 //        val url = urlFromUrlFromHash(1531795, GalleryFiles(
 //            212, "719d46a7556be0d0021c5105878507129b5b3308b02cf67f18901b69dbb3b5ef", 1, "00.jpg", 300
 //        ), "webp")
 //
 //        print(url)
 //    }
 //    @Test
 //    suspend fun test_doSearch_extreme() {
 //        val query = "language:korean -tag:sample -female:humiliation -female:diaper -female:strap-on -female:squirting -female:lizard_girl -female:voyeurism -type:artistcg -female:blood -female:ryona -male:blood -male:ryona -female:crotch_tattoo -male:urethra_insertion -female:living_clothes -male:tentacles -female:slave -female:gag -male:gag -female:wooden_horse -male:exhibitionism -male:miniguy -female:mind_break -male:mind_break -male:unbirth -tag:scanmark -tag:no_penetration -tag:nudity_only -female:enema -female:brain_fuck -female:navel_fuck -tag:novel -tag:mosaic_censorship -tag:webtoon -male:rape -female:rape -female:yuri -male:anal -female:anal -female:futanari -female:huge_breasts -female:big_areolae -male:torture -male:stuck_in_wall -female:stuck_in_wall -female:torture -female:birth -female:pregnant -female:drugs -female:bdsm -female:body_writing -female:cbt -male:dark_skin -male:insect -female:insect -male:vore -female:vore -female:vomit -female:urination -female:urethra_insertion -tag:mmf_threesome -female:sex_toys -female:double_penetration -female:eggs -female:prolapse -male:smell -male:bestiality -female:bestiality -female:big_ass -female:milf -female:mother -male:dilf -male:netorare -female:netorare -female:cosplaying -female:filming -female:armpit_sex -female:armpit_licking -female:tickling -female:lactation -male:skinsuit -female:skinsuit -male:bbm -female:prostitution -female:double_penetration -female:females_only -male:males_only -female:tentacles -female:tentacles -female:stomach_deformation -female:hairy_armpits -female:large_insertions -female:mind_control -male:orc -female:dark_skin -male:yandere -female:yandere -female:scat -female:toddlercon -female:bbw -female:hairy -male:cuntboy -male:lactation -male:drugs -female:body_modification -female:monoeye -female:chikan -female:long_tongue -female:harness -female:fisting -female:glory_hole -female:latex -male:latex -female:unbirth -female:giantess -female:sole_dickgirl -female:robot -female:doll_joints -female:machine -tag:artbook -male:cbt -female:farting -male:farting -male:midget -female:midget -female:exhibitionism  -male:monster -female:big_nipples -female:big_clit -female:gyaru -female:piercing -female:necrophilia -female:snuff -female:smell -male:cheating -female:cheating -male:snuff -female:harem -male:harem"
 //        print(doSearch(query).size)
 //    }
 //    @Test
 //    suspend fun test_parse() {
 //        print(doSearch("-male:yaoi -female:yaoi -female:loli").size)
 //    }
 //    @Test
 //    fun test_subdomainFromUrl() {
 //        val galleryInfo = getGalleryInfo(1929109).files[2]
 //        print(urlFromUrlFromHash(1929109, galleryInfo, "webp", null, "a"))
 //    }
 }
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
 <!--
  ~     Pupil, Hitomi.la viewer for Android
  ~     Copyright (C) 2020  tom5079
  ~
@@ -17,6 +16,4 @@
  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources></resources>
    <string name="app_name" translatable="false" tools:override="true">Pupil-Debug</string>
 </resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,16 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
    package="xyz.quaver.pupil">
    <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" android:maxSdkVersion="23"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.VIBRATE"/>
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" android:usesPermissionFlags="neverForLocation"
        tools:targetApi="s" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="32"
        tools:ignore="CoarseFineLocation" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
    <uses-feature android:name="android.hardware.camera" android:required="false" />
    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
@@ -45,7 +52,16 @@
        </provider>
        <service android:name=".services.DownloadService"
-            android:exported="false"/>
+            android:exported="false"
            android:foregroundServiceType="dataSync" />
        <service android:name=".services.TransferClientService"
            android:exported="false"
            android:foregroundServiceType="dataSync" />
        <service android:name=".services.TransferServerService"
            android:exported="false"
            android:foregroundServiceType="dataSync" />
        <receiver
            android:name=".receiver.UpdateBroadcastReceiver"
@@ -61,165 +77,107 @@
            android:configChanges="keyboardHidden|orientation|screenSize"
            android:parentActivityName=".ui.MainActivity"
            android:exported="true">
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/galleries"
+                <data android:host="*.hasha.in"/>
-                    android:scheme="http" />
+                <data android:pathPrefix="/reader"/>
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/manga"
+                <data android:host="hitomi.la"/>
-                    android:scheme="http" />
+                <data android:pathPrefix="/galleries"/>
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/doujinshi"
+                <data android:host="hitomi.la" />
-                    android:scheme="http" />
+                <data android:pathPrefix="/manga" />
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/cg"
+                <data android:host="hitomi.la" />
-                    android:scheme="http" />
+                <data android:pathPrefix="/doujinshi" />
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/reader"
+                <data android:host="hitomi.la" />
-                    android:scheme="http" />
+                <data android:pathPrefix="/cg" />
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/galleries"
+                <data android:host="hitomi.la" />
-                    android:scheme="https" />
+                <data android:pathPrefix="/imageset" />
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:scheme="https" />
-                    android:pathPrefix="/manga"
+                <data android:host="hitomi.la" />
-                    android:scheme="https" />
+                <data android:pathPrefix="/reader" />
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="http" />
-                    android:host="hitomi.la"
+                <data android:host="e-hentai.org" />
-                    android:pathPrefix="/doujinshi"
+                <data android:pathPrefix="/g" />
                    android:scheme="https" />
            </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data
+                <data android:scheme="https" />
-                    android:host="hitomi.la"
+                <data android:host="e-hentai.org" />
-                    android:pathPrefix="/cg"
+                <data 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="/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"
                    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="e-hentai.org"
                    android:pathPrefix="/g"
                    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="e-hentai.org"
                    android:pathPrefix="/g"
                    android:scheme="https" />
            </intent-filter>
        </activity>
        <activity
            android:name=".ui.SettingsActivity"
            android:label="@string/settings_title">
            <tools:validation testUrl="http://ix.io/eer" />
        </activity>
        <activity
            android:name=".ui.MainActivity"
@@ -232,19 +190,9 @@
                <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" />
        <activity android:name=".ui.TransferActivity" />
    </application>
 </manifest>
--- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -18,7 +18,6 @@
 package xyz.quaver.pupil
 import android.annotation.SuppressLint
 import android.app.Application
 import android.app.Notification
 import android.app.NotificationChannel
@@ -27,8 +26,7 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
-import android.webkit.*
+import android.util.Log
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
@@ -38,20 +36,29 @@ import com.github.piasy.biv.loader.fresco.FrescoImageLoader
 import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.android.gms.common.GooglePlayServicesRepairableException
 import com.google.android.gms.security.ProviderInstaller
 import com.google.firebase.FirebaseApp
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.MutableSharedFlow
+import okhttp3.Dispatcher
-import kotlinx.coroutines.flow.asSharedFlow
+import okhttp3.Interceptor
-import okhttp3.*
+import okhttp3.OkHttpClient
 import okhttp3.Response
 import xyz.quaver.io.FileX
 import xyz.quaver.pupil.hitomi.evaluationContext
 import xyz.quaver.pupil.hitomi.readText
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.*
 import java.io.File
 import java.net.URL
 import java.security.KeyStore
 import java.security.SecureRandom
 import java.security.cert.CertificateFactory
 import java.util.*
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509TrustManager
 import kotlin.reflect.KClass
 typealias PupilInterceptor = (Interceptor.Chain) -> Response
@@ -75,149 +82,45 @@ val client: OkHttpClient
        clientHolder = it
    }
-@SuppressLint("StaticFieldLeak")
+fun getSSLContext(context: Context): SSLContext {
-lateinit var webView: WebView
+    val keyStore = KeyStore.getInstance(KeyStore.getDefaultType())
-val _webViewFlow = MutableSharedFlow<Pair<String, String?>>()
+    keyStore.load(null, null)
 val webViewFlow = _webViewFlow.asSharedFlow()
 var webViewReady = false
 var webViewFailed = false
 private var reloadJob: Job? = null
-fun reloadWebView() {
+    val certificateFactory = CertificateFactory.getInstance("X.509")
    if (reloadJob?.isActive == true) return
-    reloadJob = CoroutineScope(Dispatchers.IO).launch {
+    val certificate = context.resources.openRawResource(R.raw.isrgrootx1).use {
-        webViewReady = false
+        certificateFactory.generateCertificate(it)
-        webViewFailed = false
+    }
-        evaluationContext.cancelChildren(CancellationException("reload"))
+    keyStore.setCertificateEntry("isrgrootx1", certificate)
-        runCatching {
+    val defaultTrustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-            URL(
+    defaultTrustManagerFactory.init(null as KeyStore?)
-                if (BuildConfig.DEBUG)
+
-                    "https://tom5079.github.io/Pupil/hitomi-dev.html"
+    defaultTrustManagerFactory.trustManagers.filterIsInstance(X509TrustManager::class.java).forEach { trustManager ->
-                else
+        trustManager.acceptedIssuers.forEach { acceptedIssuer ->
-                    "https://tom5079.github.io/Pupil/hitomi.html"
+            keyStore.setCertificateEntry(acceptedIssuer.subjectDN.name, acceptedIssuer)
            ).readText()
        }.onFailure {
            webViewFailed = true
        }.getOrNull()?.let { html ->
            launch(Dispatchers.Main) {
                webView.loadDataWithBaseURL(
                    "https://hitomi.la/",
                    html,
                    "text/html",
                    null,
                    null
                )
            }
        }
    }
    val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
    trustManagerFactory.init(keyStore)
    val sslContext = SSLContext.getInstance("TLS")
    sslContext.init(null, trustManagerFactory.trustManagers, SecureRandom())
    return sslContext
 }
 private var htmlVersion: String = ""
 fun reloadWhenFailedOrUpdate() = CoroutineScope(Dispatchers.Default).launch {
    while (true) {
        if (
            webViewFailed ||
            runCatching {
                URL(
                    if (BuildConfig.DEBUG)
                        "https://tom5079.github.io/Pupil/hitomi-dev.html.ver"
                    else
                        "https://tom5079.github.io/Pupil/hitomi.html.ver"
                ).readText()
            }.getOrNull().let { version ->
                (!version.isNullOrEmpty() && version != htmlVersion).also {
                    if (it) htmlVersion = version!!
                }
            }
        ) {
            reloadWebView()
        }
        delay(if (webViewReady && !webViewFailed) 10000 else 1000)
    }
 }
@SuppressLint("SetJavaScriptEnabled")
 fun initWebView(context: Context) {
    if (BuildConfig.DEBUG) WebView.setWebContentsDebuggingEnabled(true)
    webView = WebView(context).apply {
        with (settings) {
            javaScriptEnabled = true
            domStorageEnabled = true
        }
        userAgent = settings.userAgentString
        webViewClient = object: WebViewClient() {
            override fun onPageFinished(view: WebView?, url: String?) {
                webViewReady = true
            }
            override fun onReceivedError(
                view: WebView?,
                request: WebResourceRequest?,
                error: WebResourceError?
            ) {
                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                    FirebaseCrashlytics.getInstance().log(
                        "onReceivedError: ${error?.description}"
                    )
                }
            }
        }
        webChromeClient = object: WebChromeClient() {
            override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
                FirebaseCrashlytics.getInstance().log(
                    "onConsoleMessage: ${consoleMessage?.message()} (${consoleMessage?.sourceId()}:${consoleMessage?.lineNumber()})"
                )
                return super.onConsoleMessage(consoleMessage)
            }
        }
        addJavascriptInterface(object {
            @JavascriptInterface
            fun onResult(uid: String, result: String) {
                CoroutineScope(Dispatchers.Unconfined).launch {
                    _webViewFlow.emit(uid to result)
                }
            }
            @JavascriptInterface
            fun onError(uid: String, message: String) {
                CoroutineScope(Dispatchers.Unconfined).launch {
                    _webViewFlow.emit(uid to null)
                }
                Toast.makeText(context, message, Toast.LENGTH_LONG).show()
                FirebaseCrashlytics.getInstance().log(
                    "onError: $message"
                )
            }
        }, "Callback")
    }
    reloadWhenFailedOrUpdate()
 }
 lateinit var userAgent: String
 class Pupil : Application() {
    companion object {
        lateinit var instance: Pupil
            private set
    }
    @SuppressLint("SetJavaScriptEnabled")
    override fun onCreate() {
        instance = this
        initWebView(this)
        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
        preferences = PreferenceManager.getDefaultSharedPreferences(this)
@@ -227,17 +130,19 @@ class Pupil : Application() {
            else userID
        }
        FirebaseApp.initializeApp(this)
        FirebaseCrashlytics.getInstance().setUserId(userID)
        val proxyInfo = getProxyInfo()
        clientBuilder = OkHttpClient.Builder()
-            .connectTimeout(0, TimeUnit.SECONDS)
+//            .connectTimeout(0, TimeUnit.SECONDS)
            .sslSocketFactory(getSSLContext(this).socketFactory)
            .readTimeout(0, TimeUnit.SECONDS)
            .proxyInfo(proxyInfo)
            .addInterceptor { chain ->
                val request = chain.request().newBuilder()
-                    .header("User-Agent", userAgent)
+                    .addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36")
                    .header("Referer", "https://hitomi.la/")
                    .build()
@@ -331,6 +236,13 @@ class Pupil : Application() {
                enableVibration(false)
                lockscreenVisibility = Notification.VISIBILITY_SECRET
            })
            manager.createNotificationChannel(NotificationChannel("transfer", getString(R.string.channel_transfer), NotificationManager.IMPORTANCE_LOW).apply {
                description = getString(R.string.channel_transfer_description)
                enableLights(false)
                enableVibration(false)
                lockscreenVisibility = Notification.VISIBILITY_SECRET
            })
        }
        AppCompatDelegate.setDefaultNightMode(when (Preferences.get<Boolean>("dark_mode")) {
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -186,7 +186,7 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                        text =
                            resources.getString(R.string.galleryblock_language, languages[galleryBlock.language])
                        visibility = when {
-                            galleryBlock.language.isNotEmpty() -> View.VISIBLE
+                            !galleryBlock.language.isNullOrEmpty() -> View.VISIBLE
                            else -> View.GONE
                        }
                    }
--- a/app/src/main/java/xyz/quaver/pupil/adapters/TransferPeersAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/TransferPeersAdapter.kt
@@ -0,0 +1,44 @@
 package xyz.quaver.pupil.adapters
 import android.net.wifi.p2p.WifiP2pDevice
 import android.net.wifi.p2p.WifiP2pDeviceList
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
 import androidx.recyclerview.widget.RecyclerView
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.databinding.TransferPeerListItemBinding
 class TransferPeersAdapter(
    private val devices: Collection<WifiP2pDevice>,
    private val onDeviceSelected: (WifiP2pDevice) -> Unit
 ): RecyclerView.Adapter<TransferPeersAdapter.ViewHolder>() {
    class ViewHolder(val binding: TransferPeerListItemBinding): RecyclerView.ViewHolder(binding.root)
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
        val binding = TransferPeerListItemBinding.inflate(
            LayoutInflater.from(parent.context),
            parent,
            false
        )
        return ViewHolder(binding)
    }
    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
        val device = devices.elementAt(position)
        holder.binding.deviceName.text = device.deviceName
        holder.binding.deviceAddress.text = device.deviceAddress
        holder.binding.root.setOnClickListener {
            onDeviceSelected(device)
        }
    }
    override fun getItemCount(): Int {
        return devices.size
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/Utils.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/Utils.kt
@@ -1,46 +0,0 @@
 /*
 *    Copyright 2019 tom5079
 *
 *    Licensed under the Apache License, Version 2.0 (the "License");
 *    you may not use this file except in compliance with the License.
 *    You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *    Unless required by applicable law or agreed to in writing, software
 *    distributed under the License is distributed on an "AS IS" BASIS,
 *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *    See the License for the specific language governing permissions and
 *    limitations under the License.
 */
 package xyz.quaver
 import kotlinx.serialization.json.Json
 import okhttp3.Request
 import xyz.quaver.pupil.client
 import java.io.IOException
 import java.net.URL
 /**
 * kotlinx.serialization.json.Json object for global use  
 * properties should not be changed
 *
 * @see [https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-core/kotlinx-serialization-core/kotlinx.serialization.json/-json/index.html]
 */
 val json = Json {
    isLenient = true
    ignoreUnknownKeys = true
    allowSpecialFloatingPointValues = true
    useArrayPolymorphism = true
 }
 typealias HeaderSetter = (Request.Builder) -> Request.Builder
 fun URL.readText(settings: HeaderSetter? = null): String {
    val request = Request.Builder()
        .url(this).let { 
            settings?.invoke(it) ?: it
        }.build()
    return client.newCall(request).execute().also{ if (it.code() != 200) throw IOException() }.body()?.use { it.string() } ?: throw IOException()
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt
@@ -16,127 +16,258 @@
 package xyz.quaver.pupil.hitomi
 import android.util.Log
 import android.webkit.WebView
 import android.widget.Toast
 import com.google.common.collect.ConcurrentHashMultiset
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.flow.transformWhile
+import kotlinx.datetime.Clock.System.now
-import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import xyz.quaver.json
+import okhttp3.Call
-import xyz.quaver.pupil.*
+import okhttp3.Callback
-import java.util.*
+import okhttp3.Request
-import java.util.concurrent.ConcurrentHashMap
+import okhttp3.Response
-import kotlin.coroutines.resume
+import xyz.quaver.pupil.client
-import kotlin.coroutines.suspendCoroutine
+import java.io.IOException
 import java.net.URL
 import java.util.concurrent.Executors
 import kotlin.coroutines.resumeWithException
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.ExperimentalTime
 const val protocol = "https:"
-val evaluationContext = Dispatchers.Main + Job()
+@Serializable
 data class Artist(
    val artist: String,
    val url: String
 )
-suspend fun WebView.evaluate(script: String): String = coroutineScope {
+@Serializable
-    var result: String? = null
+data class Group(
    val group: String,
    val url: String
 )
-    while (result == null) {
+@Serializable
-        try {
+data class Parody(
-            result = withContext(evaluationContext) {
+    val parody: String,
-                while (webViewFailed || !webViewReady) yield()
+    val url: String
 )
-                suspendCoroutine { continuation ->
+@Serializable
-                    evaluateJavascript(script) {
+data class Character(
-                        continuation.resume(it)
+    val character: String,
-                    }
+    val url: String
-                }
+)
-            }
+@Serializable
-        } catch (e: CancellationException) {
+data class Tag(
-            if (e.message != "reload") result = "null"
+    val tag: String,
-        }
+    val url: String,
-    }
+    val female: String? = null,
    val male: String? = null
 )
-    result
+@Serializable
 data class Language(
    val galleryid: String,
    val url: String,
    val language_localname: String,
    val name: String
 )
@Serializable
 data class GalleryInfo(
    val id: String,
    val title: String,
    val japanese_title: String? = null,
    val language: String? = null,
    val type: String,
    val date: String,
    val artists: List<Artist>? = null,
    val groups: List<Group>? = null,
    val parodys: List<Parody>? = null,
    val tags: List<Tag>? = null,
    val related: List<Int> = emptyList(),
    val languages: List<Language> = emptyList(),
    val characters: List<Character>? = null,
    val scene_indexes: List<Int>? = emptyList(),
    val files: List<GalleryFiles> = emptyList()
 )
 val json = Json {
    isLenient = true
    ignoreUnknownKeys = true
    allowSpecialFloatingPointValues = true
    useArrayPolymorphism = true
 }
-@OptIn(ExperimentalCoroutinesApi::class)
+typealias HeaderSetter = (Request.Builder) -> Request.Builder
-suspend fun WebView.evaluatePromise(
+fun URL.readText(settings: HeaderSetter? = null): String {
-    script: String,
+    val request = Request.Builder()
-    then: String = ".then(result => Callback.onResult(%uid, JSON.stringify(result))).catch(err => Callback.onError(%uid, JSON.stringify(err)))"
+        .url(this).let {
-): String = coroutineScope {
+            settings?.invoke(it) ?: it
-    var result: String? = null
+        }.build()
-    while (result == null) {
+    return client.newCall(request).execute().also{ if (it.code() != 200) throw IOException("CODE ${it.code()}") }.body()?.use { it.string() } ?: throw IOException()
-        try {
+}
            result = withContext(evaluationContext) {
                while (webViewFailed || !webViewReady) yield()
-                val uid = UUID.randomUUID().toString()
+fun URL.readBytes(settings: HeaderSetter? = null): ByteArray {
    val request = Request.Builder()
        .url(this).let {
            settings?.invoke(it) ?: it
        }.build()
-                val flow: Flow<Pair<String, String?>> = webViewFlow.transformWhile { (currentUid, result) ->
+    return client.newCall(request).execute().also { if (it.code() != 200) throw IOException("CODE ${it.code()}") }.body()?.use { it.bytes() } ?: throw IOException()
                    if (currentUid == uid) {
                        emit(currentUid to result)
                    }
                    currentUid != uid
                }
                launch {
                    evaluateJavascript((script + then).replace("%uid", "'$uid'"), null)
                }
                flow.first().second
            }
        } catch (e: CancellationException) {
            if (e.message != "reload") result = "null"
        }
    }
    result
 }
@Suppress("EXPERIMENTAL_API_USAGE")
-suspend fun getGalleryInfo(galleryID: Int): GalleryInfo {
+fun getGalleryInfo(galleryID: Int) =
-    val result = webView.evaluatePromise("get_gallery_info($galleryID)")
+    json.decodeFromString<GalleryInfo>(
-
+        URL("$protocol//$domain/galleries/$galleryID.js").readText()
-    return json.decodeFromString(result)
+            .replace("var galleryinfo = ", "")
-}
+    )
 //common.js
 const val domain = "ltn.hitomi.la"
 const val galleryblockextension = ".html"
 const val galleryblockdir = "galleryblock"
 const val nozomiextension = ".nozomi"
-val String?.js: String
+val evaluationContext = Dispatchers.Main + Job()
    get() = if (this == null) "null" else "'$this'"
-@OptIn(ExperimentalSerializationApi::class)
+object gg {
-suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null): String {
+    private var lastRetrieval: Long? = null
    val result = webView.evaluate(
        """
        url_from_url_from_hash(
            ${galleryID.toString().js},
            ${Json.encodeToString(image)},
            ${dir.js}, ${ext.js}, ${base.js}
        )
        """.trimIndent()
    )
-    return Json.decodeFromString(result)
+    private val mutex = Mutex()
    private var mDefault = 0
    private val mMap = mutableMapOf<Int, Int>()
    private var b = ""
    @OptIn(ExperimentalTime::class, ExperimentalCoroutinesApi::class)
    private suspend fun refresh() = withContext(Dispatchers.IO) {
        mutex.withLock {
            if (lastRetrieval == null || (lastRetrieval!! + 60000) < System.currentTimeMillis()) {
                val ggjs: String = suspendCancellableCoroutine { continuation ->
                    val call = client.newCall(Request.Builder().url("https://ltn.hitomi.la/gg.js").build())
                    call.enqueue(object: Callback {
                        override fun onFailure(call: Call, e: IOException) {
                            if (continuation.isCancelled) return
                            continuation.resumeWithException(e)
                        }
                        override fun onResponse(call: Call, response: Response) {
                            if (!call.isCanceled) {
                                response.body()?.use {
                                    continuation.resume(it.string()) {
                                        call.cancel()
                                    }
                                }
                            }
                        }
                    })
                    continuation.invokeOnCancellation {
                        call.cancel()
                    }
                }
                mDefault = Regex("var o = (\\d)").find(ggjs)!!.groupValues[1].toInt()
                val o = Regex("o = (\\d); break;").find(ggjs)!!.groupValues[1].toInt()
                mMap.clear()
                Regex("case (\\d+):").findAll(ggjs).forEach {
                    val case = it.groupValues[1].toInt()
                    mMap[case] = o
                }
                b = Regex("b: '(.+)'").find(ggjs)!!.groupValues[1]
                lastRetrieval = System.currentTimeMillis()
            }
        }
    }
    suspend fun m(g: Int): Int {
        refresh()
        return mMap[g] ?: mDefault
    }
    suspend fun b(): String {
        refresh()
        return b
    }
    fun s(h: String): String {
        val m = Regex("(..)(.)$").find(h)
        return m!!.groupValues.let { it[2]+it[1] }.toInt(16).toString(10)
    }
 }
 suspend fun subdomainFromURL(url: String, base: String? = null) : String {
    var retval = "b"
    if (!base.isNullOrBlank())
        retval = base
    val b = 16
    val r = Regex("""/[0-9a-f]{61}([0-9a-f]{2})([0-9a-f])""")
    val m = r.find(url) ?: return "a"
    val g = m.groupValues.let { it[2]+it[1] }.toIntOrNull(b)
    if (g != null) {
        retval = (97+ gg.m(g)).toChar().toString() + retval
    }
    return retval
 }
 suspend fun urlFromUrl(url: String, base: String? = null) : String {
    return url.replace(Regex("""//..?\.hitomi\.la/"""), "//${subdomainFromURL(url, base)}.hitomi.la/")
 }
 suspend fun fullPathFromHash(hash: String) : String =
    "${gg.b()}${gg.s(hash)}/$hash"
 fun realFullPathFromHash(hash: String): String =
    hash.replace(Regex("""^.*(..)(.)$"""), "$2/$1/$hash")
 suspend fun urlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null) : String {
    val ext = ext ?: dir ?: image.name.takeLastWhile { it != '.' }
    val dir = dir ?: "images"
    return "https://a.hitomi.la/$dir/${fullPathFromHash(image.hash)}.$ext"
 }
 suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null) =
    if (base == "tn")
        urlFromUrl("https://a.hitomi.la/$dir/${realFullPathFromHash(image.hash)}.$ext", base)
    else
        urlFromUrl(urlFromHash(galleryID, image, dir, ext), base)
 suspend fun rewriteTnPaths(html: String) {
    html.replace(Regex("""//tn\.hitomi\.la/[^/]+/[0-9a-f]/[0-9a-f]{2}/[0-9a-f]{64}""")) { url ->
        runBlocking {
            urlFromUrl(url.value, "tn")
        }
    }
 }
 suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean) : String {
-    return when {
+    return urlFromUrlFromHash(galleryID, image, "webp", null, "a")
-        noWebp ->
+//    return when {
-            urlFromUrlFromHash(galleryID, image)
+//        noWebp ->
-//        image.hasavif != 0 ->
+//            urlFromUrlFromHash(galleryID, image)
-//            urlFromUrlFromHash(galleryID, image, "avif", null, "a")
+////        image.hasavif != 0 ->
-        image.haswebp != 0 ->
+////            urlFromUrlFromHash(galleryID, image, "avif", null, "a")
-            urlFromUrlFromHash(galleryID, image, "webp", null, "a")
+//        image.haswebp != 0 ->
-        else ->
+//            urlFromUrlFromHash(galleryID, image, "webp", null, "a")
-            urlFromUrlFromHash(galleryID, image)
+//        else ->
-    }
+//            urlFromUrlFromHash(galleryID, image)
 //    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/galleries.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/galleries.kt
@@ -17,19 +17,11 @@
 package xyz.quaver.pupil.hitomi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import org.jsoup.Jsoup
 import xyz.quaver.pupil.webView
 import xyz.quaver.readText
 import java.net.URL
 import java.net.URLDecoder
@Serializable
 data class Gallery(
    val related: List<Int>,
-    val langList: Map<String, String>
+    val langList: List<Pair<String, String>>,
    ,
    val cover: String,
    val title: String,
    val artists: List<String>,
@@ -41,7 +33,22 @@ data class Gallery(
    val tags: List<String>,
    val thumbnails: List<String>
 )
 suspend fun getGallery(galleryID: Int) : Gallery {
-    val result = webView.evaluatePromise("get_gallery($galleryID)")
+    val info = getGalleryInfo(galleryID)
-    return Json.decodeFromString(result)
+
    return Gallery(
        info.related,
        info.languages.map { it.name to it.galleryid },
        urlFromUrlFromHash(galleryID, info.files.first(), "webpbigtn", "webp", "tn"),
        info.title,
        info.artists?.map { it.artist }.orEmpty(),
        info.groups?.map { it.group }.orEmpty(),
        info.type,
        info.language.orEmpty(),
        info.parodys?.map { it.parody }.orEmpty(),
        info.characters?.map { it.character }.orEmpty(),
        info.tags?.map { "${if (it.female.isNullOrEmpty()) "" else "female:"}${if (it.male.isNullOrEmpty()) "" else "male:"}${it.tag}" }.orEmpty(),
        info.files.map { urlFromUrlFromHash(galleryID, it, "webpsmalltn", "webp", "tn") }
    )
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/galleryblock.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/galleryblock.kt
@@ -17,17 +17,48 @@
 package xyz.quaver.pupil.hitomi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import org.jsoup.Jsoup
 import xyz.quaver.pupil.webView
 import xyz.quaver.readText
 import java.net.URL
 import java.net.URLDecoder
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import java.util.*
 import javax.net.ssl.HttpsURLConnection
 import kotlin.io.readText
 //galleryblock.js
 fun fetchNozomi(area: String? = null, tag: String = "index", language: String = "all", start: Int = -1, count: Int = -1) : Pair<List<Int>, Int> {
    val url = when(area) {
        null -> "$protocol//$domain/$tag-$language$nozomiextension"
        else -> "$protocol//$domain/$area/$tag-$language$nozomiextension"
    }
    with(URL(url).openConnection() as HttpsURLConnection) {
        requestMethod = "GET"
        if (start != -1 && count != -1) {
            val startByte = start*4
            val endByte = (start+count)*4-1
            setRequestProperty("Range", "bytes=$startByte-$endByte")
        }
        connect()
        val totalItems = getHeaderField("Content-Range")
            .replace(Regex("^[Bb]ytes \\d+-\\d+/"), "").toInt() / 4
        val nozomi = ArrayList<Int>()
        val arrayBuffer = ByteBuffer
            .wrap(inputStream.readBytes())
            .order(ByteOrder.BIG_ENDIAN)
        while (arrayBuffer.hasRemaining())
            nozomi.add(arrayBuffer.int)
        return Pair(nozomi, totalItems)
    }
 }
@Serializable
 data class GalleryBlock(
@@ -39,10 +70,23 @@ data class GalleryBlock(
    val series: List<String>,
    val type: String,
    val language: String,
-    val relatedTags: List<String>
+    val relatedTags: List<String>,
    val groups: List<String> = emptyList()
 )
 suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock {
-    val result = webView.evaluatePromise("get_gallery_block($galleryID)")
+    val info = getGalleryInfo(galleryID)
-    return Json.decodeFromString(result)
+
    return GalleryBlock(
        galleryID,
        "",
        listOf(urlFromUrlFromHash(galleryID, info.files.first(), "webpbigtn", "webp", "tn")),
        info.title,
        info.artists?.map { it.artist }.orEmpty(),
        info.parodys?.map { it.parody }.orEmpty(),
        info.type,
        info.language.orEmpty(),
        info.tags?.map { "${if (it.female.isNullOrEmpty()) "" else "female:"}${if (it.male.isNullOrEmpty()) "" else "male:"}${it.tag}" }.orEmpty(),
        info.groups?.map { it.group }.orEmpty()
    )
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/reader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/reader.kt
@@ -17,19 +17,8 @@
 package xyz.quaver.pupil.hitomi
 import kotlinx.serialization.Serializable
-
+import xyz.quaver.pupil.hitomi.GalleryInfo
-fun getReferer(galleryID: Int) = "https://hitomi.la/reader/$galleryID.html"
+import xyz.quaver.pupil.hitomi.getGalleryInfo
@Serializable
 data class GalleryInfo(
    val language_localname: String? = null,
    val language: String? = null,
    val date: String? = null,
    val files: List<GalleryFiles>,
    val id: Int? = null,
    val type: String? = null,
    val title: String? = null
 )
@Serializable
 data class GalleryFiles(
@@ -44,6 +33,6 @@ data class GalleryFiles(
 //Set header `Referer` to reader url to avoid 403 error
@Deprecated("", replaceWith = ReplaceWith("getGalleryInfo"))
-suspend fun getReader(galleryID: Int) : GalleryInfo {
+fun getReader(galleryID: Int) : GalleryInfo {
   return getGalleryInfo(galleryID)
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/results.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/results.kt
@@ -18,9 +18,9 @@ package xyz.quaver.pupil.hitomi
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
-import java.util.*
+import java.util.LinkedList
-suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int> = coroutineScope {
+suspend fun doSearch(query: String, sortMode: SortMode): List<Int> = coroutineScope {
    val terms = query
        .trim()
        .replace(Regex("""^\?"""), "")
@@ -34,8 +34,8 @@ suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int
    val negativeTerms = LinkedList<String>()
    for (term in terms) {
-        if (term.matches(Regex("^-.+")))
+        if (term.startsWith("-"))
-            negativeTerms.push(term.replace(Regex("^-"), ""))
+            negativeTerms.push(term.substring(1))
        else if (term.isNotBlank())
            positiveTerms.push(term)
    }
@@ -43,22 +43,25 @@ suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int
    val positiveResults = positiveTerms.map {
        async {
            runCatching {
-                getGalleryIDsForQuery(it)
+                getGalleryIDsForQuery(it, sortMode)
            }.getOrElse { emptySet() }
        }
    }
-    val negativeResults = negativeTerms.mapIndexed { index, it ->
+    val negativeResults = negativeTerms.map {
        async {
            runCatching {
-                getGalleryIDsForQuery(it)
+                getGalleryIDsForQuery(it, sortMode)
            }.getOrElse { emptySet() }
        }
    }
    val results = when {
-        sortByPopularity -> getGalleryIDsFromNozomi(null, "popular", "all")
+        positiveTerms.isEmpty() -> getGalleryIDsFromNozomi(
-        positiveTerms.isEmpty() -> getGalleryIDsFromNozomi(null, "index", "all")
+            SearchArgs("all", "index", "all"),
            sortMode
        )
        else -> emptySet()
    }.toMutableSet()
@@ -79,9 +82,13 @@ suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int
    }
    //negative results
-    negativeResults.forEachIndexed { index, it ->
+    negativeResults.forEach {
        filterNegative(it.await())
    }
-    results
+    return@coroutineScope if (sortMode != SortMode.RANDOM) {
        results.toList()
    } else {
        results.shuffled()
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt
@@ -16,50 +16,394 @@
 package xyz.quaver.pupil.hitomi
-import android.util.Log
+import kotlinx.serialization.json.jsonArray
-import kotlinx.serialization.ExperimentalSerializationApi
+import okhttp3.Request
-import kotlinx.serialization.Serializable
+import xyz.quaver.pupil.client
-import kotlinx.serialization.decodeFromString
+import xyz.quaver.pupil.util.content
-import kotlinx.serialization.json.Json
+import java.net.URL
-import xyz.quaver.pupil.webView
+import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import java.security.MessageDigest
 import kotlin.math.min
 data class SearchArgs(
    val area: String?,
    val tag: String,
    val language: String,
 ) {
    companion object {
        fun fromQuery(query: String): SearchArgs? {
            if (!query.contains(':')) {
                return null
            }
            val (left, right) = query.split(':')
            return when (left) {
                "male", "female" -> SearchArgs("tag", query, "all")
                "language" -> SearchArgs(null, "index", right)
                else -> SearchArgs(left, right, "all")
            }
        }
    }
 }
 enum class SortMode {
    DATE_ADDED,
    DATE_PUBLISHED,
    POPULAR_TODAY,
    POPULAR_WEEK,
    POPULAR_MONTH,
    POPULAR_YEAR,
    RANDOM;
    val orderBy: String
        get() = when (this) {
            DATE_ADDED, DATE_PUBLISHED, RANDOM -> "date"
            POPULAR_TODAY, POPULAR_WEEK, POPULAR_MONTH, POPULAR_YEAR -> "popular"
        }
    val orderByKey: String
        get() = when (this) {
            DATE_ADDED, RANDOM -> "added"
            DATE_PUBLISHED -> "published"
            POPULAR_TODAY -> "today"
            POPULAR_WEEK -> "week"
            POPULAR_MONTH -> "month"
            POPULAR_YEAR -> "year"
        }
 }
 //searchlib.js
 const val separator = "-"
 const val extension = ".html"
 const val index_dir = "tagindex"
 const val galleries_index_dir = "galleriesindex"
 const val max_node_size = 464
 const val B = 16
 const val compressed_nozomi_prefix = "n"
-@OptIn(ExperimentalSerializationApi::class)
+val tag_index_version: String by lazy { getIndexVersion("tagindex") }
-suspend fun getGalleryIDsForQuery(query: String) : Set<Int> {
+val galleries_index_version: String by lazy { getIndexVersion("galleriesindex") }
-    val result = webView.evaluatePromise("get_galleryids_for_query('$query')")
+val tagIndexDomain = "tagindex.hitomi.la"
-    return Json.decodeFromString(result)
+fun sha256(data: ByteArray): ByteArray {
    return MessageDigest.getInstance("SHA-256").digest(data)
 }
@OptIn(ExperimentalUnsignedTypes::class)
 fun hashTerm(term: String): UByteArray {
    return sha256(term.toByteArray()).toUByteArray().sliceArray(0 until 4)
 }
 fun sanitize(input: String): String {
    return input.replace(Regex("[/#]"), "")
 }
 fun getIndexVersion(name: String) =
    URL("$protocol//$domain/$name/version?_=${System.currentTimeMillis()}").readText()
 //search.js
 fun getGalleryIDsForQuery(query: String, sortMode: SortMode): Set<Int> {
    val sanitizedQuery = query.replace("_", " ")
    val args = SearchArgs.fromQuery(sanitizedQuery)
    return if (args != null) {
        getGalleryIDsFromNozomi(args, sortMode)
    } else {
        val key = hashTerm(sanitizedQuery)
        val field = "galleries"
        val node = getNodeAtAddress(field, 0)
        val data = bSearch(field, key, node)
        if (data != null)
            return getGalleryIDsFromData(data)
        return emptySet()
    }
 }
 fun encodeSearchQueryForUrl(s: Char) =
    when (s) {
        ' ' -> "_"
        '/' -> "slash"
        '.' -> "dot"
        else -> s.toString()
    }
 fun getSuggestionsForQuery(query: String): List<Suggestion> {
    query.replace('_', ' ').let {
        var field = "global"
        var term = it
        if (term.indexOf(':') > -1) {
            val sides = it.split(':')
            field = sides[0]
            term = sides[1]
        }
        val chars = term.map(::encodeSearchQueryForUrl)
        val url =
            "https://$tagIndexDomain/$field${if (chars.isNotEmpty()) "/${chars.joinToString("/")}" else ""}.json"
        val request = Request.Builder()
            .url(url)
            .build()
        val suggestions = json.parseToJsonElement(
            client.newCall(request).execute().body()?.use { body -> body.string() }
                ?: return emptyList())
        return buildList {
            suggestions.jsonArray.forEach { suggestionRaw ->
                val suggestion = suggestionRaw.jsonArray
                if (suggestion.size < 3) {
                    return@forEach
                }
                val ns = suggestion[2].content ?: ""
                val tagname = sanitize(suggestion[0].content ?: return@forEach)
                val url = when (ns) {
                    "female", "male" -> "/tag/$ns:$tagname${separator}1$extension"
                    "language" -> "/index-$tagname${separator}1$extension"
                    else -> "/$ns/$tagname${separator}all${separator}1$extension"
                }
                add(
                    Suggestion(
                        suggestion[0].content ?: "",
                        suggestion[1].content?.toIntOrNull() ?: 0,
                        url,
                        ns
                    )
                )
            }
        }
    }
 }
@Serializable
 data class Suggestion(val s: String, val t: Int, val u: String, val n: String)
-@OptIn(ExperimentalSerializationApi::class)
+fun getSuggestionsFromData(field: String, data: Pair<Long, Int>): List<Suggestion> {
-suspend fun getSuggestionsForQuery(query: String) : List<Suggestion> {
+    val url = "$protocol//$domain/$index_dir/$field.$tag_index_version.data"
-    val result = webView.evaluatePromise(
+    val (offset, length) = data
-        "get_suggestions_for_query('$query', ++search_serial)",
+    if (length > 10000 || length <= 0)
-        then = """
+        throw Exception("length $length is too long")
-            .then(r => {
+
-                let [results, results_serial] = r;
+    val inbuf = getURLAtRange(url, offset.until(offset + length))
-                if (search_serial !== results_serial) {
+
-                    Callback.onResult(%uid, '[]');
+    val suggestions = ArrayList<Suggestion>()
-                } else {
+
-                    Callback.onResult(%uid, JSON.stringify(results));
+    val buffer = ByteBuffer
        .wrap(inbuf)
        .order(ByteOrder.BIG_ENDIAN)
    val numberOfSuggestions = buffer.int
    if (numberOfSuggestions > 100 || numberOfSuggestions <= 0)
        throw Exception("number of suggestions $numberOfSuggestions is too long")
    for (i in 0.until(numberOfSuggestions)) {
        var top = buffer.int
        val ns = inbuf.sliceArray(buffer.position().until(buffer.position() + top))
            .toString(charset("UTF-8"))
        buffer.position(buffer.position() + top)
        top = buffer.int
        val tag = inbuf.sliceArray(buffer.position().until(buffer.position() + top))
            .toString(charset("UTF-8"))
        buffer.position(buffer.position() + top)
        val count = buffer.int
        val tagname = sanitize(tag)
        val u =
            when (ns) {
                "female", "male" -> "/tag/$ns:$tagname${separator}1$extension"
                "language" -> "/index-$tagname${separator}1$extension"
                else -> "/$ns/$tagname${separator}all${separator}1$extension"
            }
            });
        """.trimIndent()
    )
-    return Json.decodeFromString(result) ?: return emptyList()
+        suggestions.add(Suggestion(tag, count, u, ns))
    }
    return suggestions
 }
-@OptIn(ExperimentalSerializationApi::class)
+fun nozomiAddressFromArgs(args: SearchArgs, sortMode: SortMode) = when {
-suspend fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : Set<Int> {
+    sortMode != SortMode.DATE_ADDED && sortMode != SortMode.RANDOM ->
-    val jsArea = if (area == null) "null" else "'$area'"
+        if (args.area == "all") "$protocol//$domain/$compressed_nozomi_prefix/${sortMode.orderBy}/${sortMode.orderByKey}-${args.language}$nozomiextension"
        else "$protocol//$domain/$compressed_nozomi_prefix/${args.area}/${sortMode.orderBy}/${sortMode.orderByKey}/${args.tag}-${args.language}$nozomiextension"
-    val json = webView.evaluatePromise("""get_galleryids_from_nozomi($jsArea, '$tag', '$language')""")
+    args.area == "all" -> "$protocol//$domain/$compressed_nozomi_prefix/${args.tag}-${args.language}$nozomiextension"
-
+    else -> "$protocol//$domain/$compressed_nozomi_prefix/${args.area}/${args.tag}-${args.language}$nozomiextension"
-    return Json.decodeFromString(json)
+}
 fun getGalleryIDsFromNozomi(args: SearchArgs, sortMode: SortMode): Set<Int> {
    val nozomiAddress = nozomiAddressFromArgs(args, sortMode)
    val bytes = URL(nozomiAddress).readBytes()
    val nozomi = mutableSetOf<Int>()
    val arrayBuffer = ByteBuffer
        .wrap(bytes)
        .order(ByteOrder.BIG_ENDIAN)
    while (arrayBuffer.hasRemaining())
        nozomi.add(arrayBuffer.int)
    return nozomi
 }
 fun getGalleryIDsFromData(data: Pair<Long, Int>): Set<Int> {
    val url = "$protocol//$domain/$galleries_index_dir/galleries.$galleries_index_version.data"
    val (offset, length) = data
    if (length > 100000000 || length <= 0)
        throw Exception("length $length is too long")
    val inbuf = getURLAtRange(url, offset.until(offset + length))
    val galleryIDs = mutableSetOf<Int>()
    val buffer = ByteBuffer
        .wrap(inbuf)
        .order(ByteOrder.BIG_ENDIAN)
    val numberOfGalleryIDs = buffer.int
    val expectedLength = numberOfGalleryIDs * 4 + 4
    if (numberOfGalleryIDs > 10000000 || numberOfGalleryIDs <= 0)
        throw Exception("number_of_galleryids $numberOfGalleryIDs is too long")
    else if (inbuf.size != expectedLength)
        throw Exception("inbuf.byteLength ${inbuf.size} != expected_length $expectedLength")
    for (i in 0.until(numberOfGalleryIDs))
        galleryIDs.add(buffer.int)
    return galleryIDs
 }
 fun getNodeAtAddress(field: String, address: Long): Node {
    val url =
        when (field) {
            "galleries" -> "$protocol//$domain/$galleries_index_dir/galleries.$galleries_index_version.index"
            "languages" -> "$protocol//$domain/$galleries_index_dir/languages.$galleries_index_version.index"
            "nozomiurl" -> "$protocol//$domain/$galleries_index_dir/nozomiurl.$galleries_index_version.index"
            else -> "$protocol//$domain/$index_dir/$field.$tag_index_version.index"
        }
    val nodedata = getURLAtRange(url, address.until(address + max_node_size))
    return decodeNode(nodedata)
 }
 fun getURLAtRange(url: String, range: LongRange): ByteArray {
    val request = Request.Builder()
        .url(url)
        .header("Range", "bytes=${range.first}-${range.last}")
        .build()
    return client.newCall(request).execute().body()?.use { it.bytes() } ?: byteArrayOf()
 }
@OptIn(ExperimentalUnsignedTypes::class)
 data class Node(
    val keys: List<UByteArray>,
    val datas: List<Pair<Long, Int>>,
    val subNodeAddresses: List<Long>
 )
@OptIn(ExperimentalUnsignedTypes::class)
 fun decodeNode(data: ByteArray): Node {
    val buffer = ByteBuffer
        .wrap(data)
        .order(ByteOrder.BIG_ENDIAN)
    val uData = data.toUByteArray()
    val numberOfKeys = buffer.int
    val keys = ArrayList<UByteArray>()
    for (i in 0.until(numberOfKeys)) {
        val keySize = buffer.int
        if (keySize == 0 || keySize > 32)
            throw Exception("fatal: !keySize || keySize > 32")
        keys.add(uData.sliceArray(buffer.position().until(buffer.position() + keySize)))
        buffer.position(buffer.position() + keySize)
    }
    val numberOfDatas = buffer.int
    val datas = ArrayList<Pair<Long, Int>>()
    for (i in 0.until(numberOfDatas)) {
        val offset = buffer.long
        val length = buffer.int
        datas.add(Pair(offset, length))
    }
    val numberOfSubNodeAddresses = B + 1
    val subNodeAddresses = ArrayList<Long>()
    for (i in 0.until(numberOfSubNodeAddresses)) {
        val subNodeAddress = buffer.long
        subNodeAddresses.add(subNodeAddress)
    }
    return Node(keys, datas, subNodeAddresses)
 }
@OptIn(ExperimentalUnsignedTypes::class)
 fun bSearch(field: String, key: UByteArray, node: Node): Pair<Long, Int>? {
    fun compareArrayBuffers(dv1: UByteArray, dv2: UByteArray): Int {
        val top = min(dv1.size, dv2.size)
        for (i in 0.until(top)) {
            if (dv1[i] < dv2[i])
                return -1
            else if (dv1[i] > dv2[i])
                return 1
        }
        return 0
    }
    fun locateKey(key: UByteArray, node: Node): Pair<Boolean, Int> {
        for (i in node.keys.indices) {
            val cmpResult = compareArrayBuffers(key, node.keys[i])
            if (cmpResult <= 0)
                return Pair(cmpResult == 0, i)
        }
        return Pair(false, node.keys.size)
    }
    fun isLeaf(node: Node): Boolean {
        for (subnode in node.subNodeAddresses)
            if (subnode != 0L)
                return false
        return true
    }
    if (node.keys.isEmpty())
        return null
    val (there, where) = locateKey(key, node)
    if (there)
        return node.datas[where]
    else if (isLeaf(node))
        return null
    val nextNode = getNodeAtAddress(field, node.subNodeAddresses[where])
    return bSearch(field, key, nextNode)
 }
--- a/app/src/main/java/xyz/quaver/pupil/receiver/UpdateBroadcastReceiver.kt
+++ b/app/src/main/java/xyz/quaver/pupil/receiver/UpdateBroadcastReceiver.kt
@@ -60,8 +60,10 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {
                            when (uri.scheme) {
                                "file" ->
-                                    FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!)
+                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                                    )
+                                        FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!))
                                    else
                                        uri
                                "content" -> uri
                                else -> null
                            }
@@ -74,7 +76,7 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {
                val notificationManager = NotificationManagerCompat.from(context)
-                val pendingIntent = PendingIntent.getActivity(context, 0, Intent(Intent.ACTION_VIEW).apply {
+                val pendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), 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"))
                }, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_IMMUTABLE else 0)
--- a/app/src/main/java/xyz/quaver/pupil/receiver/WifiDirectBroadcastReceiver.kt
+++ b/app/src/main/java/xyz/quaver/pupil/receiver/WifiDirectBroadcastReceiver.kt
@@ -0,0 +1,64 @@
 package xyz.quaver.pupil.receiver
 import android.Manifest
 import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.wifi.p2p.WifiP2pManager
 import android.os.Build
 import android.os.Parcelable
 import android.util.Log
 import androidx.core.app.ActivityCompat
 import xyz.quaver.pupil.ui.ErrorType
 import xyz.quaver.pupil.ui.TransferStep
 import xyz.quaver.pupil.ui.TransferViewModel
 private inline fun <reified T : Parcelable> Intent.getParcelableExtraCompat(key: String): T? = when {
    Build.VERSION.SDK_INT >= 33 -> getParcelableExtra(key, T::class.java)
    else -> @Suppress("DEPRECATION") getParcelableExtra(key) as? T
 }
 class WifiDirectBroadcastReceiver(
    private val manager: WifiP2pManager,
    private val channel: WifiP2pManager.Channel,
    private val viewModel: TransferViewModel
 ): BroadcastReceiver() {
    @SuppressLint("MissingPermission")
    override fun onReceive(context: Context?, intent: Intent?) {
        context!!
        when (intent?.action) {
            WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION -> {
                val state = intent.getIntExtra(WifiP2pManager.EXTRA_WIFI_STATE, -1)
                Log.d("PUPILD", "Wifi P2P state changed: $state")
                viewModel.setWifiP2pEnabled(state == WifiP2pManager.WIFI_P2P_STATE_ENABLED)
            }
            WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION -> {
                Log.d("PUPILD", "Wifi P2P peers changed")
                manager.requestPeers(channel) { peers ->
                    viewModel.setPeers(peers)
                }
            }
            WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION -> {
                // Respond to new connection or disconnections
                val networkInfo = intent.getParcelableExtraCompat<android.net.NetworkInfo>(WifiP2pManager.EXTRA_NETWORK_INFO)
                Log.d("PUPILD", "Wifi P2P connection changed: $networkInfo ${networkInfo?.isConnected}")
                if (networkInfo?.isConnected == true) {
                    manager.requestConnectionInfo(channel) { info ->
                        viewModel.setConnectionInfo(info)
                    }
                } else {
                    viewModel.setConnectionInfo(null)
                }
            }
            WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION -> {
                // Respond to this device's wifi state changing
                Log.d("PUPILD", "Wifi P2P this device changed")
                viewModel.setThisDevice(intent.getParcelableExtraCompat(WifiP2pManager.EXTRA_WIFI_P2P_DEVICE))
            }
        }
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
@@ -23,13 +23,13 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ServiceInfo
 import android.os.Build
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
 import com.google.common.util.concurrent.RateLimiter
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -101,13 +101,15 @@ class DownloadService : Service() {
        notify(galleryID)
    }
-    @SuppressLint("RestrictedApi")
+    @SuppressLint("RestrictedApi", "MissingPermission")
    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 (!checkNotificationEnabled(this)) return
        if (isCompleted(galleryID)) {
            notification
                .setContentText(getString(R.string.reader_notification_complete))
@@ -166,25 +168,29 @@ class DownloadService : Service() {
        }
    }
    private val rateLimiter = RateLimiter.create(2.0)
    private val rateLimitHost = Regex("..?\\.hitomi.la")
    private val interceptor: PupilInterceptor = { chain ->
        val request = chain.request()
-        var response = chain.proceed(request)
+        var response = kotlin.runCatching {
-        var limit = 5
+            chain.proceed(request)
        }.getOrNull()
        var limit = 10
-        while (!response.isSuccessful) {
+        while (response?.isSuccessful != true) {
-            if (response.code() == 503) {
+            if (response?.code() == 503) {
                Thread.sleep(200)
-            } else if (--limit > 0)
+            } else if (--limit < 0)
                break
-            response = chain.proceed(request)
+            response = kotlin.runCatching {
                chain.proceed(request)
            }.getOrNull()
        }
-        response.newBuilder()
+        if (response == null)
            response = chain.proceed(request)
        response!!.newBuilder()
            .body(response.body()?.let {
                ProgressResponseBody(request.tag(), it, progressListener)
            }).build()
@@ -211,6 +217,7 @@ class DownloadService : Service() {
    private val callback = object: Callback {
        override fun onFailure(call: Call, e: IOException) {
            Log.d("PUPILD", "ONFAILURE ${call.request().tag()}, ${e}")
            FirebaseCrashlytics.getInstance().recordException(e)
            if (e.message?.contains("cancel", true) == false) {
@@ -224,15 +231,11 @@ class DownloadService : Service() {
            CoroutineScope(Dispatchers.IO).launch {
                runCatching {
-                    response.also {
+                    val image = response.also { if (it.code() != 200) throw IOException( "$galleryID $index ${response.request().url()} CODE ${it.code()}" ) }.body()?.use { it.bytes() } ?: throw Exception("Response null")
                        if (it.code() != 200) throw IOException(
                            "$galleryID $index ${response.request().url()} CODE ${it.code()}"
                        )
                    }.body()?.use {
                    val padding = ceil(progress[galleryID]?.size?.let { log10(it.toFloat()) } ?: 0F).toInt()
                    Cache.getInstance(this@DownloadService, galleryID)
-                            .putImage(index, "${index.toString().padStart(padding, '0')}.$ext", it.byteStream())
+                        .putImage(index, "${index.toString().padStart(padding, '0')}.$ext", image)
                    progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
                    notify(galleryID)
@@ -245,7 +248,6 @@ class DownloadService : Service() {
                        startId?.let { stopSelf(it) }
                    }
                    } ?: throw Exception("Response null")
                }.onFailure {
                    FirebaseCrashlytics.getInstance().recordException(it)
                }
@@ -333,8 +335,7 @@ class DownloadService : Service() {
        }
        if (isCompleted(galleryID)) {
-            if (DownloadManager.getInstance(this@DownloadService)
+            if (DownloadManager.getInstance(this@DownloadService).getDownloadFolder(galleryID) != null)
                    .getDownloadFolder(galleryID) != null )
                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
            notificationManager.cancel(galleryID)
@@ -342,7 +343,7 @@ class DownloadService : Service() {
            return@launch
        }
-        notification[galleryID]?.setContentTitle(galleryInfo.title?.ellipsize(30))
+        notification[galleryID]?.setContentTitle(galleryInfo.title.ellipsize(32))
        notify(galleryID)
        val queued = mutableSetOf<Int>()
@@ -404,7 +405,11 @@ class DownloadService : Service() {
    }
    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) {
            startForeground(R.id.downloader_notification_id, serviceNotification.build())
        } else {
            startForeground(R.id.downloader_notification_id, serviceNotification.build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
        }
        when (intent?.getStringExtra(KEY_COMMAND)) {
            COMMAND_DOWNLOAD -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0)
@@ -425,7 +430,11 @@ class DownloadService : Service() {
    override fun onBind(p0: Intent?) = binder
    override fun onCreate() {
        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) {
            startForeground(R.id.downloader_notification_id, serviceNotification.build())
        } else {
            startForeground(R.id.downloader_notification_id, serviceNotification.build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
        }
        interceptors[Tag::class] = interceptor
    }
--- a/app/src/main/java/xyz/quaver/pupil/services/TransferClientService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/TransferClientService.kt
@@ -0,0 +1,128 @@
 package xyz.quaver.pupil.services
 import android.app.Service
 import android.content.Intent
 import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.IBinder
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.ServiceCompat
 import io.ktor.network.selector.SelectorManager
 import io.ktor.network.sockets.aSocket
 import io.ktor.network.sockets.openReadChannel
 import io.ktor.network.sockets.openWriteChannel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeout
 import xyz.quaver.pupil.R
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 class TransferClientService : Service() {
    private val selectorManager = SelectorManager(Dispatchers.IO)
    private val channel = Channel<Pair<TransferPacket, Continuation<TransferPacket>>>()
    private var job: Job? = null
    private fun startForeground() = runCatching {
        val notification = NotificationCompat.Builder(this, "transfer")
            .setContentTitle("Pupil")
            .setContentText("Transfer server is running")
            .setSmallIcon(R.drawable.ic_notification)
            .build()
        ServiceCompat.startForeground(
            this,
            1,
            notification,
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
            } else 0
        )
    }
    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
        val address = intent?.getStringExtra("address") ?: run {
            stopSelf(startId)
            return START_STICKY
        }
        startForeground()
        Log.d("PUPILD", "Starting service with address $address")
        job?.cancel()
        job = CoroutineScope(Dispatchers.IO).launch {
            Log.d("PUPILD", "Connecting to $address")
            val socket = aSocket(selectorManager).tcp().connect(address, 12221)
            Log.d("PUPILD", "Connected to $address")
            val readChannel = socket.openReadChannel()
            val writeChannel = socket.openWriteChannel(autoFlush = true)
            runCatching {
                TransferPacket.Hello().writeToChannel(writeChannel)
                val handshake = TransferPacket.readFromChannel(readChannel)
                if (handshake !is TransferPacket.Hello || handshake.version != TRANSFER_PROTOCOL_VERSION) {
                    throw IllegalStateException("Invalid handshake")
                }
                while (true) {
                    val (packet, continuation) = channel.receive()
                    Log.d("PUPILD", "Sending packet $packet")
                    packet.writeToChannel(writeChannel)
                    val response = TransferPacket.readFromChannel(readChannel).also {
                        Log.d("PUPILD", "Received packet $it")
                    }
                    continuation.resume(response)
                }
            }.onFailure {
                Log.d("PUPILD", "Connection closed with error $it")
                channel.close()
                socket.close()
                stopSelf(startId)
            }
        }
        return START_STICKY
    }
    override fun onDestroy() {
        super.onDestroy()
        job?.cancel()
    }
    inner class Binder: android.os.Binder() {
        @OptIn(DelicateCoroutinesApi::class)
        suspend fun sendPacket(packet: TransferPacket): Result<TransferPacket.ListResponse> = runCatching {
            check(job != null) { "Service not running" }
            check(!channel.isClosedForSend) { "Service not running" }
            val response = suspendCoroutine { continuation ->
                check (channel.trySend(packet to continuation).isSuccess) { "Service not running" }
            }
            check (response is TransferPacket.ListResponse) { "Invalid response" }
            response
        }
    }
    private val binder = Binder()
    override fun onBind(intent: Intent?): IBinder = binder
 }
--- a/app/src/main/java/xyz/quaver/pupil/services/TransferProtocol.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/TransferProtocol.kt
@@ -0,0 +1,94 @@
 package xyz.quaver.pupil.services
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.ByteWriteChannel
 const val TRANSFER_PROTOCOL_VERSION: UByte = 1u
 enum class TransferType(val value: UByte) {
    INVALID(255u),
    HELLO(0u),
    PING(1u),
    PONG(2u),
    LIST_REQUEST(3u),
    LIST_RESPONSE(4u),
 }
 sealed interface TransferPacket {
    val type: TransferType
    suspend fun writeToChannel(channel: ByteWriteChannel)
    data class Hello(val version: UByte = TRANSFER_PROTOCOL_VERSION): TransferPacket {
        override val type = TransferType.HELLO
        override suspend fun writeToChannel(channel: ByteWriteChannel) {
            channel.writeByte(type.value.toByte())
            channel.writeByte(version.toByte())
        }
    }
    data object Ping: TransferPacket {
        override val type = TransferType.PING
        override suspend fun writeToChannel(channel: ByteWriteChannel) {
            channel.writeByte(type.value.toByte())
        }
    }
    data object Pong: TransferPacket {
        override val type = TransferType.PONG
        override suspend fun writeToChannel(channel: ByteWriteChannel) {
            channel.writeByte(type.value.toByte())
        }
    }
    data object ListRequest: TransferPacket {
        override val type = TransferType.LIST_REQUEST
        override suspend fun writeToChannel(channel: ByteWriteChannel) {
            channel.writeByte(type.value.toByte())
        }
    }
    data object Invalid: TransferPacket {
        override val type = TransferType.INVALID
        override suspend fun writeToChannel(channel: ByteWriteChannel) {
            channel.writeByte(type.value.toByte())
        }
    }
    data class ListResponse(
        val favoritesCount: Int,
        val historyCount: Int,
        val downloadsCount: Int,
    ): TransferPacket {
        override val type = TransferType.LIST_RESPONSE
        override suspend fun writeToChannel(channel: ByteWriteChannel) {
            channel.writeByte(type.value.toByte())
            channel.writeInt(favoritesCount)
            channel.writeInt(historyCount)
            channel.writeInt(downloadsCount)
        }
    }
    companion object {
        suspend fun readFromChannel(channel: ByteReadChannel): TransferPacket {
            return when(val type = channel.readByte().toUByte()) {
                TransferType.HELLO.value -> {
                    val version = channel.readByte().toUByte()
                    Hello(version)
                }
                TransferType.PING.value -> Ping
                TransferType.PONG.value -> Pong
                TransferType.LIST_REQUEST.value -> ListRequest
                TransferType.LIST_RESPONSE.value -> {
                    val favoritesCount = channel.readInt()
                    val historyCount = channel.readInt()
                    val downloadsCount = channel.readInt()
                    ListResponse(favoritesCount, historyCount, downloadsCount)
                }
                else -> throw IllegalArgumentException("Unknown packet type: $type")
            }
        }
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/services/TransferServerService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/TransferServerService.kt
@@ -0,0 +1,123 @@
 package xyz.quaver.pupil.services
 import android.app.Service
 import android.content.Intent
 import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.IBinder
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.ServiceCompat
 import io.ktor.network.selector.SelectorManager
 import io.ktor.network.sockets.ServerSocket
 import io.ktor.network.sockets.Socket
 import io.ktor.network.sockets.aSocket
 import io.ktor.network.sockets.openReadChannel
 import io.ktor.network.sockets.openWriteChannel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.util.downloader.DownloadManager
 class TransferServerService : Service() {
    private val selectorManager = SelectorManager(Dispatchers.IO)
    private var serverSocket: ServerSocket? = null
    private val job = Job()
    private fun startForeground() = runCatching {
        val notification = NotificationCompat.Builder(this, "transfer")
            .setContentTitle("Pupil")
            .setContentText("Transfer server is running")
            .setSmallIcon(R.drawable.ic_notification)
            .build()
        ServiceCompat.startForeground(
            this,
            1,
            notification,
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
            } else 0
        )
    }
    private fun generateListResponse(): TransferPacket.ListResponse {
        val favoritesCount = favorites.size
        val historyCount = histories.size
        val downloadsCount = DownloadManager.getInstance(this).downloadFolderMap.size
        return TransferPacket.ListResponse(favoritesCount, historyCount, downloadsCount)
    }
    private suspend fun handleConnection(socket: Socket) {
        val readChannel = socket.openReadChannel()
        val writeChannel = socket.openWriteChannel(autoFlush = true)
        runCatching {
            while (true) {
                val packet = TransferPacket.readFromChannel(readChannel)
                Log.d("PUPILD", "Received packet $packet")
                binder.channel.trySend(packet)
                val response = when (packet) {
                    is TransferPacket.Hello -> TransferPacket.Hello()
                    is TransferPacket.Ping -> TransferPacket.Pong
                    is TransferPacket.ListRequest -> generateListResponse()
                    else -> TransferPacket.Invalid
                }
                response.writeToChannel(writeChannel)
            }
        }.onFailure {
            socket.close()
        }
    }
    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
        val address = intent?.getStringExtra("address") ?: run {
            stopSelf(startId)
            return START_STICKY
        }
        if (serverSocket != null) {
            return START_STICKY
        }
        startForeground()
        val serverSocket = aSocket(selectorManager).tcp().bind(address, 12221).also {
            this@TransferServerService.serverSocket = it
        }
        CoroutineScope(Dispatchers.IO + job).launch {
            while (true) {
                Log.d("PUPILD", "Waiting for connection")
                val socket = serverSocket.accept()
                Log.d("PUPILD", "Accepted connection from ${socket.remoteAddress}")
                launch { handleConnection(socket) }
            }
        }
        return START_STICKY
    }
    override fun onDestroy() {
        super.onDestroy()
        job.cancel()
        serverSocket?.close()
    }
    inner class Binder: android.os.Binder() {
        val channel = Channel<TransferPacket>()
    }
    private val binder = Binder()
    override fun onBind(intent: Intent?): IBinder = binder
 }
--- a/app/src/main/java/xyz/quaver/pupil/types/SendLogException.kt
+++ b/app/src/main/java/xyz/quaver/pupil/types/SendLogException.kt
@@ -19,3 +19,4 @@
 package xyz.quaver.pupil.types
 class SendLogException : Exception()
 class JavascriptException(message: String?) : Exception(message)
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -25,34 +25,56 @@ import android.os.Build
 import android.os.Bundle
 import android.text.InputType
 import android.text.util.Linkify
 import android.util.Log
 import android.view.KeyEvent
 import android.view.MenuItem
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.widget.EditText
 import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
 import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 import kotlinx.coroutines.withTimeoutOrNull
 import xyz.quaver.floatingsearchview.FloatingSearchView
 import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
 import xyz.quaver.floatingsearchview.util.view.MenuView
 import xyz.quaver.floatingsearchview.util.view.SearchInputView
-import xyz.quaver.pupil.hitomi.doSearch
+import xyz.quaver.pupil.R
 import xyz.quaver.pupil.hitomi.getGalleryIDsFromNozomi
 import xyz.quaver.pupil.hitomi.getSuggestionsForQuery
 import xyz.quaver.pupil.*
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.databinding.MainActivityBinding
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.hitomi.SortMode
 import xyz.quaver.pupil.hitomi.doSearch
 import xyz.quaver.pupil.hitomi.getSuggestionsForQuery
 import xyz.quaver.pupil.searchHistory
 import xyz.quaver.pupil.services.DownloadService
-import xyz.quaver.pupil.types.*
+import xyz.quaver.pupil.types.FavoriteHistorySwitch
 import xyz.quaver.pupil.types.LoadingSuggestion
 import xyz.quaver.pupil.types.NoResultSuggestion
 import xyz.quaver.pupil.types.Suggestion
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.types.TagSuggestion
 import xyz.quaver.pupil.ui.dialog.DownloadLocationDialogFragment
 import xyz.quaver.pupil.ui.dialog.GalleryDialog
 import xyz.quaver.pupil.ui.view.MainView
@@ -62,14 +84,28 @@ import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.checkUpdate
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.requestNotificationPermission
 import xyz.quaver.pupil.util.restore
 import xyz.quaver.pupil.util.showNotificationPermissionExplanationDialog
 import java.util.regex.Pattern
-import kotlin.math.*
+import kotlin.math.ceil
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
 val sortModeLookup = mapOf(
    R.id.main_menu_sort_date_added to SortMode.DATE_ADDED,
    R.id.main_menu_sort_date_published to SortMode.DATE_PUBLISHED,
    R.id.main_menu_sort_popular_today to SortMode.POPULAR_TODAY,
    R.id.main_menu_sort_popular_week to SortMode.POPULAR_WEEK,
    R.id.main_menu_sort_popular_month to SortMode.POPULAR_MONTH,
    R.id.main_menu_sort_popular_year to SortMode.POPULAR_YEAR,
    R.id.main_menu_sort_random to SortMode.RANDOM
 )
 class MainActivity :
    BaseActivity(),
-    NavigationView.OnNavigationItemSelectedListener
+    NavigationView.OnNavigationItemSelectedListener {
 {
    enum class Mode {
        SEARCH,
@@ -78,10 +114,6 @@ class MainActivity :
        FAVORITE
    }
    enum class SortMode {
        NEWEST,
        POPULAR
    }
    private val galleries = ArrayList<Int>()
@@ -96,7 +128,7 @@ class MainActivity :
    private var queryStack = mutableListOf<String>()
    private var mode = Mode.SEARCH
-    private var sortMode = SortMode.NEWEST
+    private var sortMode = SortMode.DATE_ADDED
    private var galleryIDs: Deferred<List<Int>>? = null
    private var totalItems = 0
@@ -105,6 +137,13 @@ class MainActivity :
    private lateinit var binding: MainActivityBinding
    private val requestNotificationPermssionLauncher =
        registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
            if (!isGranted) {
                showNotificationPermissionExplanationDialog(this)
            }
        }
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        binding = MainActivityBinding.inflate(layoutInflater)
@@ -114,28 +153,43 @@ class MainActivity :
            intent.dataString?.let { url ->
                restore(url,
                    onFailure = {
-                        Snackbar.make(binding.contents.recyclerview, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
+                        Snackbar.make(
                            binding.contents.recyclerview,
                            R.string.settings_backup_failed,
                            Snackbar.LENGTH_LONG
                        ).show()
                    }, onSuccess = {
-                        Snackbar.make(binding.contents.recyclerview, getString(R.string.settings_restore_success, it.size), Snackbar.LENGTH_LONG).show()
+                        Snackbar.make(
                            binding.contents.recyclerview,
                            getString(R.string.settings_restore_success, it),
                            Snackbar.LENGTH_LONG
                        ).show()
                    }
                )
            }
        }
        requestNotificationPermission(this, requestNotificationPermssionLauncher, false) {}
        if (Preferences["download_folder", ""].isEmpty())
-            DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
+            DownloadLocationDialogFragment().show(
                supportFragmentManager,
                "Download Location Dialog"
            )
-
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !Preferences["download_folder_ignore_warning", false] &&
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
+            ContextCompat.getExternalFilesDirs(this, null).filterNotNull()
-            !Preferences["download_folder_ignore_warning", false] &&
+                .map { Uri.fromFile(it).toString() }
            ContextCompat.getExternalFilesDirs(this, null).filterNotNull().map { Uri.fromFile(it).toString() }
                .contains(Preferences["download_folder", ""])
        ) {
            AlertDialog.Builder(this)
                .setTitle(R.string.warning)
                .setMessage(R.string.unaccessible_download_folder)
                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
+                    DownloadLocationDialogFragment().show(
                        supportFragmentManager,
                        "Download Location Dialog"
                    )
                }.setNegativeButton(R.string.ignore) { _, _ ->
                    Preferences["download_folder_ignore_warning"] = true
                }.show()
@@ -150,10 +204,12 @@ class MainActivity :
        checkUpdate(this)
    }
    @OptIn(ExperimentalStdlibApi::class)
    override fun onBackPressed() {
        when {
-            binding.drawer.isDrawerOpen(GravityCompat.START) -> binding.drawer.closeDrawer(GravityCompat.START)
+            binding.drawer.isDrawerOpen(GravityCompat.START) -> binding.drawer.closeDrawer(
                GravityCompat.START
            )
            queryStack.removeLastOrNull() != null && queryStack.isNotEmpty() -> runOnUiThread {
                query = queryStack.last()
@@ -162,6 +218,7 @@ class MainActivity :
                fetchGalleries(query, sortMode)
                loadBlocks()
            }
            else -> super.onBackPressed()
        }
    }
@@ -176,7 +233,7 @@ class MainActivity :
        val perPage = Preferences["per_page", "25"].toInt()
        val maxPage = ceil(totalItems / perPage.toDouble()).roundToInt()
-        return when(keyCode) {
+        return when (keyCode) {
            KeyEvent.KEYCODE_VOLUME_UP -> {
                if (currentPage > 0) {
                    runOnUiThread {
@@ -191,6 +248,7 @@ class MainActivity :
                true
            }
            KeyEvent.KEYCODE_VOLUME_DOWN -> {
                if (currentPage < maxPage) {
                    runOnUiThread {
@@ -205,12 +263,13 @@ class MainActivity :
                true
            }
            else -> super.onKeyDown(keyCode, event)
        }
    }
    private fun initView() {
-        binding.contents.recyclerview.addOnScrollListener(object: RecyclerView.OnScrollListener() {
+        binding.contents.recyclerview.addOnScrollListener(object : RecyclerView.OnScrollListener() {
            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                // -height of the search view < translationY < 0
                binding.contents.searchview.translationY =
@@ -218,7 +277,8 @@ class MainActivity :
                        max(
                            binding.contents.searchview.translationY - dy,
                            -binding.contents.searchview.binding.querySection.root.height.toFloat()
-                    ), 0F)
+                        ), 0F
                    )
                if (dy > 0)
                    binding.contents.fab.hideMenuButton(true)
@@ -227,7 +287,12 @@ class MainActivity :
            }
        })
-        Linkify.addLinks(binding.contents.noresult, Pattern.compile(getString(R.string.https_text)), null, null, { _, _ -> getString(R.string.https) })
+        Linkify.addLinks(
            binding.contents.noresult,
            Pattern.compile(getString(R.string.https_text)),
            null,
            null,
            { _, _ -> getString(R.string.https) })
        //NavigationView
        binding.navView.setNavigationItemSelectedListener(this)
@@ -248,14 +313,17 @@ class MainActivity :
                AlertDialog.Builder(context).apply {
                    setView(editText)
                    setTitle(R.string.main_jump_title)
-                    setMessage(getString(
+                    setMessage(
                        getString(
                            R.string.main_jump_message,
-                        currentPage+1,
+                            currentPage + 1,
                            ceil(totalItems / perPage.toDouble()).roundToInt()
-                    ))
+                        )
                    )
                    setPositiveButton(android.R.string.ok) { _, _ ->
-                        currentPage = (editText.text.toString().toIntOrNull() ?: return@setPositiveButton)-1
+                        currentPage =
                            (editText.text.toString().toIntOrNull() ?: return@setPositiveButton) - 1
                        runOnUiThread {
                            cancelFetch()
@@ -309,7 +377,8 @@ class MainActivity :
                    setTitle(R.string.main_open_gallery_by_id)
                    setPositiveButton(android.R.string.ok) { _, _ ->
-                        val galleryID = editText.text.toString().toIntOrNull() ?: return@setPositiveButton
+                        val galleryID =
                            editText.text.toString().toIntOrNull() ?: return@setPositiveButton
                        GalleryDialog(this@MainActivity, galleryID).apply {
                            onChipClickedHandler.add {
@@ -331,7 +400,7 @@ class MainActivity :
        }
        with(binding.contents.view) {
-            setOnPageTurnListener(object: MainView.OnPageTurnListener {
+            setOnPageTurnListener(object : MainView.OnPageTurnListener {
                override fun onPrev(page: Int) {
                    currentPage--
@@ -392,13 +461,19 @@ class MainActivity :
                onDownloadClickedHandler = { position ->
                    val galleryID = galleries[position]
-                    if (DownloadManager.getInstance(context).isDownloading(galleryID)) {     //download in progress
+                    requestNotificationPermission(
                        this@MainActivity,
                        requestNotificationPermssionLauncher
                    ) {
                        if (DownloadManager.getInstance(context)
                                .isDownloading(galleryID)
                        ) {     //download in progress
                            DownloadService.cancel(this@MainActivity, galleryID)
-                    }
+                        } else {
                    else {
                            DownloadManager.getInstance(context).addDownloadFolder(galleryID)
                            DownloadService.download(this@MainActivity, galleryID)
                        }
                    }
                    closeAllItems()
                }
@@ -467,6 +542,7 @@ class MainActivity :
                    TagSuggestion(it.tag, -1, "", it.area ?: "tag")
                } + FavoriteHistorySwitch(getString(R.string.search_show_histories))
            }
            else -> {
                searchHistory.map {
                    Suggestion(it)
@@ -474,10 +550,27 @@ class MainActivity :
            }
        }.reversed()
-    private var suggestionJob : Job? = null
+    private var suggestionJob: Job? = null
    private fun setupSearchBar() {
        with(binding.contents.searchview) {
-            onMenuStatusChangeListener = object: FloatingSearchView.OnMenuStatusChangeListener {
+            val scrollSuggestionToTop = {
                with(binding.suggestionSection.suggestionsList) {
                    MainScope().launch {
                        withTimeout(1000) {
                            val layoutManager = layoutManager as LinearLayoutManager
                            while (layoutManager.findLastVisibleItemPosition() != adapter?.itemCount?.minus(
                                    1
                                )
                            ) {
                                layoutManager.scrollToPosition(adapter?.itemCount?.minus(1) ?: 0)
                                delay(100)
                            }
                        }
                    }
                }
            }
            onMenuStatusChangeListener = object : FloatingSearchView.OnMenuStatusChangeListener {
                override fun onMenuOpened() {
                    (this@MainActivity.binding.contents.recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
                }
@@ -502,6 +595,7 @@ class MainActivity :
            onFavoriteHistorySwitchClickListener = {
                isFavorite = !isFavorite
                swapSuggestions(defaultSuggestions)
                scrollSuggestionToTop()
            }
            onMenuItemClickListener = {
@@ -515,6 +609,7 @@ class MainActivity :
                if (query.isEmpty() or query.endsWith(' ')) {
                    swapSuggestions(defaultSuggestions)
                    scrollSuggestionToTop()
                    return@lambda
                }
@@ -527,7 +622,8 @@ class MainActivity :
                suggestionJob = CoroutineScope(Dispatchers.IO).launch {
                    val suggestions = kotlin.runCatching {
-                        getSuggestionsForQuery(currentQuery).map { TagSuggestion(it) }.toMutableList()
+                        getSuggestionsForQuery(currentQuery).map { TagSuggestion(it) }
                            .toMutableList()
                    }.getOrElse { mutableListOf() }
                    suggestions.filter {
@@ -539,15 +635,21 @@ class MainActivity :
                    }
                    withContext(Dispatchers.Main) {
-                        swapSuggestions(if (suggestions.isNotEmpty()) suggestions else listOf(NoResultSuggestion(getText(R.string.main_no_result).toString())))
+                        swapSuggestions(
                            if (suggestions.isNotEmpty()) suggestions else listOf(
                                NoResultSuggestion(getText(R.string.main_no_result).toString())
                            )
                        )
                    }
                }
            }
-            onFocusChangeListener = object: FloatingSearchView.OnFocusChangeListener {
+            onFocusChangeListener = object : FloatingSearchView.OnFocusChangeListener {
                override fun onFocus() {
-                    if (query.isEmpty() or query.endsWith(' '))
+                    if (query.isEmpty() or query.endsWith(' ')) {
                        swapSuggestions(defaultSuggestions)
                        scrollSuggestionToTop()
                    }
                }
                override fun onFocusCleared() {
@@ -568,8 +670,14 @@ class MainActivity :
    }
    fun onActionMenuItemSelected(item: MenuItem?) {
-        when(item?.itemId) {
+        when (item?.itemId) {
-            R.id.main_menu_settings -> startActivity(Intent(this@MainActivity, SettingsActivity::class.java))
+            R.id.main_menu_settings -> startActivity(
                Intent(
                    this@MainActivity,
                    SettingsActivity::class.java
                )
            )
            R.id.main_menu_thin -> {
                val thin = !item.isChecked
@@ -584,21 +692,15 @@ class MainActivity :
                    adapter = adapter       // Force to redraw
                }
            }
            R.id.main_menu_sort_newest -> {
                sortMode = SortMode.NEWEST
                item.isChecked = true
-                runOnUiThread {
+            R.id.main_menu_sort_date_added,
-                    currentPage = 0
+            R.id.main_menu_sort_date_published,
-
+            R.id.main_menu_sort_popular_today,
-                    cancelFetch()
+            R.id.main_menu_sort_popular_week,
-                    clearGalleries()
+            R.id.main_menu_sort_popular_month,
-                    fetchGalleries(query, sortMode)
+            R.id.main_menu_sort_popular_year,
-                    loadBlocks()
+            R.id.main_menu_sort_random -> {
-                }
+                sortMode = sortModeLookup[item.itemId]!!
            }
            R.id.main_menu_sort_popular -> {
                sortMode = SortMode.POPULAR
                item.isChecked = true
                runOnUiThread {
@@ -617,7 +719,7 @@ class MainActivity :
        runOnUiThread {
            binding.drawer.closeDrawers()
-            when(item.itemId) {
+            when (item.itemId) {
                R.id.main_drawer_home -> {
                    cancelFetch()
                    clearGalleries()
@@ -628,6 +730,7 @@ class MainActivity :
                    fetchGalleries(query, sortMode)
                    loadBlocks()
                }
                R.id.main_drawer_history -> {
                    cancelFetch()
                    clearGalleries()
@@ -638,6 +741,7 @@ class MainActivity :
                    fetchGalleries(query, sortMode)
                    loadBlocks()
                }
                R.id.main_drawer_downloads -> {
                    cancelFetch()
                    clearGalleries()
@@ -648,6 +752,7 @@ class MainActivity :
                    fetchGalleries(query, sortMode)
                    loadBlocks()
                }
                R.id.main_drawer_favorite -> {
                    cancelFetch()
                    clearGalleries()
@@ -658,20 +763,35 @@ class MainActivity :
                    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))))
+                    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))))
+                    startActivity(
                        Intent(
                            Intent.ACTION_VIEW,
                            Uri.parse(getString(R.string.discord))
                        )
                    )
                }
            }
        }
@@ -709,7 +829,8 @@ class MainActivity :
        }
        if (query.isNotEmpty() && mode != Mode.SEARCH) {
-            Snackbar.make(binding.contents.recyclerview, R.string.search_all, Snackbar.LENGTH_SHORT).apply {
+            Snackbar.make(binding.contents.recyclerview, R.string.search_all, Snackbar.LENGTH_SHORT)
                .apply {
                    setAction(android.R.string.ok) {
                        cancelFetch()
                        clearGalleries()
@@ -728,22 +849,16 @@ class MainActivity :
            return
        galleryIDs = CoroutineScope(Dispatchers.IO).async {
-            when(mode) {
+            when (mode) {
                Mode.SEARCH -> {
-                    when {
+                    doSearch(
-                        query.isEmpty() and defaultQuery.isEmpty() -> {
+                        "$defaultQuery $query",
-                            when(sortMode) {
+                        sortMode
-                                SortMode.POPULAR -> getGalleryIDsFromNozomi(null, "popular", "all")
+                    ).also {
                                else -> getGalleryIDsFromNozomi(null, "index", "all")
                            }.also {
                        totalItems = it.size
                    }
                }
-                        else -> doSearch("$defaultQuery $query", sortMode == SortMode.POPULAR).also {
+
                            totalItems = it.size
                        }
                    }
                }
                Mode.HISTORY -> {
                    when {
                        query.isEmpty() -> {
@@ -751,36 +866,42 @@ class MainActivity :
                                totalItems = it.size
                            }
                        }
                        else -> {
-                            val result = doSearch(query).sorted()
+                            val result = doSearch(query, SortMode.DATE_ADDED).sorted()
                            histories.reversed().filter { result.binarySearch(it) >= 0 }.also {
                                totalItems = it.size
                            }
                        }
                    }
                }
                Mode.DOWNLOAD -> {
-                    val downloads = DownloadManager.getInstance(this@MainActivity).downloadFolderMap.keys.toList()
+                    val downloads =
                        DownloadManager.getInstance(this@MainActivity).downloadFolderMap.keys.toList()
                    when {
                        query.isEmpty() -> downloads.reversed().also {
                            totalItems = it.size
                        }
                        else -> {
-                            val result = doSearch(query).sorted()
+                            val result = doSearch(query, SortMode.DATE_ADDED).sorted()
                            downloads.reversed().filter { result.binarySearch(it) >= 0 }.also {
                                totalItems = it.size
                            }
                        }
                    }
                }
                Mode.FAVORITE -> {
                    when {
                        query.isEmpty() -> favorites.reversed().also {
                            totalItems = it.size
                        }
                        else -> {
-                            val result = doSearch(query).sorted()
+                            val result = doSearch(query, SortMode.DATE_ADDED).sorted()
                            favorites.reversed().filter { result.binarySearch(it) >= 0 }.also {
                                totalItems = it.size
                            }
@@ -813,10 +934,18 @@ class MainActivity :
            }
            launch(Dispatchers.Main) {
-                binding.contents.view.setCurrentPage(currentPage + 1, galleryIDs.size > (currentPage+1)*perPage)
+                binding.contents.view.setCurrentPage(
                    currentPage + 1,
                    galleryIDs.size > (currentPage + 1) * perPage
                )
            }
-            galleryIDs.slice(currentPage*perPage until min(currentPage*perPage+perPage, galleryIDs.size)).chunked(5).let { chunks ->
+            galleryIDs.slice(
                currentPage * perPage until min(
                    currentPage * perPage + perPage,
                    galleryIDs.size
                )
            ).chunked(5).let { chunks ->
                for (chunk in chunks)
                    chunk.map { galleryID ->
                        async {
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -57,9 +57,12 @@ import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.camera
 import xyz.quaver.pupil.util.checkNotificationEnabled
 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.requestNotificationPermission
 import xyz.quaver.pupil.util.showNotificationPermissionExplanationDialog
 import xyz.quaver.pupil.util.startCamera
 class ReaderActivity : BaseActivity() {
@@ -117,6 +120,12 @@ class ReaderActivity : BaseActivity() {
    private lateinit var binding: ReaderActivityBinding
    private val requestNotificationPermssionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
        if (!isGranted) {
            showNotificationPermissionExplanationDialog(this)
        }
    }
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        binding = ReaderActivityBinding.inflate(layoutInflater)
@@ -148,10 +157,11 @@ class ReaderActivity : BaseActivity() {
            val uri = intent.data
            val lastPathSegment = uri?.lastPathSegment
            if (uri != null && lastPathSegment != null) {
-                galleryID = when (uri.host) {
+                galleryID = if (uri.host?.endsWith("hasha.in") == true) {
                    lastPathSegment?.toInt() ?: 0
                } else when (uri.host) {
                    "hitomi.la" ->
                        Regex("([0-9]+).html").find(lastPathSegment)?.groupValues?.get(1)?.toIntOrNull() ?: 0
                    "hiyobi.me" -> lastPathSegment.toInt()
                    "e-hentai.org" -> uri.pathSegments[1].toInt()
                    else -> 0
                }
@@ -360,6 +370,10 @@ class ReaderActivity : BaseActivity() {
            animateDownloadFAB(DownloadManager.getInstance(this@ReaderActivity).getDownloadFolder(galleryID) != null) //If download in progress, animate button
            setOnClickListener {
                requestNotificationPermission(
                    this@ReaderActivity,
                    requestNotificationPermssionLauncher
                ) {
                    val downloadManager = DownloadManager.getInstance(this@ReaderActivity)
                    if (downloadManager.isDownloading(galleryID)) {
@@ -372,6 +386,7 @@ class ReaderActivity : BaseActivity() {
                    }
                }
            }
        }
        with(binding.retryFab) {
            setImageResource(R.drawable.refresh)
--- a/app/src/main/java/xyz/quaver/pupil/ui/TransferActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/TransferActivity.kt
@@ -0,0 +1,382 @@
 package xyz.quaver.pupil.ui
 import android.Manifest
 import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.ComponentName
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.ServiceConnection
 import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
 import android.net.wifi.WpsInfo
 import android.net.wifi.p2p.WifiP2pConfig
 import android.net.wifi.p2p.WifiP2pDevice
 import android.net.wifi.p2p.WifiP2pDeviceList
 import android.net.wifi.p2p.WifiP2pInfo
 import android.net.wifi.p2p.WifiP2pManager
 import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.commit
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.consumeEach
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.receiver.WifiDirectBroadcastReceiver
 import xyz.quaver.pupil.services.TransferClientService
 import xyz.quaver.pupil.services.TransferPacket
 import xyz.quaver.pupil.services.TransferServerService
 import xyz.quaver.pupil.ui.fragment.TransferConnectedFragment
 import xyz.quaver.pupil.ui.fragment.TransferDirectionFragment
 import xyz.quaver.pupil.ui.fragment.TransferPermissionFragment
 import xyz.quaver.pupil.ui.fragment.TransferSelectDataFragment
 import xyz.quaver.pupil.ui.fragment.TransferTargetFragment
 import xyz.quaver.pupil.ui.fragment.TransferWaitForConnectionFragment
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
 class TransferActivity : AppCompatActivity(R.layout.transfer_activity) {
    private val viewModel: TransferViewModel by viewModels()
    private val intentFilter = IntentFilter().apply {
        addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION)
        addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION)
        addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION)
        addAction(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION)
    }
    private lateinit var manager: WifiP2pManager
    private lateinit var channel: WifiP2pManager.Channel
    private var receiver: BroadcastReceiver? = null
    private val requestPermissionLauncher = registerForActivityResult(
        ActivityResultContracts.RequestPermission()
    ) { granted ->
        if (granted) {
            viewModel.setStep(TransferStep.TARGET)
        } else {
            viewModel.setStep(TransferStep.PERMISSION)
        }
    }
    private var clientServiceBinder: TransferClientService.Binder? = null
    private val clientServiceConnection = object : ServiceConnection {
        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
            clientServiceBinder = service as TransferClientService.Binder
        }
        override fun onServiceDisconnected(name: ComponentName?) {
            clientServiceBinder = null
        }
    }
    private fun checkPermission(force: Boolean = false): Boolean {
        val permissionRequired = if (VERSION.SDK_INT < VERSION_CODES.TIRAMISU) {
            Manifest.permission.ACCESS_FINE_LOCATION
        } else {
            Manifest.permission.NEARBY_WIFI_DEVICES
        }
        val permissionGranted =
            ActivityCompat.checkSelfPermission(this, permissionRequired) == PackageManager.PERMISSION_GRANTED
        val shouldShowRationale =
            ActivityCompat.shouldShowRequestPermissionRationale(this, permissionRequired)
        if (!permissionGranted) {
            if (shouldShowRationale && force) {
                viewModel.setStep(TransferStep.PERMISSION)
            } else {
                requestPermissionLauncher.launch(permissionRequired)
            }
            return false
        }
        return true
    }
    private fun handleServerResponse(response: TransferPacket?) {
        when (response) {
            is TransferPacket.ListResponse -> {
                Log.d("PUPILD", "Received list response $response")
            }
            else -> {
                Log.d("PUPILD", "Received invalid response $response")
            }
        }
    }
    private suspend fun WifiP2pManager.disconnect() {
        suspendCoroutine { continuation ->
            removeGroup(channel, object : WifiP2pManager.ActionListener {
                override fun onSuccess() {
                    continuation.resume(Unit)
                }
                override fun onFailure(reason: Int) {
                    continuation.resume(Unit)
                }
            })
        }
        suspendCoroutine { continuation ->
            cancelConnect(channel, object: WifiP2pManager.ActionListener {
                override fun onSuccess() {
                    continuation.resume(Unit)
                }
                override fun onFailure(reason: Int) {
                    continuation.resume(Unit)
                }
            })
        }
    }
    @SuppressLint("SourceLockedOrientationActivity")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        supportActionBar?.hide()
        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
        manager = getSystemService(WIFI_P2P_SERVICE) as WifiP2pManager
        channel = manager.initialize(this, mainLooper, null)
        viewModel.peerToConnect.observe(this) { peer ->
            if (peer == null) { return@observe }
            if (!checkPermission()) { return@observe }
            val config = WifiP2pConfig().apply {
                deviceAddress = peer.deviceAddress
                wps.setup = WpsInfo.PBC
            }
            manager.connect(channel, config, object: WifiP2pManager.ActionListener {
                override fun onSuccess() { }
                override fun onFailure(reason: Int) {
                    viewModel.connect(null)
                }
            })
        }
        lifecycleScope.launch {
            viewModel.messageQueue.consumeEach {
                clientServiceBinder?.sendPacket(it)?.getOrNull()?.let(::handleServerResponse)
            }
        }
        lifecycleScope.launch {
            viewModel.step.flowWithLifecycle(lifecycle, Lifecycle.State.STARTED).collectLatest step@{ step ->
                when (step) {
                    TransferStep.TARGET,
                    TransferStep.TARGET_FORCE -> {
                        if (!checkPermission(step == TransferStep.TARGET_FORCE)) {
                            return@step
                        }
                        manager.discoverPeers(channel, object: WifiP2pManager.ActionListener {
                            override fun onSuccess() { }
                            override fun onFailure(reason: Int) {
                            }
                        })
                        supportFragmentManager.commit(true) {
                            replace(R.id.fragment_container_view, TransferTargetFragment())
                        }
                        val hostAddress = viewModel.connectionInfo.filterNotNull().first {
                            it.groupFormed
                        }.groupOwnerAddress.hostAddress
                        val intent = Intent(this@TransferActivity, TransferClientService::class.java).also {
                            it.putExtra("address", hostAddress)
                        }
                        ContextCompat.startForegroundService(this@TransferActivity, intent)
                        bindService(intent, clientServiceConnection, BIND_AUTO_CREATE)
                        viewModel.setStep(TransferStep.SELECT_DATA)
                    }
                    TransferStep.DIRECTION -> {
                        manager.disconnect()
                        supportFragmentManager.commit(true) {
                            replace(R.id.fragment_container_view, TransferDirectionFragment())
                        }
                    }
                    TransferStep.PERMISSION -> {
                        supportFragmentManager.commit(true) {
                            replace(R.id.fragment_container_view, TransferPermissionFragment())
                        }
                    }
                    TransferStep.WAIT_FOR_CONNECTION -> {
                        Log.d("PUPILD", "wait for connection")
                        if (!checkPermission()) { return@step }
                        runCatching {
                            suspendCoroutine { continuation ->
                                manager.createGroup(channel, object: WifiP2pManager.ActionListener {
                                    override fun onSuccess() {
                                        continuation.resume(Unit)
                                    }
                                    override fun onFailure(reason: Int) {
                                        continuation.resumeWithException(Exception("Failed to create group $reason"))
                                    }
                                })
                            }
                            supportFragmentManager.commit(true) {
                                replace(R.id.fragment_container_view, TransferWaitForConnectionFragment())
                            }
                            val address = viewModel.connectionInfo.filterNotNull().first {
                                it.groupFormed && it.isGroupOwner
                            }.groupOwnerAddress.hostAddress
                            val intent = Intent(this@TransferActivity, TransferServerService::class.java).also {
                                it.putExtra("address", address)
                            }
                            ContextCompat.startForegroundService(this@TransferActivity, intent)
                            val binder: TransferServerService.Binder = suspendCoroutine { continuation ->
                                bindService(intent, object: ServiceConnection {
                                    override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
                                        continuation.resume(service as TransferServerService.Binder)
                                    }
                                    override fun onServiceDisconnected(name: ComponentName?) { }
                                }, BIND_AUTO_CREATE)
                            }
                            binder.channel.receive()
                            viewModel.setStep(TransferStep.CONNECTED)
                        }.onFailure {
                            Log.e("PUPILD", "Failed to create group", it)
                        }
                        supportFragmentManager.commit(true) {
                            replace(R.id.fragment_container_view, TransferWaitForConnectionFragment())
                        }
                    }
                    TransferStep.CONNECTED -> {
                        supportFragmentManager.commit(true) {
                            replace(R.id.fragment_container_view, TransferConnectedFragment())
                        }
                    }
                    TransferStep.SELECT_DATA -> {
                        supportFragmentManager.commit(true) {
                            replace(R.id.fragment_container_view, TransferSelectDataFragment())
                        }
                    }
                }
            }
        }
    }
    override fun onResume() {
        super.onResume()
        bindService(Intent(this, TransferClientService::class.java), clientServiceConnection, BIND_AUTO_CREATE)
        WifiDirectBroadcastReceiver(manager, channel, viewModel).also {
            receiver = it
            registerReceiver(it, intentFilter)
        }
    }
    override fun onPause() {
        super.onPause()
        unbindService(clientServiceConnection)
        receiver?.let { unregisterReceiver(it) }
        receiver = null
    }
 }
 enum class TransferStep {
    TARGET, TARGET_FORCE, DIRECTION, PERMISSION, WAIT_FOR_CONNECTION, CONNECTED, SELECT_DATA
 }
 enum class ErrorType {
 }
 class TransferViewModel : ViewModel() {
    private val _step: MutableStateFlow<TransferStep> = MutableStateFlow(TransferStep.DIRECTION)
    val step: StateFlow<TransferStep> = _step
    private val _error = MutableLiveData<ErrorType?>(null)
    val error: LiveData<ErrorType?> = _error
    private val _wifiP2pEnabled: MutableLiveData<Boolean> = MutableLiveData(false)
    val wifiP2pEnabled: LiveData<Boolean> = _wifiP2pEnabled
    private val _thisDevice: MutableLiveData<WifiP2pDevice?> = MutableLiveData(null)
    val thisDevice: LiveData<WifiP2pDevice?> = _thisDevice
    private val _peers: MutableLiveData<WifiP2pDeviceList?> = MutableLiveData(null)
    val peers: LiveData<WifiP2pDeviceList?> = _peers
    private val _connectionInfo: MutableStateFlow<WifiP2pInfo?> = MutableStateFlow(null)
    val connectionInfo: StateFlow<WifiP2pInfo?> = _connectionInfo
    private val _peerToConnect: MutableLiveData<WifiP2pDevice?> = MutableLiveData(null)
    val peerToConnect: LiveData<WifiP2pDevice?> = _peerToConnect
    val messageQueue: Channel<TransferPacket> = Channel()
    fun setStep(step: TransferStep) {
        Log.d("PUPILD", "Set step: $step")
        _step.value = step
    }
    fun setWifiP2pEnabled(enabled: Boolean) {
        _wifiP2pEnabled.value = enabled
    }
    fun setThisDevice(device: WifiP2pDevice?) {
        _thisDevice.value = device
    }
    fun setPeers(peers: WifiP2pDeviceList?) {
        _peers.value = peers
    }
    fun setConnectionInfo(info: WifiP2pInfo?) {
        _connectionInfo.value = info
    }
    fun setError(error: ErrorType?) {
        _error.value = error
    }
    fun connect(device: WifiP2pDevice?) {
        _peerToConnect.value = device
    }
    fun ping() {
        messageQueue.trySend(TransferPacket.Ping)
    }
    fun list() {
        messageQueue.trySend(TransferPacket.ListRequest)
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DefaultQueryDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DefaultQueryDialog.kt
@@ -122,7 +122,7 @@ class DefaultQueryDialog : DialogFragment() {
                        s.replace(
                            0,
                            s.length,
-                            s.toString().toLowerCase(java.util.Locale.getDefault())
+                            s.toString().lowercase()
                        )
                }
            })
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt
@@ -21,7 +21,6 @@ package xyz.quaver.pupil.ui.dialog
 import android.app.Activity
 import android.app.Dialog
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
@@ -29,8 +28,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.snackbar.Snackbar
 import net.rdrei.android.dirchooser.DirectoryChooserActivity
 import net.rdrei.android.dirchooser.DirectoryChooserConfig
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.toFile
 import xyz.quaver.pupil.R
@@ -56,7 +53,6 @@ class DownloadLocationDialogFragment : DialogFragment() {
            it.data?.data?.also { uri ->
                val takeFlags: Int = 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)) {
@@ -87,32 +83,6 @@ class DownloadLocationDialogFragment : DialogFragment() {
        }
    }
    private val requestDownloadFolderOldLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
        val context = context ?: return@registerForActivityResult
        val dialog = dialog ?: return@registerForActivityResult
        if (it.resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
            val directory = it.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]!!.locationAvailable.text = downloadFolder
            }
            else {
                entries[null]?.locationAvailable?.text = directory
                Preferences["download_folder"] = File(directory).toURI().toString()
            }
        }
    }
    private fun initView() {
        val externalFilesDirs = ContextCompat.getExternalFilesDirs(requireContext(), null)
@@ -147,24 +117,11 @@ class DownloadLocationDialogFragment : DialogFragment() {
                }
                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)
                }
                requestDownloadFolderLauncher.launch(intent)
                } 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)
                    }
                    requestDownloadFolderOldLauncher.launch(intent)
                }
            }
            entries[null] = this
        }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageFavoritesFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageFavoritesFragment.kt
@@ -18,25 +18,72 @@
 package xyz.quaver.pupil.ui.fragment
 import android.app.Activity
 import android.content.Intent
 import android.content.res.Resources
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
 import android.util.Log
 import android.widget.EditText
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import kotlinx.datetime.LocalDate
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.decodeFromJsonElement
 import okhttp3.*
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.readText
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.get
 import xyz.quaver.pupil.util.restore
 import java.io.File
 import java.io.IOException
 import kotlin.math.roundToInt
 class ManageFavoritesFragment : PreferenceFragmentCompat() {
    private val requestBackupFileLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
        if (result.resultCode != Activity.RESULT_OK) {
            return@registerForActivityResult
        }
        val uri = result.data?.data ?: return@registerForActivityResult
        val context = context ?: return@registerForActivityResult
        val view = view ?: return@registerForActivityResult
        val backupData = runCatching {
            FileX(context, uri).readText()?.let { Json.parseToJsonElement(it) }
        }.getOrNull() ?: run{
            Snackbar.make(view, context.getString(R.string.error), Toast.LENGTH_LONG).show()
            return@registerForActivityResult
        }
        val newFavorites = backupData["favorites"]?.let { Json.decodeFromJsonElement<List<Int>>(it) }.orEmpty()
        val newFavoriteTags = backupData["favorite_tags"]?.let { Json.decodeFromJsonElement<List<Tag>>(it) }.orEmpty()
        favorites.addAll(newFavorites)
        favoriteTags.addAll(newFavoriteTags)
        Snackbar.make(view, context.getString(R.string.settings_restore_success, newFavorites.size + newFavoriteTags.size), Snackbar.LENGTH_LONG).show()
    }
    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
        setPreferencesFromResource(R.xml.manage_favorites_preferences, rootKey)
@@ -47,57 +94,44 @@ class ManageFavoritesFragment : PreferenceFragmentCompat() {
        val context = context ?: return
        findPreference<Preference>("backup")?.setOnPreferenceClickListener {
-            val request = Request.Builder()
+            val favorites = runCatching {
-                .url(context.getString(R.string.backup_url))
+                Json.parseToJsonElement(File(ContextCompat.getDataDir(context), "favorites.json").readText())
-                .post(
+            }.getOrNull()
-                    FormBody.Builder()
+            val favoriteTags = kotlin.runCatching {
-                        .add("f:1", File(ContextCompat.getDataDir(context), "favorites.json").readText())
+                Json.parseToJsonElement(File(ContextCompat.getDataDir(context), "favorites_tags.json").readText())
-                        .build()
+            }.getOrNull()
                ).build()
-            client.newCall(request).enqueue(object: Callback {
+            val favoriteJson = buildJsonObject {
-                override fun onFailure(call: Call, e: IOException) {
+                favorites?.let {
-                    val view = view ?: return
+                    put("favorites", it)
-                    Snackbar.make(view, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
+                }
                favoriteTags?.let {
                    put("favorite_tags", it)
                }
            }
-                override fun onResponse(call: Call, response: Response) {
+            val backupFile = File(context.filesDir, "pupil-backup.json").also {
-                    if (response.code() != 200) {
+                it.writeText(favoriteJson.toString())
                        response.close()
                        return
            }
            Intent(Intent.ACTION_SEND).apply {
-                        type = "text/plain"
+                val uri = FileProvider.getUriForFile(context, "${context.packageName}.provider", backupFile)
-                        putExtra(Intent.EXTRA_TEXT, response.body()?.use { it.string() }?.replace("\n", ""))
+                setDataAndType(uri, "application/json")
                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                putExtra(Intent.EXTRA_STREAM, uri)
            }.let {
-                        getContext()?.startActivity(Intent.createChooser(it, getString(R.string.settings_backup_share)))
+                context.startActivity(Intent.createChooser(it, getString(R.string.settings_backup_share)))
            }
                }
            })
            true
        }
        findPreference<Preference>("restore")?.setOnPreferenceClickListener {
-            val editText = EditText(context).apply {
+            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-                setText(context.getString(R.string.backup_url), TextView.BufferType.EDITABLE)
+                addCategory(Intent.CATEGORY_OPENABLE)
                type = "*/*"
            }
-            AlertDialog.Builder(context)
+            requestBackupFileLauncher.launch(intent)
                .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
        }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
@@ -18,22 +18,38 @@
 package xyz.quaver.pupil.ui.fragment
 import android.graphics.ColorFilter
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import xyz.quaver.io.FileX
 import xyz.quaver.io.SAFileX
 import xyz.quaver.io.util.deleteRecursively
 import xyz.quaver.io.util.getChild
 import xyz.quaver.io.util.readText
 import xyz.quaver.io.util.writeText
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.hitomi.json
 import xyz.quaver.pupil.util.byteToString
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.downloader.Metadata
 import java.io.File
 import kotlin.math.roundToInt
 class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClickListener {
@@ -45,12 +61,10 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
        initPreferences()
    }
-    override fun onPreferenceClick(preference: Preference?): Boolean {
+    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")
@@ -80,6 +94,48 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                    }.show()
                }
                "recover_downloads" -> {
                    val density = context.resources.displayMetrics.density
                    this.icon = object: CircularProgressDrawable(context) {
                        override fun getIntrinsicHeight() = (24*density).roundToInt()
                        override fun getIntrinsicWidth() = (24*density).roundToInt()
                    }.apply {
                        setStyle(CircularProgressDrawable.DEFAULT)
                        colorFilter = PorterDuffColorFilter(ContextCompat.getColor(context, R.color.colorAccent), PorterDuff.Mode.SRC_IN)
                        start()
                    }
                    val downloadManager = DownloadManager.getInstance(context)
                    val downloadFolderMap = downloadManager.downloadFolderMap
                    downloadFolderMap.clear()
                    downloadManager.downloadFolder.listFiles { file -> file.isDirectory }?.forEach { folder ->
                        val metadataFile = FileX(context, folder, ".metadata")
                        if (!metadataFile.exists()) return@forEach
                        val metadata = metadataFile.readText()?.let {
                            runCatching {
                                json.decodeFromString<Metadata>(it)
                            }.getOrNull()
                        } ?: return@forEach
                        val galleryID = metadata.galleryBlock?.id ?: metadata.galleryInfo?.id?.toIntOrNull() ?: return@forEach
                        downloadFolderMap[galleryID] = folder.name
                    }
                    downloadManager.downloadFolderMap.putAll(downloadFolderMap)
                    val downloads = FileX(context, downloadManager.downloadFolder, ".download")
                    if (!downloads.exists()) downloads.createNewFile()
                    downloads.writeText(Json.encodeToString(downloadFolderMap))
                    this.icon = null
                    Toast.makeText(context, android.R.string.ok, Toast.LENGTH_SHORT).show()
                }
                "delete_downloads" -> {
                    val dir = DownloadManager.getInstance(context).downloadFolder
@@ -191,6 +247,12 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
            onPreferenceClickListener = this@ManageStorageFragment
        }
        with(findPreference<Preference>("recover_downloads")) {
            this ?: return@with
            onPreferenceClickListener = this@ManageStorageFragment
        }
    }
    override fun onDestroy() {
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
@@ -21,12 +21,14 @@ package xyz.quaver.pupil.ui.fragment
 import android.app.Activity
 import android.content.*
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.*
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -40,6 +42,7 @@ import xyz.quaver.pupil.clientHolder
 import xyz.quaver.pupil.types.SendLogException
 import xyz.quaver.pupil.ui.LockActivity
 import xyz.quaver.pupil.ui.SettingsActivity
 import xyz.quaver.pupil.ui.TransferActivity
 import xyz.quaver.pupil.ui.dialog.*
 import xyz.quaver.pupil.util.*
 import xyz.quaver.pupil.util.downloader.DownloadManager
@@ -80,10 +83,8 @@ class SettingsFragment :
        }
    }
-    override fun onPreferenceClick(preference: Preference?): Boolean {
+    override fun onPreferenceClick(preference: Preference): Boolean {
        with (preference) {
            this ?: return false
            when (key) {
                "app_version" -> {
                    checkUpdate(activity as SettingsActivity, true)
@@ -115,6 +116,9 @@ class SettingsFragment :
                    )
                    Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
                }
                "transfer_data" -> {
                    activity?.startActivity(Intent(activity, TransferActivity::class.java))
                }
                else -> return false
            }
        }
@@ -122,10 +126,8 @@ class SettingsFragment :
        return true
    }
-    override fun onPreferenceChange(preference: Preference?, newValue: Any?): Boolean {
+    override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
        with (preference) {
            this ?: return false
            when (key) {
                "tag_translation" -> {
                    updateTranslations()
@@ -163,7 +165,7 @@ class SettingsFragment :
            when (key) {
                "proxy" -> {
-                    summary = context?.let { getProxyInfo().type.name }
+                    summary = context.let { getProxyInfo().type.name }
                }
                "download_folder" -> {
                    summary = FileX(context, Preferences.get<String>("download_folder")).canonicalPath
@@ -300,10 +302,13 @@ class SettingsFragment :
                        }
                        "oss" -> {
                            setOnPreferenceClickListener {
-                                context?.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
+                                context.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
                                true
                            }
                        }
                        "transfer_data" -> {
                            onPreferenceClickListener = this@SettingsFragment
                        }
                    }
                }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferConnectedFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferConnectedFragment.kt
@@ -0,0 +1,10 @@
 package xyz.quaver.pupil.ui.fragment
 import androidx.fragment.app.Fragment
 import xyz.quaver.pupil.R
 class TransferConnectedFragment: Fragment(R.layout.transfer_connected_fragment) {
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferDirectionFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferDirectionFragment.kt
@@ -0,0 +1,44 @@
 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 androidx.fragment.app.activityViewModels
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.databinding.TransferDirectionFragmentBinding
 import xyz.quaver.pupil.ui.TransferStep
 import xyz.quaver.pupil.ui.TransferViewModel
 class TransferDirectionFragment : Fragment(R.layout.transfer_direction_fragment) {
    private var _binding: TransferDirectionFragmentBinding? = null
    private val binding get() = _binding!!
    private val viewModel: TransferViewModel by activityViewModels()
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View {
        _binding = TransferDirectionFragmentBinding.inflate(inflater, container, false)
        binding.inButton.setOnClickListener {
            viewModel.setStep(TransferStep.TARGET)
        }
        binding.outButton.setOnClickListener {
            viewModel.setStep(TransferStep.WAIT_FOR_CONNECTION)
        }
        return binding.root
    }
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferPermissionFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferPermissionFragment.kt
@@ -0,0 +1,38 @@
 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 androidx.fragment.app.activityViewModels
 import xyz.quaver.pupil.databinding.TransferPermissionFragmentBinding
 import xyz.quaver.pupil.ui.TransferStep
 import xyz.quaver.pupil.ui.TransferViewModel
 class TransferPermissionFragment: Fragment() {
    private var _binding: TransferPermissionFragmentBinding? = null
    private val binding get() = _binding!!
    private val viewModel: TransferViewModel by activityViewModels()
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View {
        _binding = TransferPermissionFragmentBinding.inflate(inflater, container, false)
        binding.permissionsButton.setOnClickListener {
            viewModel.setStep(TransferStep.TARGET_FORCE)
        }
        return binding.root
    }
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferSelectDataFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferSelectDataFragment.kt
@@ -0,0 +1,37 @@
 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 androidx.fragment.app.activityViewModels
 import xyz.quaver.pupil.databinding.TransferSelectDataFragmentBinding
 import xyz.quaver.pupil.ui.TransferViewModel
 class TransferSelectDataFragment: Fragment() {
    private var _binding: TransferSelectDataFragmentBinding? = null
    private val binding get() = _binding!!
    private val viewModel: TransferViewModel by activityViewModels()
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View? {
        _binding = TransferSelectDataFragmentBinding.inflate(inflater, container, false)
        binding.checkAll.setOnCheckedChangeListener {  _, isChecked ->
            viewModel.list()
        }
        return binding.root
    }
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferTargetFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferTargetFragment.kt
@@ -0,0 +1,69 @@
 package xyz.quaver.pupil.ui.fragment
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.TransferPeersAdapter
 import xyz.quaver.pupil.databinding.TransferTargetFragmentBinding
 import xyz.quaver.pupil.ui.TransferStep
 import xyz.quaver.pupil.ui.TransferViewModel
 class TransferTargetFragment : Fragment() {
    private var _binding: TransferTargetFragmentBinding? = null
    private val binding get() = _binding!!
    private val viewModel: TransferViewModel by activityViewModels()
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View {
        _binding = TransferTargetFragmentBinding.inflate(inflater, container, false)
        viewModel.thisDevice.observe(viewLifecycleOwner) { device ->
            if (device == null) {
                return@observe
            }
            if (device.status == 3) {
                binding.ripple.startRippleAnimation()
                binding.retryButton.visibility = View.INVISIBLE
            } else {
                binding.ripple.stopRippleAnimation()
                binding.retryButton.visibility = View.VISIBLE
            }
        }
        viewModel.peers.observe(viewLifecycleOwner) { peers ->
            if (peers == null) {
                return@observe
            }
            binding.deviceList.adapter = TransferPeersAdapter(peers.deviceList) {
                viewModel.connect(it)
            }
        }
        binding.ripple.startRippleAnimation()
        binding.retryButton.setOnClickListener {
            viewModel.setStep(TransferStep.TARGET)
        }
        return binding.root
    }
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferWaitForConnectionFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferWaitForConnectionFragment.kt
@@ -0,0 +1,32 @@
 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 xyz.quaver.pupil.databinding.TransferWaitForConnectionFragmentBinding
 class TransferWaitForConnectionFragment : Fragment() {
    private var _binding: TransferWaitForConnectionFragmentBinding? = null
    private val binding get() = _binding!!
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View? {
        _binding = TransferWaitForConnectionFragmentBinding.inflate(layoutInflater)
        binding.ripple.startRippleAnimation()
        return binding.root
    }
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt
@@ -76,7 +76,7 @@ class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: Attr
        s ?: return
        if (s.any { it.isUpperCase() })
-            s.replace(0, s.length, s.toString().toLowerCase(Locale.getDefault()))
+            s.replace(0, s.length, s.toString().lowercase())
    }
    override fun onSuggestionClicked(searchSuggestion: SearchSuggestion?) {
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
@@ -21,13 +21,9 @@ package xyz.quaver.pupil.util.downloader
 import android.content.Context
 import android.content.ContextWrapper
 import android.net.Uri
-import android.util.Log
+import kotlinx.coroutines.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
@@ -36,36 +32,42 @@ import okhttp3.Request
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.*
 import xyz.quaver.pupil.client
-import xyz.quaver.pupil.hitomi.GalleryBlock
+import xyz.quaver.pupil.hitomi.*
 import xyz.quaver.pupil.hitomi.GalleryInfo
 import xyz.quaver.pupil.hitomi.getGalleryBlock
 import xyz.quaver.pupil.hitomi.getGalleryInfo
 import xyz.quaver.pupil.userAgent
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
 import java.util.concurrent.ConcurrentHashMap
@Serializable
-data class OldGalleryBlock(
+data class OldReader(
    val code: String,
-    val id: Int,
+    val galleryInfo: OldGalleryInfo
    val galleryUrl: String,
    val thumbnails: List<String>,
    val title: String,
    val artists: List<String>,
    val series: List<String>,
    val type: String,
    val language: String,
    val relatedTags: List<String>
 )
@Serializable
-data class OldReader(val code: String, val galleryInfo: GalleryInfo)
+data class OldGalleryInfo(
    val language_localname: String? = null,
    val language: String? = null,
    val date: String? = null,
    val files: List<OldGalleryFiles>,
    val id: Int? = null,
    val type: String? = null,
    val title: String? = null
 )
@Serializable
 data class OldGalleryFiles(
    val width: Int,
    val hash: String,
    val haswebp: Int = 0,
    val name: String,
    val height: Int,
    val hasavif: Int = 0,
    val hasavifsmalltn: Int? = 0
 )
@Serializable
 data class OldMetadata(
-    var galleryBlock: OldGalleryBlock? = null,
+    var galleryBlock: GalleryBlock? = null,
    var reader: OldReader? = null,
    var imageList: MutableList<String?>? = null
 ) {
@@ -78,17 +80,29 @@ data class Metadata(
    var galleryInfo: GalleryInfo? = null,
    var imageList: MutableList<String?>? = null
 ) {
-    constructor(old: OldMetadata) : this(old.galleryBlock?.let { galleryBlock -> GalleryBlock(
+    constructor(old: OldMetadata) : this(
-        galleryBlock.id,
+        old.galleryBlock,
-        galleryBlock.galleryUrl,
+        old.reader?.galleryInfo?.let { oldGalleryInfo ->
-        galleryBlock.thumbnails,
+            GalleryInfo(
-        galleryBlock.title,
+                oldGalleryInfo.id.toString(),
-        galleryBlock.artists,
+                oldGalleryInfo.title ?: "",
-        galleryBlock.series,
+                null,
-        galleryBlock.type,
+                oldGalleryInfo.language,
-        galleryBlock.language,
+                oldGalleryInfo.type ?: "",
-        galleryBlock.relatedTags) },
+                oldGalleryInfo.date ?: "",
-        old.reader?.galleryInfo,
+                files = oldGalleryInfo.files.map {
                    GalleryFiles(
                        it.width,
                        it.hash,
                        it.haswebp,
                        it.name,
                        it.height,
                        it.hasavif,
                        it.hasavifsmalltn
                    )
                }
            )
        },
        old.imageList
    )
@@ -96,7 +110,6 @@ data class Metadata(
 }
 class Cache private constructor(context: Context, val galleryID: Int) : ContextWrapper(context) {
    companion object {
        val instances = ConcurrentHashMap<Int, Cache>()
@@ -121,10 +134,10 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
            kotlin.runCatching {
                Json.decodeFromString<Metadata>(metadata)
            }.getOrElse {
-                Metadata(Json.decodeFromString<OldMetadata>(metadata))
+                Metadata(json.decodeFromString<OldMetadata>(metadata))
            }
        }
-    }.getOrNull() ?: Metadata()
+    }.onFailure { it.printStackTrace() }.getOrNull() ?: Metadata()
    val downloadFolder: FileX?
        get() = DownloadManager.getInstance(this).getDownloadFolder(galleryID)
@@ -211,14 +224,13 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
        metadata.imageList?.getOrNull(index)?.let { findFile(it) }
    @Suppress("BlockingMethodInNonBlockingContext")
-    fun putImage(index: Int, fileName: String, data: InputStream) {
+    suspend fun putImage(index: Int, fileName: String, data: ByteArray) = coroutineScope {
        val file = cacheFolder.getChild(fileName)
        if (!file.exists())
            file.createNewFile()
-        file.outputStream()?.use {
+
-            data.copyTo(it)
+        file.writeBytes(data)
        }
        setMetadata { metadata -> metadata.imageList!![index] = fileName }
    }
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
@@ -20,6 +20,7 @@ package xyz.quaver.pupil.util.downloader
 import android.content.Context
 import android.content.ContextWrapper
 import android.util.Log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -28,7 +29,10 @@ 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.io.util.deleteRecursively
 import xyz.quaver.io.util.getChild
 import xyz.quaver.io.util.readText
 import xyz.quaver.io.util.writeText
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.util.Preferences
@@ -48,14 +52,12 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
    val defaultDownloadFolder = FileX(this, getExternalFilesDir(null)!!)
    val downloadFolder: FileX
-        get() = {
+        get() = kotlin.runCatching {
            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
@@ -64,21 +66,19 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
        get() {
            if (prevDownloadFolder != downloadFolder) {
                prevDownloadFolder = downloadFolder
-                downloadFolderMapInstance = {
+                downloadFolderMapInstance = run {
                    val file = downloadFolder.getChild(".download")
                    val data = if (file.exists())
                        kotlin.runCatching {
-                            file.readText()?.let { Json.decodeFromString<MutableMap<Int, String>>(it) }
+                            file.readText()?.let{ Json.decodeFromString<MutableMap<Int, String>>(it) }
                        }.onFailure { file.delete() }.getOrNull()
                    else
                        null
-
+                    data ?: run {
                    data ?: {
                        file.createNewFile()
-                        mutableMapOf<Int, String>()
+                        mutableMapOf()
-                    }.invoke()
+                    }
-                }.invoke()
+                }
            }
            return downloadFolderMapInstance ?: mutableMapOf()
@@ -103,14 +103,13 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
        val folder = downloadFolder.getChild(name)
-        if (folder.exists()) return@launch
+        downloadFolderMap[galleryID] = name
        folder.mkdir()
        downloadFolderMap[galleryID] = folder.name
        downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
        downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
        if (folder.exists()) return@launch
        folder.mkdir()
    }
    @Synchronized
--- a/app/src/main/java/xyz/quaver/pupil/util/misc.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/misc.kt
@@ -18,14 +18,24 @@
 package xyz.quaver.pupil.util
 import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
 import android.util.Log
 import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.serialization.json.*
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.hitomi.GalleryBlock
 import xyz.quaver.pupil.hitomi.GalleryInfo
 import xyz.quaver.pupil.hitomi.getReferer
 import xyz.quaver.pupil.hitomi.imageUrlFromImage
 import java.util.*
 import kotlin.collections.ArrayList
@@ -78,7 +88,8 @@ fun OkHttpClient.Builder.proxyInfo(proxyInfo: ProxyInfo) = this.apply {
 val formatMap = mapOf<String, GalleryBlock.() -> (String)>(
    "-id-" to { id.toString() },
    "-title-" to { title },
-    "-artist-" to { artists.joinToString() }
+    "-artist-" to { if (artists.isNotEmpty()) artists.joinToString() else "N/A" },
    "-group-" to { if (groups.isNotEmpty()) groups.joinToString() else "N/A" }
    // TODO
 )
 /**
@@ -99,14 +110,12 @@ fun GalleryBlock.formatDownloadFolderTest(format: String): String =
    }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)
 suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
-    val galleryID = this.id ?: 0
+    val galleryID = this.id.toIntOrNull() ?: 0
    val lowQuality = Preferences["low_quality", true]
    return this.files.map {
        Request.Builder()
            .url(
                runCatching {
-                    imageUrlFromImage(galleryID, it, !lowQuality)
+                    imageUrlFromImage(galleryID, it, false)
                }
                .onFailure {
                    FirebaseCrashlytics.getInstance().recordException(it)
@@ -114,15 +123,35 @@ suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
                .getOrDefault("https://a/")
            )
            .header("Referer", "https://hitomi.la/")
            .header("User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36")
    }
 }
-fun String.ellipsize(n: Int): String =
+fun byteCount(codePoint: Int): Int = when (codePoint) {
-    if (this.length > n)
+    in 0 ..< 0x80 -> 1
-        this.slice(0 until n) + "…"
+    in 0x80 ..< 0x800 -> 2
-    else
+    in 0x800 ..< 0x10000 -> 3
-        this
+    in 0x10000 ..< 0x110000 -> 4
    else -> 0
 }
 fun String.ellipsize(n: Int): String = buildString {
    var count = 0
    var index = 0
    val codePointLength = this@ellipsize.codePointCount(0, this@ellipsize.length)
    while (index < codePointLength) {
        val nextCodePoint = this@ellipsize.codePointAt(index)
        val nextByte = byteCount(nextCodePoint)
        if (count + nextByte > 124) {
            append("…")
            break
        }
        appendCodePoint(nextCodePoint)
        count += nextByte
        index++
    }
 }
 operator fun JsonElement.get(index: Int) =
    this.jsonArray[index]
@@ -136,3 +165,30 @@ fun JsonElement.getOrNull(tag: String) = kotlin.runCatching {
 val JsonElement.content
    get() = this.jsonPrimitive.contentOrNull
 fun checkNotificationEnabled(context: Context) =
    Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ||
    ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED
 fun showNotificationPermissionExplanationDialog(context: Context) {
    AlertDialog.Builder(context)
        .setTitle(R.string.warning)
        .setMessage(R.string.notification_denied)
        .setPositiveButton(android.R.string.ok) { _, _ -> }
        .show()
 }
 fun requestNotificationPermission(
    activity: Activity,
    requestPermissionLauncher: ActivityResultLauncher<String>,
    showRationale: Boolean = true,
    ifGranted: () -> Unit,
 ) {
    when {
        checkNotificationEnabled(activity) -> ifGranted()
        showRationale && ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.POST_NOTIFICATIONS) ->
            showNotificationPermissionExplanationDialog(activity)
        else ->
            requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/util/update.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/update.kt
@@ -27,17 +27,14 @@ import androidx.preference.PreferenceManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.*
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Request
 import okhttp3.Response
 import ru.noties.markwon.Markwon
-import xyz.quaver.pupil.BuildConfig
+import xyz.quaver.pupil.*
-import xyz.quaver.pupil.R
+import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.favorites
 import java.io.File
 import java.io.IOException
 import java.net.URL
@@ -138,6 +135,11 @@ fun checkUpdate(context: Context, force: Boolean = false) {
            val msg = extractReleaseNote(update, Locale.getDefault())
            setMessage(Markwon.create(context).toMarkdown(msg))
            setPositiveButton(android.R.string.ok) { _, _ ->
                if (!checkNotificationEnabled(context)) {
                    showNotificationPermissionExplanationDialog(context)
                    return@setPositiveButton
                }
                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
                //Cancel any download queued before
@@ -162,7 +164,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore) { _, _ ->
                if (!force)
                    preferences.edit()
-                        .putLong("ignore_update_until", System.currentTimeMillis() + 604800000)
+                        .putLong("ignore_update_until", System.currentTimeMillis() + 86400000)
                        .apply()
            }
        }
@@ -173,7 +175,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
    }
 }
-fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((List<Int>) -> Unit)? = null) {
+fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((Int) -> Unit)? = null) {
    if (!URLUtil.isValidUrl(url)) {
        onFailure?.invoke(IllegalArgumentException())
        return
@@ -191,9 +193,20 @@ fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((
        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 {
+                val data = Json.parseToJsonElement(response.also { if (it.code() != 200) throw IOException() }.body().use { it?.string() } ?: "[]")
-                    favorites.addAll(it)
+
-                    onSuccess?.invoke(it)
+                when (data) {
                    is JsonArray -> favorites.addAll(data.map { it.jsonPrimitive.int })
                    is JsonObject -> {
                        val newFavorites = data["favorites"]?.let { Json.decodeFromJsonElement<List<Int>>(it) }.orEmpty()
                        val newFavoriteTags = data["favorite_tags"]?.let { Json.decodeFromJsonElement<List<Tag>>(it) }.orEmpty()
                        favorites.addAll(newFavorites)
                        favoriteTags.addAll(newFavoriteTags)
                        onSuccess?.invoke(favorites.size + favoriteTags.size)
                    }
                    else -> error("data is neither JsonArray or JsonObject")
                }
            }.onFailure { onFailure?.invoke(it) }
        }
--- a/app/src/main/res/drawable/arrow.xml
+++ b/app/src/main/res/drawable/arrow.xml
@@ -0,0 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M4.5,10.5 L12,3m0,0 l7.5,7.5M12,3v18"
      android:strokeLineJoin="round"
      android:strokeWidth="1.5"
      android:fillColor="#00000000"
      android:strokeColor="@color/colorPrimaryDark"
      android:strokeLineCap="round"/>
 </vector>
--- a/app/src/main/res/drawable/check.xml
+++ b/app/src/main/res/drawable/check.xml
@@ -0,0 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M9,12.75 L11.25,15 15,9.75M21,12a9,9 0,1 1,-18 0,9 9,0 0,1 18,0Z"
      android:strokeLineJoin="round"
      android:strokeWidth="1.5"
      android:fillColor="#00000000"
      android:strokeColor="@color/colorPrimaryDark"
      android:strokeLineCap="round"/>
 </vector>
--- a/app/src/main/res/drawable/download.xml
+++ b/app/src/main/res/drawable/download.xml
@@ -0,0 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M3,16.5v2.25A2.25,2.25 0,0 0,5.25 21h13.5A2.25,2.25 0,0 0,21 18.75V16.5M16.5,12 L12,16.5m0,0L7.5,12m4.5,4.5V3"
      android:strokeLineJoin="round"
      android:strokeWidth="1.5"
      android:fillColor="#00000000"
      android:strokeColor="@color/material_blue_700"
      android:strokeLineCap="round"/>
 </vector>
--- a/app/src/main/res/drawable/heart.xml
+++ b/app/src/main/res/drawable/heart.xml
@@ -0,0 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M21,8.25c0,-2.485 -2.099,-4.5 -4.688,-4.5 -1.935,0 -3.597,1.126 -4.312,2.733 -0.715,-1.607 -2.377,-2.733 -4.313,-2.733C5.1,3.75 3,5.765 3,8.25c0,7.22 9,12 9,12s9,-4.78 9,-12Z"
      android:strokeLineJoin="round"
      android:strokeWidth="1.5"
      android:fillColor="#00000000"
      android:strokeColor="@color/material_pink_600"
      android:strokeLineCap="round"/>
 </vector>
--- a/app/src/main/res/drawable/history_rounded.xml
+++ b/app/src/main/res/drawable/history_rounded.xml
@@ -0,0 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="48dp"
    android:height="48dp"
    android:viewportWidth="960"
    android:viewportHeight="960">
  <path
      android:fillColor="@color/material_orange_500"
      android:pathData="M477,840q-142,0 -243.5,-95.5T121,509q-1,-12 7.5,-21t21.5,-9q12,0 20.5,8.5T181,509q11,115 95,193t201,78q127,0 215,-89t88,-216q0,-124 -89,-209.5T477,180q-68,0 -127.5,31T246,293h75q13,0 21.5,8.5T351,323q0,13 -8.5,21.5T321,353L172,353q-13,0 -21.5,-8.5T142,323v-148q0,-13 8.5,-21.5T172,145q13,0 21.5,8.5T202,175v76q52,-61 123.5,-96T477,120q75,0 141,28t115.5,76.5Q783,273 811.5,338T840,478q0,75 -28.5,141t-78,115Q684,783 618,811.5T477,840ZM511,466 L626,579q9,9 9,21.5t-9,21.5q-9,9 -21,9t-21,-9L460,500q-5,-5 -7,-10.5t-2,-11.5v-171q0,-13 8.5,-21.5T481,277q13,0 21.5,8.5T511,307v159Z"/>
 </vector>
--- a/app/src/main/res/drawable/link.xml
+++ b/app/src/main/res/drawable/link.xml
@@ -0,0 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M13.19,8.688a4.5,4.5 0,0 1,1.242 7.244l-4.5,4.5a4.5,4.5 0,0 1,-6.364 -6.364l1.757,-1.757m13.35,-0.622 l1.757,-1.757a4.5,4.5 0,0 0,-6.364 -6.364l-4.5,4.5a4.5,4.5 0,0 0,1.242 7.244"
      android:strokeLineJoin="round"
      android:strokeWidth="1.5"
      android:fillColor="#00000000"
      android:strokeColor="@color/colorPrimaryDark"
      android:strokeLineCap="round"/>
 </vector>
--- a/app/src/main/res/drawable/round_button.xml
+++ b/app/src/main/res/drawable/round_button.xml
@@ -0,0 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="false">
        <shape android:shape="oval">
            <solid android:color="#dddddd"/>
        </shape>
    </item>
    <item android:state_pressed="true">
        <shape android:shape="oval">
            <solid android:color="#888888"/>
        </shape>
    </item>
 </selector>
--- a/app/src/main/res/drawable/transfer_device.xml
+++ b/app/src/main/res/drawable/transfer_device.xml
@@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:bottom="-8dp">
        <shape xmlns:android="http://schemas.android.com/apk/res/android"
            android:shape="rectangle">
            <corners android:radius="32dp"
                android:bottomLeftRadius="0dp"
                android:bottomRightRadius="0dp" />
            <stroke android:width="4dp" android:color="#444444"/>
        </shape>
    </item>
 </layer-list>
--- a/app/src/main/res/drawable/transfer_ripple.xml
+++ b/app/src/main/res/drawable/transfer_ripple.xml
@@ -0,0 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="#9d9d9d">
    <item android:id="@android:id/mask">
        <shape android:shape="rectangle">
            <solid android:color="#9d9d9d" />
            <corners android:radius="16dp" />
        </shape>
    </item>
 </ripple>
--- a/app/src/main/res/drawable/warning.xml
+++ b/app/src/main/res/drawable/warning.xml
@@ -0,0 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M12,9v3.75m-9.303,3.376c-0.866,1.5 0.217,3.374 1.948,3.374h14.71c1.73,0 2.813,-1.874 1.948,-3.374L13.949,3.378c-0.866,-1.5 -3.032,-1.5 -3.898,0L2.697,16.126ZM12,15.75h0.007v0.008H12v-0.008Z"
      android:strokeLineJoin="round"
      android:strokeWidth="1.5"
      android:fillColor="#00000000"
      android:strokeColor="@color/colorAccent"
      android:strokeLineCap="round"/>
 </vector>
--- a/app/src/main/res/layout/main_activity_content.xml
+++ b/app/src/main/res/layout/main_activity_content.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
 <!--
  ~     Pupil, Hitomi.la viewer for Android
  ~     Copyright (C) 2020  tom5079
  ~
@@ -18,8 +17,8 @@
  -->
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    tools:context=".ui.MainActivity">
@@ -32,44 +31,43 @@
        <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            app:addLastItemPadding="true"
            app:handleDrawable="@drawable/thumb"
            app:handleHasFixedSize="true"
            app:handleHeight="72dp"
            app:handleVisibilityDuration="1000"
            app:handleWidth="24dp"
-            app:disableTrack="true"
+            app:popupDrawable="@android:color/transparent"
-            app:hideHandleAfter="1000"
+            app:trackMarginStart="64dp">
            app:trackMarginStart="64dp"
            app:addLastItemPadding="true"
            app:popupDrawable="@android:color/transparent">
            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/recyclerview"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:paddingTop="64dp"
                android:clipToPadding="false"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+                android:paddingTop="64dp"
                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
    </xyz.quaver.pupil.ui.view.MainView>
    <androidx.core.widget.ContentLoadingProgressBar
        style="?android:attr/progressBarStyle"
        android:id="@+id/progressbar"
        style="?android:attr/progressBarStyle"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
-        android:indeterminate="true"/>
+        android:indeterminate="true" />
    <TextView
        android:id="@+id/noresult"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:text="@string/main_no_result"
        android:linksClickable="true"
-        android:visibility="invisible"/>
+        android:text="@string/main_no_result"
        android:visibility="invisible" />
    <com.github.clans.fab.FloatingActionMenu
        android:id="@+id/fab"
@@ -84,28 +82,28 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:fab_label="@string/main_fab_cancel"
-            app:fab_size="mini"/>
+            app:fab_size="mini" />
        <com.github.clans.fab.FloatingActionButton
            android:id="@+id/jump_fab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:fab_label="@string/main_jump_title"
-            app:fab_size="mini"/>
+            app:fab_size="mini" />
        <com.github.clans.fab.FloatingActionButton
            android:id="@+id/random_fab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:fab_label="@string/main_fab_random"
-            app:fab_size="mini"/>
+            app:fab_size="mini" />
        <com.github.clans.fab.FloatingActionButton
            android:id="@+id/id_fab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:fab_label="@string/main_open_gallery_by_id"
-            app:fab_size="mini"/>
+            app:fab_size="mini" />
    </com.github.clans.fab.FloatingActionMenu>
@@ -113,15 +111,15 @@
        android:id="@+id/searchview"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        app:close_search_on_keyboard_dismiss="false"
        app:dismissOnOutsideTouch="true"
        app:leftActionMode="showHamburger"
        app:menu="@menu/main"
        app:searchBarMarginLeft="6dp"
        app:searchBarMarginRight="6dp"
        app:searchBarMarginTop="6dp"
        app:searchHint="@string/search_hint"
        app:suggestionAnimDuration="250"
        app:showSearchKey="true"
-        app:leftActionMode="showHamburger"
+        app:suggestionAnimDuration="250" />
        app:menu="@menu/main"
        app:dismissOnOutsideTouch="true"
        app:close_search_on_keyboard_dismiss="false" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/reader_activity.xml
+++ b/app/src/main/res/layout/reader_activity.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
 <!--
  ~     Pupil, Hitomi.la viewer for Android
  ~     Copyright (C) 2019  tom5079
  ~
@@ -29,36 +28,36 @@
        android:id="@+id/scroller"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        app:handleDrawable="@drawable/thumb"
        app:handleHeight="72dp"
        app:handleWidth="24dp"
        app:disableTrack="true"
        app:hideHandleAfter="1000"
        app:handleHasFixedSize="true"
        app:addLastItemPadding="true"
        app:handleDrawable="@drawable/thumb"
        app:handleHasFixedSize="true"
        app:handleHeight="72dp"
        app:handleVisibilityDuration="1000"
        app:handleWidth="24dp"
        app:popupDrawable="@android:color/transparent">
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerview"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
    </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
-    <include layout="@layout/reader_eye_card"
+    <include
        android:id="@+id/eye_card"
-        android:visibility="gone"
+        layout="@layout/reader_eye_card"
        android:layout_height="wrap_content"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center_horizontal"
-        android:layout_margin="8dp"/>
+        android:layout_margin="8dp"
        android:visibility="gone" />
    <ProgressBar
        android:id="@+id/download_progressbar"
        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
        android:layout_width="match_parent"
-        android:layout_height="4dp"/>
+        android:layout_height="4dp" />
    <com.github.clans.fab.FloatingActionMenu
        android:id="@+id/fab"
@@ -72,33 +71,33 @@
            android:id="@+id/download_fab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:srcCompat="@drawable/ic_download"
            app:fab_label="@string/reader_fab_download"
-            app:fab_size="mini"/>
+            app:fab_size="mini"
            app:srcCompat="@drawable/ic_download" />
        <com.github.clans.fab.FloatingActionButton
            android:id="@+id/retry_fab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:srcCompat="@drawable/refresh"
            app:fab_label="@string/reader_fab_retry"
-            app:fab_size="mini"/>
+            app:fab_size="mini"
            app:srcCompat="@drawable/refresh" />
        <com.github.clans.fab.FloatingActionButton
            android:id="@+id/auto_fab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:srcCompat="@drawable/eye_white"
            app:fab_label="@string/reader_fab_auto"
-            app:fab_size="mini"/>
+            app:fab_size="mini"
            app:srcCompat="@drawable/eye_white" />
        <com.github.clans.fab.FloatingActionButton
            android:id="@+id/fullscreen_fab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:srcCompat="@drawable/ic_fullscreen"
            app:fab_label="@string/reader_fab_fullscreen"
-            app:fab_size="mini"/>
+            app:fab_size="mini"
            app:srcCompat="@drawable/ic_fullscreen" />
    </com.github.clans.fab.FloatingActionMenu>
--- a/app/src/main/res/layout/transfer_activity.xml
+++ b/app/src/main/res/layout/transfer_activity.xml
@@ -0,0 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.fragment.app.FragmentContainerView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/fragment_container_view"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:name="xyz.quaver.pupil.ui.fragment.TransferDirectionFragment" />
--- a/app/src/main/res/layout/transfer_connected_fragment.xml
+++ b/app/src/main/res/layout/transfer_connected_fragment.xml
@@ -0,0 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    <androidx.appcompat.widget.AppCompatImageView
        android:id="@+id/icon"
        android:layout_width="48dp"
        android:layout_height="48dp"
        android:layout_marginTop="48dp"
        app:srcCompat="@drawable/check"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent" />
    <TextView
        android:id="@+id/textView"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="16dp"
        android:text="Device connected"
        android:textAlignment="center"
        android:textSize="28sp"
        android:textStyle="bold"
        app:layout_constraintTop_toBottomOf="@id/icon" />
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/transfer_direction_fragment.xml
+++ b/app/src/main/res/layout/transfer_direction_fragment.xml
@@ -0,0 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    xmlns:app="http://schemas.android.com/apk/res-auto">
    <TextView
        android:id="@+id/textView"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="80dp"
        android:text="Transfer your data"
        android:textAlignment="center"
        android:textSize="28sp"
        android:textStyle="bold"
        app:layout_constraintTop_toTopOf="parent" />
    <View
        android:id="@+id/device"
        android:layout_width="match_parent"
        android:layout_height="300dp"
        android:layout_marginHorizontal="64dp"
        app:layout_constraintBottom_toBottomOf="parent"
        android:background="@drawable/transfer_device"/>
    <LinearLayout
        android:id="@+id/out_button"
        android:layout_width="100dp"
        android:layout_height="100dp"
        android:orientation="vertical"
        android:gravity="center"
        android:clickable="true"
        android:focusable="true"
        android:background="@drawable/transfer_ripple"
        app:layout_constraintBottom_toTopOf="@id/device"
        app:layout_constraintLeft_toLeftOf="@id/device"
        app:layout_constraintRight_toRightOf="@id/device"
        android:layout_marginBottom="32dp">
        <androidx.appcompat.widget.AppCompatImageView
            android:id="@+id/out_arrow"
            android:layout_width="48dp"
            android:layout_height="48dp"
            app:srcCompat="@drawable/arrow"
            android:layout_marginBottom="4dp" />
        <TextView
            android:id="@+id/out_text"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="Send data"
            android:textStyle="bold"
            android:layout_marginTop="4dp"/>
    </LinearLayout>
    <LinearLayout
        android:id="@+id/in_button"
        android:layout_width="100dp"
        android:layout_height="100dp"
        android:orientation="vertical"
        android:gravity="center"
        android:clickable="true"
        android:focusable="true"
        android:background="@drawable/transfer_ripple"
        app:layout_constraintTop_toTopOf="@id/device"
        app:layout_constraintLeft_toLeftOf="@id/device"
        app:layout_constraintRight_toRightOf="@id/device"
        android:layout_marginTop="32dp">
        <TextView
            android:id="@+id/in_text"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="Receive data"
            android:textStyle="bold"
            android:layout_marginBottom="4dp"/>
        <androidx.appcompat.widget.AppCompatImageView
            android:id="@+id/in_arrow"
            android:layout_width="48dp"
            android:layout_height="48dp"
            app:srcCompat="@drawable/arrow"
            android:layout_marginTop="4dp"
            android:rotation="180"/>
    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/transfer_peer_list_item.xml
+++ b/app/src/main/res/layout/transfer_peer_list_item.xml
@@ -0,0 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:background="?attr/selectableItemBackground"
    android:clickable="true"
    android:focusable="true"
    android:padding="16dp">
    <TextView
        android:id="@+id/device_name"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="Gonsales Vorecek's Galaxy S22 Ultra"
        android:textStyle="bold"
        android:textSize="24sp"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        android:layout_marginBottom="4dp"/>
    <TextView
        android:id="@+id/device_address"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="26:7D:2D:3A:4F:5E"
        android:textSize="16sp"
        app:layout_constraintTop_toBottomOf="@id/device_name"
        app:layout_constraintLeft_toLeftOf="parent"
        android:layout_marginTop="4dp"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/transfer_permission_fragment.xml
+++ b/app/src/main/res/layout/transfer_permission_fragment.xml
@@ -0,0 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    xmlns:app="http://schemas.android.com/apk/res-auto">
    <androidx.appcompat.widget.AppCompatImageView
        android:id="@+id/icon"
        android:layout_width="48dp"
        android:layout_height="48dp"
        android:layout_marginTop="48dp"
        app:srcCompat="@drawable/warning"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent" />
    <TextView
        android:id="@+id/textView"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="16dp"
        android:text="Permissions Missing"
        android:textAlignment="center"
        android:textSize="28sp"
        android:textStyle="bold"
        app:layout_constraintTop_toBottomOf="@id/icon" />
    <com.google.android.material.button.MaterialButton
        android:id="@+id/permissions_button"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="Grant Permissions"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintRight_toRightOf="parent"
        android:layout_marginHorizontal="36dp"
        android:layout_marginVertical="64dp"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/transfer_select_data_fragment.xml
+++ b/app/src/main/res/layout/transfer_select_data_fragment.xml
@@ -0,0 +1,196 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    <androidx.appcompat.widget.AppCompatImageView
        android:id="@+id/icon"
        android:layout_width="48dp"
        android:layout_height="48dp"
        android:layout_marginTop="48dp"
        app:srcCompat="@drawable/check"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent" />
    <TextView
        android:id="@+id/textView"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="16dp"
        android:text="Choose data to transfer"
        android:textAlignment="center"
        android:textSize="28sp"
        android:textStyle="bold"
        app:layout_constraintTop_toBottomOf="@id/icon" />
    <CheckBox
        android:id="@+id/check_all"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:layout_constraintTop_toBottomOf="@id/textView"
        app:layout_constraintStart_toStartOf="parent"
        android:layout_marginStart="32dp"
        android:layout_marginTop="32dp" />
    <TextView
        android:id="@+id/check_all_label"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="All"
        app:layout_constraintTop_toBottomOf="@id/check_all"
        app:layout_constraintLeft_toLeftOf="@id/check_all"
        app:layout_constraintRight_toRightOf="@id/check_all"
        android:layout_marginTop="-8dp"/>
    <TextView
        android:id="@+id/selected_count"
        android:layout_width="wrap_content"
        android:layout_height="0dp"
        android:text="3 items selected"
        android:textStyle="bold"
        android:textSize="24sp"
        android:gravity="center_vertical"
        app:layout_constraintTop_toTopOf="@id/check_all"
        app:layout_constraintBottom_toTopOf="@id/selected_size"
        app:layout_constraintStart_toEndOf="@id/check_all" />
    <TextView
        android:id="@+id/selected_size"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="37.8 GB / About 28 minutes"
        android:gravity="center_vertical"
        app:layout_constraintTop_toTopOf="@id/check_all_label"
        app:layout_constraintBottom_toBottomOf="@id/check_all_label"
        app:layout_constraintStart_toStartOf="@id/selected_count" />
    <View
        android:id="@+id/divider"
        android:layout_width="match_parent"
        android:layout_height="1dp"
        android:background="?android:attr/dividerHorizontal"
        app:layout_constraintTop_toBottomOf="@id/check_all_label"
        android:layout_marginVertical="16dp"
        android:layout_marginHorizontal="16dp"/>
    <CheckBox
        android:id="@+id/check_favorites"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:layout_constraintTop_toBottomOf="@id/divider"
        app:layout_constraintLeft_toLeftOf="parent"
        android:layout_marginStart="32dp"
        android:layout_marginTop="32dp"/>
    <androidx.appcompat.widget.AppCompatImageView
        android:id="@+id/favorites_icon"
        android:layout_width="48dp"
        android:layout_height="48dp"
        android:layout_margin="16dp"
        app:srcCompat="@drawable/heart"
        app:layout_constraintStart_toEndOf="@id/check_favorites"
        app:layout_constraintTop_toTopOf="@id/check_favorites"
        app:layout_constraintBottom_toBottomOf="@id/check_favorites"/>
    <TextView
        android:id="@+id/favorites_label"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="Favorites"
        android:textSize="28sp"
        app:layout_constraintTop_toTopOf="@id/favorites_icon"
        app:layout_constraintBottom_toTopOf="@id/favorites_count"
        app:layout_constraintStart_toEndOf="@id/favorites_icon"
        android:layout_marginStart="16dp" />
    <TextView
        android:id="@+id/favorites_count"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="275 items"
        app:layout_constraintTop_toBottomOf="@id/favorites_label"
        app:layout_constraintBottom_toBottomOf="@id/favorites_icon"
        app:layout_constraintStart_toStartOf="@id/favorites_label" />
    <CheckBox
        android:id="@+id/check_history"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:layout_constraintTop_toBottomOf="@id/check_favorites"
        app:layout_constraintLeft_toLeftOf="parent"
        android:layout_marginStart="32dp"
        android:layout_marginTop="32dp"/>
    <androidx.appcompat.widget.AppCompatImageView
        android:id="@+id/history_icon"
        android:layout_width="48dp"
        android:layout_height="48dp"
        android:layout_margin="16dp"
        app:srcCompat="@drawable/history_rounded"
        app:layout_constraintStart_toEndOf="@id/check_history"
        app:layout_constraintTop_toTopOf="@id/check_history"
        app:layout_constraintBottom_toBottomOf="@id/check_history"/>
    <TextView
        android:id="@+id/history_label"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="History"
        android:textSize="28sp"
        app:layout_constraintTop_toTopOf="@id/history_icon"
        app:layout_constraintBottom_toTopOf="@id/history_count"
        app:layout_constraintStart_toEndOf="@id/history_icon"
        android:layout_marginStart="16dp" />
    <TextView
        android:id="@+id/history_count"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="2375 items"
        app:layout_constraintTop_toBottomOf="@id/history_label"
        app:layout_constraintBottom_toBottomOf="@id/history_icon"
        app:layout_constraintStart_toStartOf="@id/history_label" />
    <CheckBox
        android:id="@+id/check_downloads"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:layout_constraintTop_toBottomOf="@id/check_history"
        app:layout_constraintLeft_toLeftOf="parent"
        android:layout_marginStart="32dp"
        android:layout_marginTop="32dp"/>
    <androidx.appcompat.widget.AppCompatImageView
        android:id="@+id/downloads_icon"
        android:layout_width="48dp"
        android:layout_height="48dp"
        android:layout_margin="16dp"
        app:srcCompat="@drawable/download"
        app:layout_constraintStart_toEndOf="@id/check_downloads"
        app:layout_constraintTop_toTopOf="@id/check_downloads"
        app:layout_constraintBottom_toBottomOf="@id/check_downloads"/>
    <TextView
        android:id="@+id/downloads_label"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="Downloads"
        android:textSize="28sp"
        app:layout_constraintTop_toTopOf="@id/downloads_icon"
        app:layout_constraintBottom_toTopOf="@id/downloads_count"
        app:layout_constraintStart_toEndOf="@id/downloads_icon"
        android:layout_marginStart="16dp" />
    <TextView
        android:id="@+id/downloads_count"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="881 items"
        app:layout_constraintTop_toBottomOf="@id/downloads_label"
        app:layout_constraintBottom_toBottomOf="@id/downloads_icon"
        app:layout_constraintStart_toStartOf="@id/downloads_label" />
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/transfer_target_fragment.xml
+++ b/app/src/main/res/layout/transfer_target_fragment.xml
@@ -0,0 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools">
    <androidx.appcompat.widget.AppCompatImageView
        android:id="@+id/icon"
        android:layout_width="48dp"
        android:layout_height="48dp"
        android:layout_marginTop="48dp"
        app:srcCompat="@drawable/link"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent" />
    <TextView
        android:id="@+id/textView"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="16dp"
        android:text="Connect to your device"
        android:textAlignment="center"
        android:textSize="28sp"
        android:textStyle="bold"
        app:layout_constraintTop_toBottomOf="@id/icon" />
    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/device_list"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
        android:layout_marginHorizontal="32dp"
        android:layout_marginVertical="32dp"
        app:layout_constraintTop_toBottomOf="@id/textView"
        app:layout_constraintBottom_toBottomOf="parent" />
    <com.skyfishjy.library.RippleBackground
        android:id="@+id/ripple"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        app:rb_color="@color/colorPrimaryDark"
        app:rb_radius="32dp"
        app:rb_type="strokeRipple"/>
    <androidx.appcompat.widget.AppCompatButton
        android:id="@+id/retry_button"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="Retry"
        style="@style/Widget.AppCompat.Button.Borderless"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintRight_toRightOf="parent"
        android:visibility="invisible"
        android:layout_margin="32dp"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/transfer_wait_for_connection_fragment.xml
+++ b/app/src/main/res/layout/transfer_wait_for_connection_fragment.xml
@@ -0,0 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    <androidx.appcompat.widget.AppCompatImageView
        android:id="@+id/icon"
        android:layout_width="48dp"
        android:layout_height="48dp"
        android:layout_marginTop="48dp"
        app:srcCompat="@drawable/link"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent" />
    <TextView
        android:id="@+id/textView"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="16dp"
        android:text="Wait for connection"
        android:textAlignment="center"
        android:textSize="28sp"
        android:textStyle="bold"
        app:layout_constraintTop_toBottomOf="@id/icon" />
    <com.skyfishjy.library.RippleBackground
        android:id="@+id/ripple"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        app:layout_constraintDimensionRatio="1"
        app:layout_constraintTop_toTopOf="@id/barrier"
        app:layout_constraintBottom_toBottomOf="@id/barrier"
        app:rb_color="@color/colorPrimaryDark"
        app:rb_radius="32dp"
        app:rb_type="strokeRipple"/>
    <androidx.constraintlayout.widget.Barrier
        android:id="@+id/barrier"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:barrierDirection="top"
        app:constraint_referenced_ids="device" />
    <View
        android:id="@+id/device"
        android:layout_width="match_parent"
        android:layout_height="300dp"
        android:layout_marginHorizontal="64dp"
        app:layout_constraintBottom_toBottomOf="parent"
        android:background="@drawable/transfer_device"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -26,11 +26,21 @@
 		app:showAsAction="ifRoom">
 		<menu>
 			<group android:checkableBehavior="single">
-				<item android:id="@+id/main_menu_sort_newest"
+				<item android:id="@+id/main_menu_sort_date_added"
-					android:title="@string/main_menu_sort_newest"
+					android:title="@string/main_menu_sort_date_added"
 					android:checked="true"/>
-				<item android:id="@+id/main_menu_sort_popular"
+				<item android:id="@+id/main_menu_sort_date_published"
-					android:title="@string/main_menu_sort_popular"/>
+					android:title="@string/main_menu_sort_date_published"/>
 				<item android:id="@+id/main_menu_sort_popular_today"
 					android:title="@string/main_menu_sort_popular_today"/>
 				<item android:id="@+id/main_menu_sort_popular_week"
 					android:title="@string/main_menu_sort_popular_week"/>
 				<item android:id="@+id/main_menu_sort_popular_month"
 					android:title="@string/main_menu_sort_popular_month"/>
 				<item android:id="@+id/main_menu_sort_popular_year"
 					android:title="@string/main_menu_sort_popular_year"/>
 				<item android:id="@+id/main_menu_sort_random"
 					android:title="@string/main_menu_sort_random"/>
 			</group>
 		</menu>
 	</item>
--- a/app/src/main/res/raw/isrgrootx1.pem
+++ b/app/src/main/res/raw/isrgrootx1.pem
@@ -0,0 +1,31 @@
 -----BEGIN CERTIFICATE-----
 MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
 TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
 cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
 WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
 ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
 MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
 h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
 0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
 A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
 T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
 B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
 B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
 KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
 OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
 jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
 qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
 rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
 HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
 hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
 ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
 3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
 NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
 ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
 TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
 jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
 oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
 4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
 mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
 emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
 -----END CERTIFICATE-----
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,160 +1,202 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="galleryblock_language">言語: %1$s</string>
    <string name="galleryblock_series">シリーズ: %1$s</string>
    <string name="galleryblock_type">タイプ: %1$s</string>
    <string name="main_no_result">結果なし</string>
    <string name="search_hint">ギャラリー検索</string>
    <string name="settings_clear_cache">キャッシュクリア</string>
    <string name="settings_clear_cache_alert_message">キャッシュをクリアするとイメージのロード速度に影響を与えます。実行しますか？</string>
    <string name="settings_storage_usage">%s使用中</string>
    <string name="settings_storage_usage_loading">ストレージ使用量読み込み中…</string>
    <string name="settings_default_query">デフォルトキーワード</string>
    <string name="settings_galleries_per_page">一回にロードするギャラリー数</string>
    <string name="settings_search_title">検索設定</string>
    <string name="settings_title">設定</string>
    <string name="update_notification_description">アップデートダウンロード中</string>
    <string name="update_title">新しいアップデートがあります</string>
    <string name="warning">注意</string>
-    <string name="settings_miscellaneous_title">その他</string>
+    <string name="error">エラー</string>
-    <string name="settings_mirror_title">ミラーサーバー</string>
+    <string name="ignore">無視</string>
-    <string name="settings_clear_history">履歴を削除</string>
+    <string name="unlimited">制限なし</string>
-    <string name="settings_clear_history_alert_message">履歴を削除しますか？</string>
+
-    <string name="settings_clear_history_summary">履歴数: %1$d</string>
+    <string name="copied_to_clipboard">クリップボードにコピーしました</string>
-    <string name="main_drawer_history">履歴</string>
+
    <string name="main_drawer_home">トップ</string>
    <string name="update_release_note"># リリースノート(v%1$s)\n%2$s</string>
    <string name="settings_security_mode_title">セキュリティーモード</string>
    <string name="settings_security_mode_summary">アプリ履歴でアプリの画面を表示しない</string>
    <string name="reader_go_to_page">移動</string>
    <string name="default_query_dialog_language_selector_none">非選択</string>
    <string name="default_query_dialog_filter_BL">BLフィルター</string>
    <string name="default_query_dialog_filter_guro">グロフィルター</string>
    <string name="default_query_dialog_language">"言語: "</string>
    <string name="default_query_dialog_title">デフォルトキーワード設定</string>
    <string name="main_drawer_group_contact_title">お問い合わせ先</string>
    <string name="main_drawer_group_contact_homepage">ホームページ</string>
    <string name="main_drawer_group_contact_help">ヘルプ</string>
    <string name="main_drawer_group_contact_github">Github</string>
    <string name="main_drawer_group_contact_email">メールを送る</string>
    <string name="reader_fab_fullscreen">フルスクリーン</string>
    <string name="channel_download">ダウンロード</string>
    <string name="channel_download_description">ダウンロードの進行を通知</string>
-    <string name="reader_fab_download">バックグラウンドダウンロード</string>
+    <string name="channel_downloader">ダウンローダ</string>
-    <string name="reader_notification_text">ダウンロード中…</string>
+    <string name="channel_downloader_description">ダウンローダの状態を表示</string>
-    <string name="reader_notification_complete">ダウンロード完了</string>
+    <string name="channel_update">アップデート</string>
-    <string name="reader_fab_download_cancel">バックグラウンドダウンロード中止</string>
+    <string name="channel_update_description">アップデートの進行状況を表示</string>
    <string name="channel_transfer">転送</string>
    <string name="channel_transfer_description">他の機器へのデータ転送の進行状況を表示</string>
    <string name="unable_to_connect">hitomi.laに接続できません</string>
    <string name="lock_corrupted">ロックファイルが破損されています。Pupilを再インストールしてください。</string>
    <string name="main_no_result">結果なし</string>
    <string name="unaccessible_download_folder">アンドロイド11以上では、現在のダウンロードフォルダに外部アプリからアクセスできません。ダウンロードフォルダを変更しますか？</string>
    <string name="notification_denied">通知を無効にすると、バックグラウンドでのダウンロードとアプリのアップデート機能が使用不可になります。</string>
    <string name="main_drawer_home">トップ</string>
    <string name="main_drawer_history">履歴</string>
    <string name="main_drawer_downloads">ダウンロード</string>
    <string name="main_drawer_favorite">ブックマーク</string>
    <string name="main_drawer_group_contact_title">お問い合わせ先</string>
    <string name="main_drawer_group_contact_help">ヘルプ</string>
    <string name="main_drawer_group_contact_homepage">ホームページ</string>
    <string name="main_drawer_group_contact_github">Github</string>
    <string name="main_drawer_group_contact_email">メールを送る</string>
    <string name="main_drawer_grouop_contact_discord">ディスコード</string>
    <string name="main_menu_thin">簡単モード</string>
    <string name="main_menu_sort">並び替え</string>
    <string name="main_menu_sort_date_added">新しい順</string>
    <string name="main_menu_sort_date_published">新しい順（発売日）</string>
    <string name="main_menu_sort_popular_today">人気順（日間）</string>
    <string name="main_menu_sort_popular_week">人気順（週間）</string>
    <string name="main_menu_sort_popular_month">人気順（月間）</string>
    <string name="main_menu_sort_popular_year">人気順（年間）</string>
    <string name="main_menu_sort_random">ランダム</string>
    <string name="main_jump_title">ページ移動</string>
    <string name="main_jump_message">現ページ番号: %1$d\nページ数: %2$d</string>
-    <string name="unable_to_connect">hitomi.laに接続できません</string>
+    <string name="main_open_gallery_by_id">IDで作品を開く</string>
    <string name="main_move_to_page">%1$dページへ移動</string>
    <string name="settings_clear_downloads">ダウンロード削除</string>
    <string name="settings_clear_downloads_alert_message">ダウンロードしたギャラリーを全て削除します。\n実行しますか？</string>
    <string name="settings_mirror_summary">ミラーサーバからイメージをロード</string>
    <string name="main_drawer_favorite">ブックマーク</string>
    <string name="main_open_gallery_by_id">ギャラリー番号で見る</string>
    <string name="reader_failed_to_find_gallery">エラーが発生しました</string>
-    <string name="settings_storage">ストレージ</string>
+    <string name="main_fab_random">ランダムに作品を開く</string>
-    <string name="main_drawer_grouop_contact_discord">ディスコード</string>
+    <string name="main_fab_cancel">すべてのダウンロードをキャンセル</string>
-    <string name="settings_app_lock">アプリロック</string>
+
-    <string name="settings_app_lock_type">アップロックの種類</string>
+    <string name="main_move_to_page">%1$dページへ移動</string>
-    <string name="settings_app_version_title">バージョン(アップデート確認)</string>
+
-    <string name="settings_lock_biometrics">生体認識</string>
+    <string name="main_download">ダウンロード</string>
-    <string name="settings_lock_confirm">ロック確認のためもう一回入力してください。</string>
+    <string name="main_delete">削除</string>
-    <string name="settings_lock_enabled">有効</string>
+
-    <string name="settings_lock_fingerprint">指紋</string>
+    <string name="update_title">最新版あり</string>
-    <string name="settings_lock_password">パスワード</string>
+    <string name="update_download_completed">ダウンロードが完了しました</string>
-    <string name="settings_lock_pattern">パターン</string>
+    <string name="update_download_completed_description">ここをクリックして更新</string>
-    <string name="settings_lock_wrong_confirm">ロックが一致しません。やり直してください。</string>
+    <string name="update_notification_description">最新版をダウンロード中&#8230;</string>
-    <string name="settings_lock_none">なし</string>
+    <string name="update_release_note"># 更新履歴(v%1$s)\n%2$s</string>
-    <string name="settings_lock_remove_message">ロックを無効にしますか？</string>
+
-    <string name="reader_loading">ロード中</string>
+    <string name="search_hint">作品を検索</string>
-    <string name="main_menu_sort">ソート</string>
+    <string name="search_all">すべての作品を対象に検索</string>
-    <string name="main_menu_sort_newest">投稿日時順</string>
+    <string name="search_show_histories">履歴を見る</string>
-    <string name="main_menu_sort_popular">人気順</string>
+    <string name="search_show_tags">お気に入りのタグを見る</string>
-    <string name="ignore">無視</string>
+
-    <string name="lock_corrupted">ロックファイルが破損されています。Pupilを再再インストールしてください。</string>
+    <string name="gallery_details">作品情報</string>
-    <string name="settings_dark_mode_title">ダークモード</string>
+    <string name="gallery_thumbnails">サムネイル</string>
-    <string name="settings_dark_mode_summary">夜にシコりたい方々へ</string>
+    <string name="gallery_related">おすすめ</string>
-    <string name="gallery_details">ギャラリー情報</string>
+    <string name="gallery_artists">作者</string>
    <string name="gallery_artists">アーティスト</string>
    <string name="gallery_characters">キャラクター</string>
    <string name="gallery_groups">グループ</string>
    <string name="gallery_language">言語</string>
    <string name="gallery_series">シリーズ</string>
    <string name="gallery_characters">キャラクター</string>
    <string name="gallery_tags">タグ</string>
-    <string name="gallery_thumbnails">サムネイル</string>
+
-    <string name="gallery_related">おすすめ</string>
+    <string name="galleryblock_series">シリーズ: %1$s</string>
-    <string name="settings_nomedia_title">イメージを隠す</string>
+    <string name="galleryblock_type">タイプ: %1$s</string>
-    <string name="main_delete">削除</string>
+    <string name="galleryblock_language">言語: %1$s</string>
-    <string name="main_download">ダウンロード</string>
+
-    <string name="settings_backup_title">ブックマークバックアップ</string>
+    <!-- READER -->
-    <string name="settings_restore_title">ブックマーク復元</string>
+    <string name="reader_loading">読込中</string>
-    <string name="settings_backup_file_created">バックアップファイルを作成しました</string>
+    <string name="reader_go_to_page">移動</string>
-    <string name="settings_restore_failed">復元に失敗しました</string>
+    <string name="reader_fab_fullscreen">全画面</string>
-    <string name="settings_restore_success">%1$d項目を復元しました</string>
+    <string name="reader_fab_retry">再試行</string>
-    <string name="settings_download_folder">ダウンロード場所</string>
+    <string name="reader_fab_auto">まばたき検知スクロール</string>
-    <string name="settings_download_folder_internal">内部ストレージ</string>
+    <string name="reader_fab_auto_cancel">まばたき検知を中止</string>
-    <string name="settings_download_folder_removable">外部SDカード</string>
+    <string name="reader_fab_download">バックグラウンドでダウンロード</string>
-    <string name="settings_download_folder_available">%s 使用可能</string>
+    <string name="reader_fab_download_cancel">バックグラウンドダウンロード中止</string>
-    <string name="update_download_completed">ダウンロードが完了しました</string>
+    <string name="reader_notification_text">ダウンロード中…</string>
-    <string name="update_download_completed_description">ここをクリックしてアップデートを行えます</string>
+    <string name="reader_notification_complete">ダウンロード完了</string>
-    <string name="settings_beta">ベータチャンネルでアップデートを受信</string>
+
    <string name="camera_denied">カメラ権限が拒否されているため、まばたき検知使用できません</string>
    <string name="no_camera">この機器には前面カメラが装着されていません</string>
    <string name="downloader_running">ダウンローダー起動中</string>
    <string name="settings_title">設定</string>
    <string name="settings_app_version_title">バージョン(クリックで更新確認)</string>
    <string name="settings_app_version_description">v%s</string>
-    <string name="settings_low_quality">低解像度イメージ</string>
+    <string name="settings_beta">ベータ版チャンネルでアップデート</string>
-    <string name="settings_low_quality_summary">ロード速度とデータ使用料を改善するため低解像度イメージをロード</string>
+
    <string name="settings_search_title">検索設定</string>
    <string name="settings_galleries_per_page">一度に読み込む作品数</string>
    <string name="settings_default_query">検索語句の初期値</string>
    <string name="settings_storage">保存領域</string>
    <string name="settings_manage_storage">保存領域の管理</string>
    <string name="settings_storage_usage">%s使用中</string>
    <string name="settings_storage_usage_loading">保存領域の使用量を算出中…</string>
    <string name="settings_clear_cache">キャッシュを削除</string>
    <string name="settings_clear_cache_alert_message">キャッシュを削除すると画像の読込に時間がかかります。実行しますか？</string>
    <string name="settings_recover_downloads">ダウンロードデータベースを再構築</string>
    <string name="settings_clear_downloads">ダウンロード済みを削除</string>
    <string name="settings_clear_downloads_alert_message">ダウンロードした作品をすべて削除します。\n実行しますか？</string>
    <string name="settings_clear_history">履歴を削除</string>
    <string name="settings_clear_history_alert_message">履歴を削除しますか？</string>
    <string name="settings_clear_history_summary">履歴数: %1$d</string>
    <string name="settings_download_folder_name">フォルダ名パターン</string>
    <string name="settings_invalid_download_folder_name">フォルダ名に使用できない文字が含まれています</string>
    <string name="settings_download_folder_name_message">変数 %s は対応する値に置換されます\n\n%s</string>
    <string name="settings_download_folder">ダウンロード場所</string>
    <string name="settings_download_folder_removable">取り外し可能メディア</string>
    <string name="settings_download_folder_internal">内部の保存領域</string>
    <string name="settings_download_folder_available">%s 使用可能</string>
    <string name="settings_download_folder_custom">手動で設定</string>
    <string name="settings_download_folder_not_writable">このフォルダにアクセスできません。他のフォルダを選択してください。</string>
    <string name="settings_cache_limit">キャッシュサイズ制限</string>
    <string name="settings_nomedia_title">画像を隠す</string>
    <string name="settings_low_quality">低解像度の画像</string>
    <string name="settings_low_quality_summary">読込速度とデータ使用料を改善するため低解像度の画像を読み込む</string>
    <string name="settings_transfer_data">他の機器にデータを転送</string>
    <string name="settings_app_lock">アプリをロック</string>
    <string name="settings_app_lock_type">アップをロックする方法</string>
    <string name="settings_networking">ネットワーク</string>
    <string name="settings_mirror_summary">ミラーサーバから画像を読み込む</string>
    <string name="settings_proxy_title">プロクシ</string>
    <string name="settings_max_concurrent_download">並列ダウンロード</string>
    <string name="settings_miscellaneous_title">その他</string>
    <string name="settings_tag_translation">タグの言語</string>
    <string name="settings_tag_translation_message">Githubにて翻訳に参加できます</string>
    <string name="settings_rtl">綴じ方向を左にする</string>
    <string name="settings_security_mode_title">セキュリティーモード</string>
    <string name="settings_security_mode_summary">アプリ履歴でアプリの画面を表示しない</string>
    <string name="settings_dark_mode_title">ダークモード</string>
    <string name="settings_dark_mode_summary">夜にシコりたい方々へ</string>
    <string name="settings_import_old_galleries">旧ギャラリーインポート</string>
    <string name="settings_user_id">ユーザーID</string>
    <string name="settings_oss">オープンソースライセンス</string>
    <string name="settings_manage_favorites">ブックマーク管理</string>
    <string name="settings_backup_title">ブックマークをバックアップ</string>
    <string name="settings_backup_failed">エラーが発生しました</string>
    <string name="settings_backup_share">バックアップ共有</string>
    <string name="settings_backup_file_created">バックアップファイルを作成しました</string>
    <string name="settings_restore_title">ブックマーク復元</string>
    <string name="settings_restore_failed">復元に失敗しました</string>
    <string name="settings_restore_success">%1$d項目を復元しました</string>
    <string name="settings_lock_confirm">ロック確認のためもう一回入力してください。</string>
    <string name="settings_lock_enabled">有効</string>
    <string name="settings_lock_none">なし</string>
    <string name="settings_lock_pattern">パターン</string>
    <string name="settings_lock_password">パスワード</string>
    <string name="settings_lock_biometrics">生体認証</string>
    <string name="settings_lock_fingerprint">指紋</string>
    <string name="settings_lock_fingerprint_without_lock">予備のロックが設定されていないと指紋ロックは使用できません</string>
    <string name="settings_lock_fingerprint_prompt">Pupil 指紋ロック™</string>
    <string name="settings_lock_remove_message">ロックを無効にしますか？</string>
    <string name="settings_lock_wrong_confirm">ロックが一致しません。やり直してください。</string>
    <string name="default_query_dialog_title">検索語句の初期値を設定</string>
    <string name="default_query_dialog_language">"言語: "</string>
    <string name="default_query_dialog_filter_BL">BLフィルター</string>
    <string name="default_query_dialog_filter_guro">グロフィルター</string>
    <string name="default_query_dialog_filter_loli">登場人物を全て18歳以上にする</string>
    <string name="default_query_dialog_language_selector_none">非選択</string>
    <string name="settings_mirror_title">ミラーサーバー</string>
    <string name="proxy_dialog_type">プロクシの種類</string>
    <string name="proxy_dialog_addr_hint">サーバーアドレス</string>
    <string name="proxy_dialog_port_hint">ポート番号</string>
    <string name="proxy_dialog_username_hint">ID</string>
    <string name="proxy_dialog_type">プロクシタイプ</string>
    <string name="proxy_dialog_port_hint">ポート</string>
    <string name="proxy_dialog_password_hint">パスワード</string>
    <string name="proxy_dialog_error">エラー</string>
    <string name="proxy_dialog_addr_hint">サーバーアドレス</string>
    <string name="proxy_dialog_server">サーバー</string>
-    <string name="main_menu_thin">簡単モード</string>
+
    <string name="main_fab_cancel">すべてのダウンロードキャンセル</string>
    <string name="channel_update">アップデート</string>
    <string name="channel_update_description">アップデートの進行状態を表示</string>
    <string name="settings_import_old_galleries">旧ギャラリーインポート</string>
    <string name="import_old_galleries_folder_not_readable">フォルダを読めません</string>
    <string name="import_old_galleries_notification">旧ギャラリーインポート中…</string>
    <string name="import_old_galleries_notification_done">インポート完了</string>
    <string name="main_fab_random">ランダムギャラリーを開く</string>
    <string name="settings_lock_fingerprint_without_lock">予備のロックが設定されていないと指紋ロックは使用できません</string>
    <string name="settings_lock_fingerprint_prompt">Pupil指紋ロック™</string>
    <string name="settings_lock_fingerprint_prompt_subtitle">こうかはばつぐんだ!</string>
-    <string name="default_query_dialog_filter_loli">登場人物を全て18歳以上にする</string>
+
    <string name="settings_user_id">ユーザーID</string>
    <string name="copied_to_clipboard">クリップボードにコピーしました</string>
    <string name="reader_fab_retry">リトライ</string>
    <string name="reader_fab_auto">まばたき検知スクロール</string>
    <string name="search_all">全てのギャラリーを対象に検索</string>
    <string name="settings_rtl">綴じ方向を左にする</string>
    <string name="settings_manage_favorites">ブックマーク管理</string>
    <string name="settings_backup_failed">エラーが発生しました</string>
    <string name="settings_backup_share">バックアップ共有</string>
    <string name="channel_downloader">ダウンローダ</string>
    <string name="channel_downloader_description">ダウンローダの状態を表示</string>
    <string name="downloader_running">ダウンローダー起動中</string>
    <string name="settings_download_folder_name">フォルダ名パターン</string>
    <string name="settings_invalid_download_folder_name">フォルダ名に使用できない文字が含まれています</string>
    <string name="settings_download_folder_name_message">%sに含まれている文字列を対応する変数に置換します\n\n%s</string>
    <string name="settings_manage_storage">ストレージ管理</string>
    <string name="settings_oss">オープンソースライセンス</string>
    <string name="search_show_tags">お気に入りのタグを見る</string>
    <string name="search_show_histories">履歴を見る</string>
    <string name="reader_fab_auto_cancel">まばたき検知を中止</string>
    <string name="camera_denied">カメラ権限が拒否されているため、まばたき検知使用できません</string>
    <string name="no_camera">この機器には前面カメラが装着されていません</string>
    <string name="error">エラー</string>
    <string name="settings_cache_limit">キャッシュサイズ制限</string>
    <string name="unlimited">制限なし</string>
    <string name="settings_tag_translation">タグ言語</string>
    <string name="settings_tag_translation_message">Githubにて翻訳に参加できます</string>
    <string name="settings_max_concurrent_download">並列ダウンロード</string>
    <string name="unaccessible_download_folder">アンドロイド11以上では外部からのアプリ内部空間接近が不可能です。ダウンロードフォルダを変更しますか？</string>
    <string name="settings_networking">ネットワーク</string>
 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -21,6 +21,7 @@
    <string name="settings_clear_history_alert_message">기록을 삭제하시겠습니까?</string>
    <string name="settings_clear_history_summary">기록 %1$d개 저장됨</string>
    <string name="main_drawer_history">기록</string>
    <string name="notification_denied">백그라운드 다운로드를 위해서는 알림을 활성화할 필요가 있습니다. 알림을 비활성화하면 백그라운드 다운로드와 앱 업데이트 기능을 사용할 수 없습니다.</string>
    <string name="main_drawer_home">홈</string>
    <string name="update_release_note"># 릴리즈 노트(v%1$s)\n%2$s</string>
    <string name="settings_security_mode_summary">최근 앱 목록 창에서 앱 화면을 보이지 않게 합니다</string>
@@ -44,8 +45,10 @@
    <string name="reader_notification_complete">다운로드 완료</string>
    <string name="reader_fab_download_cancel">백그라운드 다운로드 취소</string>
    <string name="main_drawer_downloads">다운로드</string>
    <string name="main_menu_sort_random">무작위</string>
    <string name="main_jump_title">페이지 이동</string>
    <string name="main_jump_message">현재 페이지: %1$d\n페이지 수: %2$d</string>
    <string name="channel_transfer">전송</string>
    <string name="unable_to_connect">hitomi.la에 연결할 수 없습니다</string>
    <string name="main_move_to_page">%1$d 페이지로 이동</string>
    <string name="settings_clear_downloads">다운로드 삭제</string>
@@ -69,8 +72,6 @@
    <string name="settings_lock_remove_message">잠금을 해제할까요?</string>
    <string name="reader_loading">로딩중</string>
    <string name="main_menu_sort">정렬</string>
    <string name="main_menu_sort_popular">인기순</string>
    <string name="main_menu_sort_newest">시간순</string>
    <string name="ignore">무시</string>
    <string name="lock_corrupted">잠금 파일이 손상되었습니다! 앱을 재설치 해 주시기 바랍니다.</string>
    <string name="settings_dark_mode_title">다크 모드</string>
@@ -157,4 +158,13 @@
    <string name="settings_max_concurrent_download">병렬 다운로드</string>
    <string name="unaccessible_download_folder">안드로이드 11 이상에서는 외부에서 현재 다운로드 폴더에 접근할 수 없습니다. 변경하시겠습니까?</string>
    <string name="settings_networking">네트워크</string>
    <string name="settings_recover_downloads">다운로드 데이터베이스 복구</string>
    <string name="settings_transfer_data">다른 기기에 데이터 전송</string>
    <string name="channel_transfer_description">다른 기기에 데이터 전송 시 상태 표시</string>
    <string name="main_menu_sort_date_added">추가일</string>
    <string name="main_menu_sort_date_published">발매일</string>
    <string name="main_menu_sort_popular_today">인기순 (오늘)</string>
    <string name="main_menu_sort_popular_week">인기순 (이번 주)</string>
    <string name="main_menu_sort_popular_month">인기순 (이번 달)</string>
    <string name="main_menu_sort_popular_year">인기순 (이번 해)</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,6 +43,9 @@
    <string name="channel_update">Update</string>
    <string name="channel_update_description">Shows update progress</string>
    <string name="channel_transfer">Transfer</string>
    <string name="channel_transfer_description">Shows progress of transferring data to another device</string>
    <string name="unable_to_connect">Unable to connect to hitomi.la</string>
    <string name="lock_corrupted">Lock file corrupted! Please re-install Pupil</string>
@@ -51,6 +54,8 @@
    <string name="unaccessible_download_folder">From Android 11 and above, current Download folder cannot be accessed by outside apps. Would you like to change the download folder?</string>
    <string name="notification_denied">Notification permission is required for background downloads. If you deny notifications from this app, in-app update and background download will be disabled.</string>
    <string name="main_drawer_home">Home</string>
    <string name="main_drawer_history">History</string>
    <string name="main_drawer_downloads">Downloads</string>
@@ -65,8 +70,13 @@
    <string name="main_menu_thin">Thin Mode</string>
    <string name="main_menu_sort">Sort</string>
-    <string name="main_menu_sort_newest">Newest</string>
+    <string name="main_menu_sort_date_added">Date Added</string>
-    <string name="main_menu_sort_popular">Popular</string>
+    <string name="main_menu_sort_date_published">Date Published</string>
    <string name="main_menu_sort_popular_today">Popular: Today</string>
    <string name="main_menu_sort_popular_week">Popular: Week</string>
    <string name="main_menu_sort_popular_month">Popular: Month</string>
    <string name="main_menu_sort_popular_year">Popular: Year</string>
    <string name="main_menu_sort_random">Random</string>
    <string name="main_jump_title">Jump to page</string>
    <string name="main_jump_message">Current page: %1$d\nMaximum page: %2$d</string>
@@ -150,6 +160,7 @@
    <string name="settings_storage_usage_loading">Calculating storage usage…</string>
    <string name="settings_clear_cache">Clear cache</string>
    <string name="settings_clear_cache_alert_message">Deleting cache can affect image loading speed. Do you want to continue?</string>
    <string name="settings_recover_downloads">Reconstruct download database</string>
    <string name="settings_clear_downloads">Clear downloads</string>
    <string name="settings_clear_downloads_alert_message">Delete all downloaded galleries.\nDo you want to continue?</string>
    <string name="settings_clear_history">Clear history</string>
@@ -171,6 +182,7 @@
    <string name="settings_nomedia_title">Hide image from gallery</string>
    <string name="settings_low_quality">Low quality images</string>
    <string name="settings_low_quality_summary">Load low quality images to improve load speed and data usage</string>
    <string name="settings_transfer_data">Transfer data to another device</string>
    <!-- SETTINGS/APP LOCK -->
--- a/app/src/main/res/xml/file_paths.xml
+++ b/app/src/main/res/xml/file_paths.xml
@@ -18,6 +18,7 @@
  -->
 <paths>
-    <external-path name="external" path="/"/>
+    <external-path name="external" path="."/>
-    <external-files-path name="files" path="/"/>
+    <external-files-path name="files" path="."/>
    <files-path name="files" path="." />
 </paths>
--- a/app/src/main/res/xml/manage_storage_preferences.xml
+++ b/app/src/main/res/xml/manage_storage_preferences.xml
@@ -27,6 +27,11 @@
        app:key="delete_downloads"
        app:title="@string/settings_clear_downloads"/>
    <Preference
        app:key="recover_downloads"
        app:title="@string/settings_recover_downloads"
        app:iconSpaceReserved="true"/>
    <Preference
        app:key="clear_history"
        app:title="@string/settings_clear_history"/>
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -18,6 +18,9 @@
  -->
 <network-security-config>
    <domain-config cleartextTrafficPermitted="true">
        <domain includeSubdomains="false">10.0.2.2</domain>
    </domain-config>
    <domain-config cleartextTrafficPermitted="true">
        <domain includeSubdomains="false">ix.io</domain>
    </domain-config>
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -52,16 +52,14 @@
            app:defaultValue="8"
            app:useSimpleSummaryProvider="true"/>
        <Preference
            app:key="transfer_data"
            app:title="@string/settings_transfer_data"/>
        <SwitchPreferenceCompat
            app:key="nomedia"
            app:title="@string/settings_nomedia_title"/>
        <SwitchPreferenceCompat
            app:key="low_quality"
            app:title="@string/settings_low_quality"
            app:summary="@string/settings_low_quality_summary"
            app:defaultValue="true"/>
    </PreferenceCategory>
    <PreferenceCategory
--- a/app/src/test/java/xyz/quaver/pupil/ExampleUnitTest.kt
+++ b/app/src/test/java/xyz/quaver/pupil/ExampleUnitTest.kt
@@ -26,15 +26,8 @@ package xyz.quaver.pupil
 * See [testing documentation](http://d.android.com/tools/testing).
 */
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import xyz.quaver.pupil.hitomi.getGalleryInfo
 import xyz.quaver.pupil.hitomi.imageUrlFromImage
 import java.lang.reflect.ParameterizedType
 import java.util.concurrent.TimeUnit
 class ExampleUnitTest {
    @Test
--- a/build.gradle
+++ b/build.gradle
@@ -1,34 +0,0 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
    repositories {
        google()
        mavenCentral()
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:7.0.4'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
        classpath "com.google.gms:google-services:4.3.10"
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
        classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
        classpath "com.google.firebase:perf-plugin:1.4.0"
        classpath "com.google.android.gms:oss-licenses-plugin:0.10.4"
    }
 }
 allprojects {
    repositories {
        google()
        mavenCentral()
        jcenter()
        maven { url "https://jitpack.io" }
        maven { url "https://guardian.github.io/maven/repo-releases/" }
    }
 }
 task clean(type: Delete) {
    delete rootProject.buildDir
 }
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -0,0 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
    alias(libs.plugins.android.application) apply false
    alias(libs.plugins.kotlin.android) apply false
    alias(libs.plugins.kotlin.compose) apply false
    alias(libs.plugins.kotlinx.serialization) apply false
    alias(libs.plugins.gms.oss.licenses) apply false
    alias(libs.plugins.gms.google.services) apply false
    alias(libs.plugins.firebase.crashlytics) apply false
    alias(libs.plugins.firebase.perf) apply false
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 android.enableJetifier=true
 android.useAndroidX=true
-kotlin_version=1.6.10
+kotlin_version=2.1.10
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,114 @@
 [versions]
 agp = "8.8.1"
 kotlin = "2.0.0"
 activityKtx = "1.10.0"
 appcompat = "1.7.0"
 bigimageviewer = "1.8.1"
 biometric = "1.1.0"
 constraintlayout = "2.2.0"
 core = "3.1.0"
 coreKtx = "1.15.0"
 documentfilex = "0.7.2"
 espressoCore = "3.6.1"
 fab = "1.6.4"
 firebaseBom = "33.9.0"
 firebaseCrashlyticsGradle = "3.0.3"
 floatingsearchview = "1.1.7"
 fragmentKtx = "1.8.5"
 googleServices = "4.4.2"
 gradle = "8.8.0"
 gridlayout = "1.0.0"
 imagepipelineOkhttp3 = "2.6.0"
 jsoup = "1.18.3"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 kotlinAndroidExtensions = "2.1.10"
 kotlinGradlePlugin = "2.1.10"
 kotlinSerialization = "2.1.10"
 kotlinxCoroutinesAndroid = "1.8.0"
 kotlinxCoroutinesTest = "1.6.1"
 kotlinxDatetime = "0.4.0"
 kotlinxSerializationJson = "1.5.1"
 ktorNetwork = "2.3.10"
 library = "1.2.0"
 libraryVersion = "3.2"
 material = "1.12.0"
 okhttp = "3.12.12"
 ossLicensesPlugin = "0.10.6"
 patternlockview = "1.0.0"
 perfPlugin = "1.4.2"
 playServicesMlkitFaceDetection = "17.1.0"
 playServicesOssLicenses = "17.1.0"
 preferenceKtx = "1.2.1"
 recyclerview = "1.4.0"
 rules = "1.6.1"
 runner = "1.6.2"
 skyfishjyLibrary = "1.0.1"
 dotsindicator = "5.1.0"
 workRuntimeKtx = "2.10.0"
 [libraries]
 activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" }
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 bigimageviewer = { module = "com.github.piasy:BigImageViewer", version.ref = "bigimageviewer" }
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
 constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 core = { module = "ru.noties.markwon:core", version.ref = "core" }
 core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
 dirchooser-library = { module = "net.rdrei.android.dirchooser:library", version.ref = "libraryVersion" }
 documentfilex = { module = "xyz.quaver:documentfilex", version.ref = "documentfilex" }
 espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
 ext-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
 fab = { module = "com.github.clans:fab", version.ref = "fab" }
 firebase-analytics-ktx = { module = "com.google.firebase:firebase-analytics-ktx" }
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
 firebase-crashlytics-gradle = { module = "com.google.firebase:firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsGradle" }
 firebase-crashlytics-ktx = { module = "com.google.firebase:firebase-crashlytics-ktx" }
 firebase-perf-ktx = { module = "com.google.firebase:firebase-perf-ktx" }
 floatingsearchview = { module = "xyz.quaver:floatingsearchview", version.ref = "floatingsearchview" }
 fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" }
 frescoimageloader = { module = "com.github.piasy:FrescoImageLoader", version.ref = "bigimageviewer" }
 frescoimageviewfactory = { module = "com.github.piasy:FrescoImageViewFactory", version.ref = "bigimageviewer" }
 google-services = { module = "com.google.gms:google-services", version.ref = "googleServices" }
 gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
 gridlayout = { module = "androidx.gridlayout:gridlayout", version.ref = "gridlayout" }
 imagepipeline-okhttp3 = { module = "com.facebook.fresco:imagepipeline-okhttp3", version.ref = "imagepipelineOkhttp3" }
 jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 junit = { module = "junit:junit", version.ref = "junit" }
 kotlin-android-extensions = { module = "org.jetbrains.kotlin:kotlin-android-extensions", version.ref = "kotlinAndroidExtensions" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
 kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlinSerialization" }
 kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 ktor-network = { module = "io.ktor:ktor-network", version.ref = "ktorNetwork" }
 library = { module = "com.daimajia.swipelayout:library", version.ref = "library" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 oss-licenses-plugin = { module = "com.google.android.gms:oss-licenses-plugin", version.ref = "ossLicensesPlugin" }
 patternlockview = { module = "com.github.aritraroy:PatternLockView", version = "master-SNAPSHOT" }
 perf-plugin = { module = "com.google.firebase:perf-plugin", version.ref = "perfPlugin" }
 play-services-mlkit-face-detection = { module = "com.google.android.gms:play-services-mlkit-face-detection", version.ref = "playServicesMlkitFaceDetection" }
 play-services-oss-licenses = { module = "com.google.android.gms:play-services-oss-licenses", version.ref = "playServicesOssLicenses" }
 preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
 recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
 ripplebackground-library = { module = "com.skyfishjy.ripplebackground:library", version.ref = "skyfishjyLibrary" }
 rules = { module = "androidx.test:rules", version.ref = "rules" }
 runner = { module = "androidx.test:runner", version.ref = "runner" }
 dotsindicator = { module = "com.tbuonomo:dotsindicator", version.ref = "dotsindicator" }
 work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }
 recyclerview-fastscroller = { module = "com.quiph.ui:recyclerviewfastscroller", version = "1.0.0" }
 pinlockview = { module = "com.github.aritraroy:pinlockview", version = "2.1.0" }
 androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version = "1.7.8" }
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 gms-oss-licenses = { id = "com.google.android.gms.oss-licenses-plugin", version.ref = "ossLicensesPlugin" }
 gms-google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsGradle" }
 firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "perfPlugin" }
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 #Tue Oct 13 22:37:11 KST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
--- a/297
+++ b/297
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,80 +15,116 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
 #   Important for running:
 #
 #   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
 #       noncompliant, but you have some other compliant shell such as ksh or
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
 #           ksh Gradle
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
 #         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
 #           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
 #         * compound commands having a testable exit status, especially «case»;
 #         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
 #   (2) This script targets any POSIX shell, so it avoids extensions provided
 #       by Bash, Ksh, etc; in particular arrays are avoided.
 #
 #       The "traditional" practice of packing multiple parameters into a
 #       space-separated string is a well documented source of bugs and security
 #       problems, so this is (mostly) avoided, by progressively accumulating
 #       options in "$@", and eventually passing that to Java.
 #
 #       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
 #       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
 #       see the in-line comments for details.
 #
 #       There are tweaks for specific operating systems such as AIX, CygWin,
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
 #       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
 #
 ##############################################################################
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
      /*)   app_path=$link ;; #(
      *)    app_path=$APP_HOME$link ;;
    esac
 done
 SAVED="`pwd`"
 cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
 cd "$SAVED" >/dev/null
-APP_NAME="Gradle"
+# This is normally unused
-APP_BASE_NAME=`basename "$0"`
+# shellcheck disable=SC2034
-
+APP_BASE_NAME=${0##*/}
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
 ' "$PWD" ) || exit
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 warn () {
    echo "$*"
-}
+} >&2
 die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
    darwin=true
    ;;
  MINGW* )
    msys=true
    ;;
  NONSTOP* )
    nonstop=true
    ;;
 esac
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,87 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
    then
        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 fi
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-            MAX_FD="$MAX_FD_LIMIT"
+        # shellcheck disable=SC2039,SC3045
-        fi
+        MAX_FD=$( ulimit -H -n ) ||
-        ulimit -n $MAX_FD
+            warn "Could not query maximum file descriptor limit"
-        if [ $? -ne 0 ] ; then
+    esac
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+    case $MAX_FD in  #(
-        fi
+      '' | soft) :;; #(
-    else
+      *)
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-    fi
+        # shellcheck disable=SC2039,SC3045
-fi
+        ulimit -n "$MAX_FD" ||
-
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
 # For Darwin, add options to specify how the application appears in the dock
 if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
    JAVACMD=`cygpath --unix "$JAVACMD"`
    # We build the pattern for arguments to be converted via cygpath
    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
    SEP=""
    for dir in $ROOTDIRSRAW ; do
        ROOTDIRS="$ROOTDIRS$SEP$dir"
        SEP="|"
    done
    OURCYGPATTERN="(^($ROOTDIRS))"
    # Add a user-defined pattern to the cygpath arguments
    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
    fi
    # Now convert the arguments - kludge to limit ourselves to /bin/sh
    i=0
    for arg in "$@" ; do
        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
        else
            eval `echo args$i`="\"$arg\""
        fi
        i=`expr $i + 1`
    done
    case $i in
        0) set -- ;;
        1) set -- "$args0" ;;
        2) set -- "$args0" "$args1" ;;
        3) set -- "$args0" "$args1" "$args2" ;;
        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
 #   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
    JAVACMD=$( cygpath --unix "$JAVACMD" )
    # Now convert the arguments - kludge to limit ourselves to /bin/sh
    for arg do
        if
            case $arg in                                #(
              -*)   false ;;                            # don't mess with options #(
              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
                    [ -e "$t" ] ;;                      #(
              *)    false ;;
            esac
        then
            arg=$( cygpath --path --ignore --mixed "$arg" )
        fi
        # Roll the args list around exactly as many times as the number of
        # args, so each arg winds up back in the position where it started, but
        # possibly modified.
        #
        # NB: a `for` loop captures its iteration list before it begins, so
        # changing the positional parameters here affects neither the number of
        # iterations, nor the values presented in `arg`.
        shift                   # remove old arg
        set -- "$@" "$arg"      # push replacement arg
    done
 fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 # Collect all arguments for the java command:
 #   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
        -classpath "$CLASSPATH" \
        org.gradle.wrapper.GradleWrapperMain \
        "$@"
 # Stop when "xargs" is not available.
 if ! command -v xargs >/dev/null 2>&1
 then
    die "xargs is not available"
 fi
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
 #
 # In Bash we could simply go:
 #
 #   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
 #   set -- "${ARGS[@]}" "$@"
 #
 # but POSIX shell has neither arrays nor command substitution, so instead we
 # post-process each arg (as a line of input to sed) to backslash-escape any
 # character that might be a shell metacharacter, then use eval to reverse
 # that process (while maintaining the separation between arguments), and wrap
 # the whole thing up as a single "set" statement.
 #
 # This will of course break if any of these variables contains a newline or
 # an unmatched quote.
 #
 eval "set -- $(
        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
        xargs -n1 |
        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
        tr '\n' ' '
    )" '"$@"'
 exec "$JAVACMD" "$@"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
tom5079	79a4917897	build apk	2025-02-24 23:55:55 -08:00
tom5079	8c8ead5830	improve japanese	2025-02-24 23:47:44 -08:00
tom5079	a3b6b010be	build apk	2025-02-24 23:38:14 -08:00
tom5079	8bf936ee20	build apk	2025-02-24 23:38:14 -08:00
tom5079	c69972f289	update README.md	2025-02-24 23:38:14 -08:00
tom5079	05f555bb91	minsdk	2025-02-24 23:38:14 -08:00
tom5079	83d6058f2b	sort mode	2025-02-24 23:38:12 -08:00
tom5079	f888535389	migrate to kts	2025-02-24 23:36:02 -08:00
tom5079	0f2336eccf	migrate to kts	2025-02-24 23:36:02 -08:00
tom5079	e8443664dc	cleanup	2025-02-24 23:36:02 -08:00
tom5079	0f9b6963a6	dependency update	2025-02-24 23:36:02 -08:00
tom5079	6727ac1014	upgrade agp	2025-02-24 23:36:02 -08:00
tom5079	a15e2c30cb	upgrade gcp	2025-02-24 23:36:02 -08:00
tom5079	6c603b2bf3	Merge pull request #171 from maboroshin/master Update strings.xml improve Japanese translation	2025-02-09 11:24:24 -08:00
maboroshin	8146fc8473	Update strings.xml improve Japanese	2025-02-03 09:17:38 +09:00
maboroshin	3eff34e585	Update strings.xml improve Japanese	2025-02-03 08:28:10 +09:00
maboroshin	b24f4b5306	Update strings.xml reorder Japanese	2025-02-03 07:25:29 +09:00
tom5079	1bcbc5f42b	tag suggestion	2024-11-18 19:58:22 -08:00
tom5079	290b7fb158	transfer wip	2024-06-30 13:40:57 -07:00
tom5079	9f103dcffe	Merge pull request #152 from tom5079/master2 Fix ellipsize, WIP Transfer	2024-04-23 11:21:07 -07:00
tom5079	68ec919ae4	fixed downloading galleris with long title, [wip] transfer data	2024-04-17 23:25:36 -07:00
tom5079	b0e194898e	wip	2024-04-15 18:19:49 -07:00
tom5079	03b88c5b4b	wip	2024-04-11 08:44:56 -07:00
tom5079	a5d4cbfaec	fix ellipsize	2024-04-11 08:44:56 -07:00
tom5079	19450f66a0	favorite scroll to top	2024-03-01 21:50:42 -08:00
tom5079	5b36fd9257	add certificate	2024-03-01 11:56:25 -08:00
tom5079	a3158d320b	update README.md	2024-02-26 00:13:39 -08:00
tom5079	38494c9fbc	add certificate	2024-02-26 00:13:00 -08:00
tom5079	114158cf73	fix backup file selection, support hasha link	2024-01-15 19:01:30 -08:00
tom5079	6d108dd7ff	fix backup, notification for android 33+	2024-01-14 14:30:17 -08:00
tom5079	f36b7f1dbe	Update README.md	2022-07-20 09:05:47 -07:00
tom5079	0a22ebd8e9	Merge remote-tracking branch 'origin/master'	2022-07-20 09:04:35 -07:00
tom5079	3682eeaf94	Fix image not retrying	2022-07-20 09:04:23 -07:00
tom5079	7df2ae4ba7	Update README.md	2022-07-19 20:31:42 -07:00
tom5079	c9519ec681	Fix image not retrying	2022-07-19 20:29:39 -07:00
tom5079	b146ed684d	Fix app crashing when recovering metadata is corrupt	2022-05-31 08:06:48 +09:00
tom5079	d2787c36d7	Update README.md	2022-04-24 20:39:17 +09:00
tom5079	3ff663114a	5.3.7	2022-04-24 20:39:01 +09:00
tom5079	573e62f310	5.3.7	2022-04-24 20:36:56 +09:00
tom5079	f9af670b82	Update README.md	2022-04-24 20:21:41 +09:00
tom5079	bf461475c6	Merge remote-tracking branch 'origin/master'	2022-04-24 20:20:55 +09:00
tom5079	bdea6e0cc1	Use System.currentTimeMillis() instead of Instant	2022-04-24 20:20:45 +09:00
tom5079	57f0ec4e5d	Update README.md	2022-04-24 18:44:10 +09:00
tom5079	d663092363	v5.3.5	2022-04-24 18:27:56 +09:00
tom5079	edf6188e36	Merge pull request #126 from tom5079/Pupil-116 Pupil 116 Favorite tag backup	2022-04-24 18:08:13 +09:00
tom5079	f3f3395e68	Merge pull request #128 from tom5079/Pupil-127 Pupil-127 Use gg.js directly	2022-04-24 18:08:04 +09:00
tom5079	ac9dc347e3	Pupil-127 Use gg.js directly	2022-04-22 16:39:13 +09:00
tom5079	8721d85946	Show ProgressDrawable when backup	2022-04-21 17:41:06 +09:00
tom5079	a0bd1a8738	Pupil-116 Add favorite tags backup	2022-04-21 17:26:58 +09:00
tom5079	35fdf3e3b0	Update PreferenceFragments to comply with updated library	2022-04-21 16:49:13 +09:00
tom5079	aced8293f1	Dependency Update	2022-04-21 16:45:13 +09:00
tom5079	3f516faad8	AGP update	2022-04-21 16:42:34 +09:00
tom5079	824f7b9602	Merge remote-tracking branch 'origin/master'	2022-04-16 06:30:31 +09:00
tom5079	95aeeaa16f	updated .gitignore	2022-04-16 06:30:10 +09:00
tom5079	63f08f0230	Fixed Downloaded folder gets deleted when opened with no network	2022-03-25 16:48:38 +09:00
tom5079	3b241fe857	Delete watchdiff.yml	2022-02-02 06:38:50 +09:00
tom5079	75bc104f43	Update watchdiff.yml	2022-02-02 05:57:55 +09:00
tom5079	30afd56324	Update README.md	2022-02-01 19:11:55 +09:00
tom5079	5ee1bb11a0	Merge remote-tracking branch 'origin/master'	2022-02-01 19:11:25 +09:00
tom5079	c1de45abce	use webp by default	2022-02-01 19:10:54 +09:00
tom5079	8805033c8d	Update README.md	2022-02-01 17:47:46 +09:00
tom5079	0ed59bb8a9	Merge remote-tracking branch 'origin/master'	2022-02-01 17:46:44 +09:00
tom5079	8163f2fd28	Bug fix	2022-02-01 17:46:35 +09:00
tom5079	521a65c9d2	Update README.md	2022-02-01 17:37:50 +09:00
tom5079	eb98424668	Bug fix	2022-02-01 17:36:44 +09:00
tom5079	961c731743	Merge remote-tracking branch 'origin/master'	2022-02-01 11:45:54 +09:00
tom5079	5188769fb6	Fuck hitomi	2022-02-01 11:45:45 +09:00
tom5079	8f27d9e30f	Update README.md	2022-02-01 11:45:35 +09:00
tom5079	b58566999e	Update README.md	2022-02-01 11:40:23 +09:00
tom5079	117d6dcd2b	Fuck hitomi	2022-02-01 11:39:26 +09:00
tom5079	2608796929	Remove dumb code	2022-01-31 13:28:31 +09:00
tom5079	792f5b5a7f	Fixed downloading after revisiting cached manga	2022-01-31 13:27:23 +09:00
tom5079	a77b1db749	Merge remote-tracking branch 'origin/master'	2022-01-31 13:18:28 +09:00
tom5079	9d984d92af	Fixed downloading after revisiting cached manga	2022-01-31 13:17:44 +09:00
tom5079	e303f25991	Update README.md	2022-01-31 11:10:02 +09:00
tom5079	85973d2305	Merge remote-tracking branch 'origin/master'	2022-01-31 11:05:05 +09:00
tom5079	13f8d7b747	Added download database recovery	2022-01-31 11:04:52 +09:00
tom5079	e198860edb	Update README.md	2022-01-31 07:39:58 +09:00
tom5079	fc8355467b	Fixed autoupdate for Android 5 and 6	2022-01-31 01:46:22 +09:00
tom5079	67abc15442	Merge remote-tracking branch 'origin/master'	2022-01-31 01:03:26 +09:00
tom5079	e94cddb86a	Hitomi is stupid enough to block user agent for chrome... holy shit Added self-test and reload Reduced update ignoring time to 1d from 1w	2022-01-31 01:02:47 +09:00
tom5079	700f7a33a5	Update README.md	2022-01-25 05:00:04 +09:00
tom5079	41e952144d	Merge remote-tracking branch 'origin/master'	2022-01-25 04:59:37 +09:00
tom5079	910ed65937	Improve startup speed	2022-01-25 04:59:25 +09:00
tom5079	e06701a2fb	Update README.md	2022-01-25 04:30:24 +09:00
tom5079	62dce26c73	Merge remote-tracking branch 'origin/master'	2022-01-25 04:28:16 +09:00
tom5079	ac0cff62d4	Ask user to update WebView when es2020 is not supported	2022-01-25 04:28:04 +09:00
tom5079	655c060814	Drop Guava from dependency	2022-01-22 10:00:28 +09:00
tom5079	36d27895e7	Update README.md	2022-01-21 17:11:03 +09:00
tom5079	803481f74c	Merge remote-tracking branch 'origin/master'	2022-01-21 17:08:57 +09:00
tom5079	b3ca1686e3	5.2.19 Improved error report Lenient JSON decoding	2022-01-21 17:08:49 +09:00
tom5079	8f220eb0cb	Update README.md	2022-01-20 19:42:41 +09:00
tom5079	51d5f42e8b	Merge remote-tracking branch 'origin/master'	2022-01-20 19:41:22 +09:00
tom5079	8d8c5ace61	Fixed {}	2022-01-20 19:41:10 +09:00
tom5079	4bb6b8ccc9	Update README.md	2022-01-20 18:06:28 +09:00