Release 1.8.5.3

Since we set it through setGraph()

README.md

@@ -73,6 +73,12 @@ with Material Design 3 and Dynamic Color Support
 ![screenshot-01](https://github.com/Ehviewer-Overhauled/Art/blob/master/screenshot-01.png)
 ![screenshot-02](https://github.com/Ehviewer-Overhauled/Art/blob/master/screenshot-02.png)
 
+# Localization
+
+Thank you to each of the **Ehviewer Overhauled** translators, and if you would like to contribute, please submit a translation via [Weblate](https://hosted.weblate.org/engage/ehviewer-overhauled/).
+
+[<img src="https://hosted.weblate.org/widgets/ehviewer-overhauled/-/horizontal-auto.svg" alt="" />](https://hosted.weblate.org/engage/ehviewer-overhauled/)
+
 # Thanks
 
 Here is the libraries

app/build.gradle

@@ -32,9 +32,9 @@ android {
         applicationId "moe.tarsin.ehviewer"
         minSdkVersion 28
         targetSdkVersion 33
-        versionCode 180030
-        versionName "1.8.5.3-alpha04"
-        resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
+        versionCode 180031
+        versionName "1.8.5.3"
+        resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th', 'nb-rNO'
     }
 
     externalNativeBuild {
@@ -52,9 +52,7 @@ android {
         jvmTarget = '19'
         freeCompilerArgs += [
                 // https://kotlinlang.org/docs/compiler-reference.html#progressive
-                "-progressive",
-                "-P",
-                "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true"
+                "-progressive"
         ]
     }
 
@@ -66,7 +64,8 @@ android {
 
     packagingOptions {
         resources {
-            excludes += "/META-INF/**"
+            excludes += "/META-INF/CHANGES"
+            excludes += "/META-INF/README.md"
             excludes += "/kotlin/**"
             excludes += "**.txt"
             excludes += "**.bin"
@@ -95,105 +94,70 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.0-alpha02"
+        kotlinCompilerExtensionVersion = "1.4.0"
     }
 
     namespace 'com.hippo.ehviewer'
 }
 
 dependencies {
-    def activity_version = "1.6.1"
-    implementation "androidx.activity:activity-ktx:$activity_version"
-    implementation "androidx.activity:activity-compose:$activity_version"
-
-    implementation "androidx.annotation:annotation:1.5.0"
-    implementation "androidx.annotation:annotation-experimental:1.3.0"
-    implementation "androidx.appcompat:appcompat:1.7.0-alpha01"
-
-    def arch_core_version = "2.1.0"
-    implementation "androidx.arch.core:core-common:$arch_core_version"
-    implementation "androidx.arch.core:core-runtime:$arch_core_version"
-
+    // https://developer.android.com/jetpack/androidx/releases/activity
+    implementation "androidx.activity:activity-compose:1.6.1"
+    implementation "androidx.appcompat:appcompat:1.6.0"
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
     implementation "androidx.browser:browser:1.4.0"
 
-    def collection_version = "1.3.0-alpha02"
-    implementation "androidx.collection:collection:$collection_version"
-    implementation "androidx.collection:collection-ktx:$collection_version"
-
-    implementation platform("androidx.compose:compose-bom:2022.12.00")
+    // https://developer.android.com/jetpack/androidx/releases/compose-material3
+    implementation platform("androidx.compose:compose-bom:2023.01.00")
     implementation "androidx.compose.material:material-icons-extended"
     implementation "androidx.compose.material3:material3"
-    implementation 'androidx.compose.ui:ui-tooling-preview'
 
     implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha05"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
+    // https://developer.android.com/jetpack/androidx/releases/lifecycle
+    implementation "androidx.lifecycle:lifecycle-process:2.5.1"
 
-    def core_version = "1.9.0"
-    implementation "androidx.core:core-ktx:$core_version"
-
-    implementation "androidx.customview:customview:1.2.0-alpha02"
-    implementation "androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03"
-
-    def fragment_version = "1.6.0-alpha04"
-    implementation "androidx.fragment:fragment-ktx:$fragment_version"
-
-    def lifecycle_version = "2.6.0-alpha04"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
-
-    implementation "androidx.loader:loader:1.1.0"
-
+    // https://developer.android.com/jetpack/androidx/releases/navigation
     def nav_version = "2.5.3"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
     implementation "androidx.navigation:navigation-compose:$nav_version"
 
+    // https://developer.android.com/jetpack/androidx/releases/paging
     implementation "androidx.paging:paging-runtime-ktx:3.2.0-alpha03"
-
     implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.3.0-rc01'
 
-    def room_version = "2.5.0-rc01"
-    implementation "androidx.room:room-runtime:$room_version"
+    // https://developer.android.com/jetpack/androidx/releases/room
+    def room_version = "2.5.0"
     ksp "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-paging:$room_version"
 
-    implementation 'androidx.startup:startup-runtime:1.2.0-alpha02'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
-    implementation "androidx.transition:transition-ktx:1.4.1"
-    implementation "androidx.vectordrawable:vectordrawable:1.2.0-beta01"
-    implementation "androidx.vectordrawable:vectordrawable-animated:1.1.0"
-    implementation 'androidx.viewpager:viewpager:1.1.0-alpha01'
-    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
-
     implementation 'com.drakeet.drawer:drawer:1.0.3'
-
-    def accompanist_version = "0.28.0"
-    implementation "com.google.accompanist:accompanist-themeadapter-material3:$accompanist_version"
-
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0' // Dead Dependency
+    implementation 'com.github.tachiyomiorg:DirectionalViewPager:1.0.0' // Dead Dependency
+    // https://github.com/google/accompanist/releases
+    implementation "com.google.accompanist:accompanist-themeadapter-material3:0.28.0"
     implementation 'com.google.android.material:material:1.8.0-rc01'
 
+    // https://square.github.io/okhttp/changelogs/changelog/
     implementation 'com.squareup.okhttp3:okhttp-bom:5.0.0-alpha.11'
-    implementation 'com.squareup.okhttp3:okhttp'
     implementation 'com.squareup.okhttp3:okhttp-coroutines'
 
+    implementation 'com.squareup.okio:okio-jvm:3.3.0'
+
+    implementation 'dev.chrisbanes.insetter:insetter:0.6.1' // Dead Dependency
     implementation 'dev.rikka.rikkax.core:core-ktx:1.4.1'
     implementation 'dev.rikka.rikkax.insets:insets:1.3.0'
     implementation 'dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0'
     implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.3'
     implementation 'dev.rikka.rikkax.material:material-preference:2.0.0'
-    implementation 'io.coil-kt:coil:2.2.2'
+    // https://coil-kt.github.io/coil/changelog/
+    // implementation 'io.coil-kt:coil:2.2.2'
+    implementation 'com.github.Ehviewer-Overhauled.coil:coil:d65881d'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
     implementation 'org.jsoup:jsoup:1.15.3'
-
-    // Tachiyomi Reader
-    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation 'dev.chrisbanes.insetter:insetter:0.6.1'
 }
 
 configurations.all {

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

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,14 +15,8 @@
   ~ limitations under the License.
   -->
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="256dp"
-    android:height="256dp"
-    android:tint="@color/brown_500"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="@string/pd_cookie" />
+<resources>
 
-</vector>
+    <string name="app_name" translatable="false">EhViewer Debug</string>
+
+</resources>

app/src/main/AndroidManifest.xml

@@ -34,7 +34,7 @@
         android:theme="@style/AppTheme"
         tools:targetApi="tiramisu">
         <activity
-            android:name=".ui.LoginActivity"
+            android:name=".ui.login.LoginActivity"
             android:exported="false"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize"/>

app/src/main/cpp/CMakeLists.txt

@@ -45,6 +45,6 @@ SET(LIBARCHIVE_CUSTOM_LIBS "liblzma" "nettle")
 add_subdirectory(libarchive)
 
 # Build and link our app's native lib
-add_library(${PROJECT_NAME} SHARED archive.c fdutils.c)
+add_library(${PROJECT_NAME} SHARED archive.c fdutils.c gifutils.c)
 target_include_directories(${PROJECT_NAME} PUBLIC libarchive/libarchive)
 target_link_libraries(${PROJECT_NAME} archive_static log -Wl,--gc-sections)

app/src/main/cpp/fdutils.c

@@ -1,4 +1,13 @@
 #include <jni.h>
+#include <sys/mman.h>
+
+#include <android/log.h>
+#include <string.h>
+#include <errno.h>
+
+#define LOG_TAG "mmap_utils"
+
+#include "ehviewer.h"
 
 JNIEXPORT jint JNICALL
 Java_com_hippo_Native_getFd(JNIEnv *env, jclass clazz, jobject fileDescriptor) {
@@ -13,4 +22,22 @@ Java_com_hippo_Native_getFd(JNIEnv *env, jclass clazz, jobject fileDescriptor) {
     }
 
     return fd;
-}
+}
+
+JNIEXPORT jobject JNICALL
+Java_com_hippo_Native_mapFd(JNIEnv *env, jclass clazz, jint fd, jlong capability) {
+    void *addr = mmap(0, capability, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
+    if (addr != MAP_FAILED) {
+        return (*env)->NewDirectByteBuffer(env, addr, capability);
+    } else {
+        LOGE("%s%s", "mmap failed with error ", strerror(errno));
+        return NULL;
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_hippo_Native_unmapDirectByteBuffer(JNIEnv *env, jclass clazz, jobject buffer) {
+    void *addr = (*env)->GetDirectBufferAddress(env, buffer);
+    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
+    if (munmap(addr, size)) LOGE("munmap addr:%p, size%zu failed!", addr, size);
+}

app/src/main/cpp/gifutils.c

@@ -0,0 +1,44 @@
+#include <jni.h>
+#include <string.h>
+#include <stdbool.h>
+#include <android/log.h>
+
+#define LOG_TAG "gifUtils"
+
+#include "ehviewer.h"
+
+#define GIF_HEADER_87A "GIF87a"
+#define GIF_HEADER_89A "GIF89a"
+
+static int FRAME_DELAY_START_MARKER = 0x0021F904;
+
+typedef signed char byte;
+
+#define FRAME_DELAY_START_MARKER ((byte*)(&FRAME_DELAY_START_MARKER))
+#define MINIMUM_FRAME_DELAY 2
+#define DEFAULT_FRAME_DELAY 10
+
+static inline bool isGif(void *addr) {
+    return !memcmp(addr, GIF_HEADER_87A, 6) || !memcmp(addr, GIF_HEADER_89A, 6);
+}
+
+JNIEXPORT void JNICALL
+Java_com_hippo_image_Image_rewriteGifSource(JNIEnv *env, jclass clazz, jobject buffer) {
+    byte *addr = (*env)->GetDirectBufferAddress(env, buffer);
+    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
+    if (size < 7 || !isGif(addr)) return;
+    for (size_t i = 0; i < size - 8; i++) {
+        // TODO: Optimize this hex find with SIMD?
+        if (addr[i] == FRAME_DELAY_START_MARKER[3] && addr[i + 1] == FRAME_DELAY_START_MARKER[2] &&
+            addr[i + 2] == FRAME_DELAY_START_MARKER[1] &&
+            addr[i + 3] == FRAME_DELAY_START_MARKER[0]) {
+            byte *end = addr + i + 4;
+            if (end[4] != 0) continue;
+            int frameDelay = end[2] << 8 | end[1];
+            if (frameDelay > MINIMUM_FRAME_DELAY)
+                break; // Quit if the first block looks normal, for performance
+            end[1] = DEFAULT_FRAME_DELAY;
+            end[2] = 0;
+        }
+    }
+}

app/src/main/java/androidx/navigation/ui/NavigationUI.kt

@@ -0,0 +1,49 @@
+package androidx.navigation.ui
+
+import android.view.Menu
+import android.view.MenuItem
+import androidx.annotation.IdRes
+import androidx.navigation.ActivityNavigator
+import androidx.navigation.NavController
+import androidx.navigation.NavDestination
+import androidx.navigation.NavDestination.Companion.hierarchy
+import androidx.navigation.NavGraph.Companion.findStartDestination
+import androidx.navigation.NavOptions
+
+fun onNavDestinationSelected2(item: MenuItem, navController: NavController): Boolean {
+    if (navController.currentDestination?.matchDestination(item.itemId) == true) return false
+    val builder = NavOptions.Builder().setLaunchSingleTop(true)
+    if (
+        navController.currentDestination!!.parent!!.findNode(item.itemId)
+                is ActivityNavigator.Destination
+    ) {
+        builder.setEnterAnim(R.anim.nav_default_enter_anim)
+            .setExitAnim(R.anim.nav_default_exit_anim)
+            .setPopEnterAnim(R.anim.nav_default_pop_enter_anim)
+            .setPopExitAnim(R.anim.nav_default_pop_exit_anim)
+    } else {
+        builder.setEnterAnim(com.hippo.ehviewer.R.anim.scene_open_enter)
+            .setExitAnim(com.hippo.ehviewer.R.anim.scene_open_exit)
+            .setPopEnterAnim(com.hippo.ehviewer.R.anim.scene_close_enter)
+            .setPopExitAnim(com.hippo.ehviewer.R.anim.scene_close_exit)
+    }
+    if (item.order and Menu.CATEGORY_SECONDARY == 0) {
+        builder.setPopUpTo(
+            navController.graph.findStartDestination().id,
+            inclusive = false,
+            saveState = false
+        )
+    }
+    val options = builder.build()
+    return try {
+        // TODO provide proper API instead of using Exceptions as Control-Flow.
+        navController.navigate(item.itemId, null, options)
+        // Return true only if the destination we've navigated to matches the MenuItem
+        navController.currentDestination?.matchDestination(item.itemId) == true
+    } catch (e: IllegalArgumentException) {
+        false
+    }
+}
+
+fun NavDestination.matchDestination(@IdRes destId: Int): Boolean =
+    hierarchy.any { it.id == destId }

app/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.kt

@@ -476,10 +476,8 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
 
     private fun setGestureDetector(context: Context) {
         detector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() {
-            @Suppress("SENSELESS_COMPARISON")
             override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
-                // The e1 can be null, that's weird and cause crash
-                if (panEnabled && isReady && vTranslate != null && e1 != null && e2 != null && (abs(e1.x - e2.x) > 50 || abs(e1.y - e2.y) > 50) && (abs(velocityX) > 500 || abs(velocityY) > 500) && !isZooming) {
+                if (panEnabled && isReady && vTranslate != null && (abs(e1.x - e2.x) > 50 || abs(e1.y - e2.y) > 50) && (abs(velocityX) > 500 || abs(velocityY) > 500) && !isZooming) {
                     val vTranslateEnd = PointF(vTranslate!!.x + velocityX * 0.25F, vTranslate!!.y + velocityY * 0.25F)
                     val sCenterXEnd = (width / 2 - vTranslateEnd.x) / scale
                     val sCenterYEnd = (height / 2 - vTranslateEnd.y) / scale
@@ -607,12 +605,16 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
             return true
         }
         // Detect flings, taps and double taps
-        if (!isQuickScaling && detector?.onTouchEvent(event) != false) {
-            isZooming = false
-            isPanning = false
-            maxTouchCount = 0
-            return true
+        // May throw NPE
+        runCatching {
+            if (!isQuickScaling && detector?.onTouchEvent(event) != false) {
+                isZooming = false
+                isPanning = false
+                maxTouchCount = 0
+                return true
+            }
         }
+
         if (vTranslateStart == null) {
             vTranslateStart = PointF(0F, 0F)
         }

app/src/main/java/com/hippo/Native.kt

@@ -18,6 +18,7 @@
 package com.hippo
 
 import java.io.FileDescriptor
+import java.nio.ByteBuffer
 
 object Native {
     fun initialize() {
@@ -26,4 +27,10 @@ object Native {
 
     @JvmStatic
     external fun getFd(fd: FileDescriptor?): Int
-}
+
+    @JvmStatic
+    external fun mapFd(fd: Int, capability: Long): ByteBuffer?
+
+    @JvmStatic
+    external fun unmapDirectByteBuffer(buffer: ByteBuffer)
+}

app/src/main/java/com/hippo/UriArchiveAccessor.kt

@@ -19,6 +19,7 @@ package com.hippo
 
 import android.content.Context
 import android.net.Uri
+import com.hippo.image.Image
 import java.nio.ByteBuffer
 
 class UriArchiveAccessor(ctx: Context, uri: Uri) {
@@ -28,7 +29,7 @@ class UriArchiveAccessor(ctx: Context, uri: Uri) {
     }
 
     private external fun openArchive(fd: Int, size: Long): Int
-    external fun extractToByteBuffer(index: Int): ByteBuffer?
+    private external fun extractToByteBuffer(index: Int): ByteBuffer?
     external fun extractToFd(index: Int, fd: Int)
     external fun getFilename(index: Int): String
     external fun needPassword(): Boolean
@@ -39,8 +40,23 @@ class UriArchiveAccessor(ctx: Context, uri: Uri) {
         pfd.close()
     }
 
+    fun getImageSource(index: Int): Image.ByteBufferSource? {
+        val buffer = extractToByteBuffer(index)
+        buffer ?: return null
+        check(buffer.isDirect)
+        return object : Image.ByteBufferSource {
+            override fun getByteBuffer(): ByteBuffer {
+                return buffer
+            }
+
+            override fun close() {
+                releaseByteBuffer(buffer)
+            }
+        }
+    }
+
     companion object {
         @JvmStatic
-        external fun releaseByteBuffer(buffer: ByteBuffer)
+        private external fun releaseByteBuffer(buffer: ByteBuffer)
     }
 }

app/src/main/java/com/hippo/beerbelly/DiskLruCache.java

@@ -1,985 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * 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 com.hippo.beerbelly;
-
-import java.io.BufferedWriter;
-import java.io.Closeable;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * A cache that uses a bounded amount of space on a filesystem. Each cache
- * entry has a string key and a fixed number of values. Each key must match
- * the regex <strong>[a-z0-9_-]{1,120}</strong>. Values are byte sequences,
- * accessible as streams or files. Each value must be between {@code 0} and
- * {@code Integer.MAX_VALUE} bytes in length.
- *
- * <p>The cache stores its data in a directory on the filesystem. This
- * directory must be exclusive to the cache; the cache may delete or overwrite
- * files from its directory. It is an error for multiple processes to use the
- * same cache directory at the same time.
- *
- * <p>This cache limits the number of bytes that it will store on the
- * filesystem. When the number of stored bytes exceeds the limit, the cache will
- * remove entries in the background until the limit is satisfied. The limit is
- * not strict: the cache may temporarily exceed it while waiting for files to be
- * deleted. The limit does not include filesystem overhead or the cache
- * journal so space-sensitive applications should set a conservative limit.
- *
- * <p>Clients call {@link #edit} to create or update the values of an entry. An
- * entry may have only one editor at one time; if a value is not available to be
- * edited then {@link #edit} will return null.
- * <ul>
- * <li>When an entry is being <strong>created</strong> it is necessary to
- * supply a full set of values; the empty value should be used as a
- * placeholder if necessary.
- * <li>When an entry is being <strong>edited</strong>, it is not necessary
- * to supply data for every value; values default to their previous
- * value.
- * </ul>
- * Every {@link #edit} call must be matched by a call to {@link Editor#commit}
- * or {@link Editor#abort}. Committing is atomic: a read observes the full set
- * of values as they were before or after the commit, but never a mix of values.
- *
- * <p>Clients call {@link #get} to read a snapshot of an entry. The read will
- * observe the value at the time that {@link #get} was called. Updates and
- * removals after the call do not impact ongoing reads.
- *
- * <p>This class is tolerant of some I/O errors. If files are missing from the
- * filesystem, the corresponding entries will be dropped from the cache. If
- * an error occurs while writing a cache value, the edit will fail silently.
- * Callers should handle other problems by catching {@code IOException} and
- * responding appropriately.
- */
-public final class DiskLruCache implements Closeable {
-    static final String JOURNAL_FILE = "journal";
-    static final String JOURNAL_FILE_TEMP = "journal.tmp";
-    static final String JOURNAL_FILE_BACKUP = "journal.bkp";
-    static final String MAGIC = "libcore.io.DiskLruCache";
-    static final String VERSION_1 = "1";
-    static final long ANY_SEQUENCE_NUMBER = -1;
-    static final String STRING_KEY_PATTERN = "[a-z0-9_-]{1,120}";
-    static final Pattern LEGAL_KEY_PATTERN = Pattern.compile(STRING_KEY_PATTERN);
-    private static final String CLEAN = "CLEAN";
-    private static final String DIRTY = "DIRTY";
-    private static final String REMOVE = "REMOVE";
-    private static final String READ = "READ";
-
-    /*
-     * This cache uses a journal file named "journal". A typical journal file
-     * looks like this:
-     *     libcore.io.DiskLruCache
-     *     1
-     *     100
-     *     2
-     *
-     *     CLEAN 3400330d1dfc7f3f7f4b8d4d803dfcf6 832 21054
-     *     DIRTY 335c4c6028171cfddfbaae1a9c313c52
-     *     CLEAN 335c4c6028171cfddfbaae1a9c313c52 3934 2342
-     *     REMOVE 335c4c6028171cfddfbaae1a9c313c52
-     *     DIRTY 1ab96a171faeeee38496d8b330771a7a
-     *     CLEAN 1ab96a171faeeee38496d8b330771a7a 1600 234
-     *     READ 335c4c6028171cfddfbaae1a9c313c52
-     *     READ 3400330d1dfc7f3f7f4b8d4d803dfcf6
-     *
-     * The first five lines of the journal form its header. They are the
-     * constant string "libcore.io.DiskLruCache", the disk cache's version,
-     * the application's version, the value count, and a blank line.
-     *
-     * Each of the subsequent lines in the file is a record of the state of a
-     * cache entry. Each line contains space-separated values: a state, a key,
-     * and optional state-specific values.
-     *   o DIRTY lines track that an entry is actively being created or updated.
-     *     Every successful DIRTY action should be followed by a CLEAN or REMOVE
-     *     action. DIRTY lines without a matching CLEAN or REMOVE indicate that
-     *     temporary files may need to be deleted.
-     *   o CLEAN lines track a cache entry that has been successfully published
-     *     and may be read. A publish line is followed by the lengths of each of
-     *     its values.
-     *   o READ lines track accesses for LRU.
-     *   o REMOVE lines track entries that have been deleted.
-     *
-     * The journal file is appended to as cache operations occur. The journal may
-     * occasionally be compacted by dropping redundant lines. A temporary file named
-     * "journal.tmp" will be used during compaction; that file should be deleted if
-     * it exists when the cache is opened.
-     */
-    private static final OutputStream NULL_OUTPUT_STREAM = new OutputStream() {
-        @Override
-        public void write(int b) {
-            // Eat all writes silently. Nom nom.
-        }
-    };
-    /**
-     * This cache uses a single background thread to evict entries.
-     */
-    final ThreadPoolExecutor executorService =
-            new ThreadPoolExecutor(0, 1, 60L, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
-    private final File directory;
-    private final File journalFile;
-    private final File journalFileTmp;
-    private final File journalFileBackup;
-    private final int appVersion;
-    private final int valueCount;
-    private final LinkedHashMap<String, Entry> lruEntries =
-            new LinkedHashMap<>(0, 0.75f, true);
-    private long maxSize;
-    private long size = 0;
-    private Writer journalWriter;
-    private int redundantOpCount;
-    /**
-     * To differentiate between old and current snapshots, each entry is given
-     * a sequence number each time an edit is committed. A snapshot is stale if
-     * its sequence number is not equal to its entry's sequence number.
-     */
-    private long nextSequenceNumber = 0;
-
-    private DiskLruCache(File directory, int appVersion, int valueCount, long maxSize) {
-        this.directory = directory;
-        this.appVersion = appVersion;
-        this.journalFile = new File(directory, JOURNAL_FILE);
-        this.journalFileTmp = new File(directory, JOURNAL_FILE_TEMP);
-        this.journalFileBackup = new File(directory, JOURNAL_FILE_BACKUP);
-        this.valueCount = valueCount;
-        this.maxSize = maxSize;
-    }
-
-    /**
-     * Opens the cache in {@code directory}, creating a cache if none exists
-     * there.
-     *
-     * @param directory  a writable directory
-     * @param valueCount the number of values per cache entry. Must be positive.
-     * @param maxSize    the maximum number of bytes this cache should use to store
-     * @throws IOException if reading or writing the cache directory fails
-     */
-    public static DiskLruCache open(File directory, int appVersion, int valueCount, long maxSize)
-            throws IOException {
-        if (maxSize <= 0) {
-            throw new IllegalArgumentException("maxSize <= 0");
-        }
-        if (valueCount <= 0) {
-            throw new IllegalArgumentException("valueCount <= 0");
-        }
-
-        // If a bkp file exists, use it instead.
-        File backupFile = new File(directory, JOURNAL_FILE_BACKUP);
-        if (backupFile.exists()) {
-            File journalFile = new File(directory, JOURNAL_FILE);
-            // If journal file also exists just delete backup file.
-            if (journalFile.exists()) {
-                backupFile.delete();
-            } else {
-                renameTo(backupFile, journalFile, false);
-            }
-        }
-
-        // Prefer to pick up where we left off.
-        DiskLruCache cache = new DiskLruCache(directory, appVersion, valueCount, maxSize);
-        if (cache.journalFile.exists()) {
-            try {
-                cache.readJournal();
-                cache.processJournal();
-                return cache;
-            } catch (IOException journalIsCorrupt) {
-                System.out
-                        .println("DiskLruCache "
-                                + directory
-                                + " is corrupt: "
-                                + journalIsCorrupt.getMessage()
-                                + ", removing");
-                cache.delete();
-            }
-        }
-
-        // Create a new empty cache.
-        directory.mkdirs();
-        cache = new DiskLruCache(directory, appVersion, valueCount, maxSize);
-        cache.rebuildJournal();
-        return cache;
-    }
-
-    private static void deleteIfExists(File file) throws IOException {
-        if (file.exists() && !file.delete()) {
-            throw new IOException();
-        }
-    }
-
-    private static void renameTo(File from, File to, boolean deleteDestination) throws IOException {
-        if (deleteDestination) {
-            deleteIfExists(to);
-        }
-        if (!from.renameTo(to)) {
-            throw new IOException();
-        }
-    }
-
-    private static String inputStreamToString(InputStream in) throws IOException {
-        return Util.readFully(new InputStreamReader(in, Util.UTF_8));
-    }
-
-    private void readJournal() throws IOException {
-        StrictLineReader reader = new StrictLineReader(new FileInputStream(journalFile), Util.US_ASCII);
-        try {
-            String magic = reader.readLine();
-            String version = reader.readLine();
-            String appVersionString = reader.readLine();
-            String valueCountString = reader.readLine();
-            String blank = reader.readLine();
-            if (!MAGIC.equals(magic)
-                    || !VERSION_1.equals(version)
-                    || !Integer.toString(appVersion).equals(appVersionString)
-                    || !Integer.toString(valueCount).equals(valueCountString)
-                    || !"".equals(blank)) {
-                throw new IOException("unexpected journal header: [" + magic + ", " + version + ", "
-                        + valueCountString + ", " + blank + "]");
-            }
-
-            int lineCount = 0;
-            while (true) {
-                try {
-                    readJournalLine(reader.readLine());
-                    lineCount++;
-                } catch (EOFException endOfJournal) {
-                    break;
-                }
-            }
-            redundantOpCount = lineCount - lruEntries.size();
-
-            // If we ended on a truncated line, rebuild the journal before appending to it.
-            if (reader.hasUnterminatedLine()) {
-                rebuildJournal();
-            } else {
-                journalWriter = new BufferedWriter(new OutputStreamWriter(
-                        new FileOutputStream(journalFile, true), Util.US_ASCII));
-            }
-        } finally {
-            Util.closeQuietly(reader);
-        }
-    }
-
-    private void readJournalLine(String line) throws IOException {
-        int firstSpace = line.indexOf(' ');
-        if (firstSpace == -1) {
-            throw new IOException("unexpected journal line: " + line);
-        }
-
-        int keyBegin = firstSpace + 1;
-        int secondSpace = line.indexOf(' ', keyBegin);
-        final String key;
-        if (secondSpace == -1) {
-            key = line.substring(keyBegin);
-            if (firstSpace == REMOVE.length() && line.startsWith(REMOVE)) {
-                lruEntries.remove(key);
-                return;
-            }
-        } else {
-            key = line.substring(keyBegin, secondSpace);
-        }
-
-        Entry entry = lruEntries.get(key);
-        if (entry == null) {
-            entry = new Entry(key);
-            lruEntries.put(key, entry);
-        }
-
-        if (secondSpace != -1 && firstSpace == CLEAN.length() && line.startsWith(CLEAN)) {
-            String[] parts = line.substring(secondSpace + 1).split(" ");
-            entry.readable = true;
-            entry.currentEditor = null;
-            entry.setLengths(parts);
-        } else if (secondSpace == -1 && firstSpace == DIRTY.length() && line.startsWith(DIRTY)) {
-            entry.currentEditor = new Editor(entry);
-        } else if (secondSpace == -1 && firstSpace == READ.length() && line.startsWith(READ)) {
-            // This work was already done by calling lruEntries.get().
-        } else {
-            throw new IOException("unexpected journal line: " + line);
-        }
-    }
-
-    /**
-     * Computes the initial size and collects garbage as a part of opening the
-     * cache. Dirty entries are assumed to be inconsistent and will be deleted.
-     */
-    private void processJournal() throws IOException {
-        deleteIfExists(journalFileTmp);
-        for (Iterator<Entry> i = lruEntries.values().iterator(); i.hasNext(); ) {
-            Entry entry = i.next();
-            if (entry.currentEditor == null) {
-                for (int t = 0; t < valueCount; t++) {
-                    size += entry.lengths[t];
-                }
-            } else {
-                entry.currentEditor = null;
-                for (int t = 0; t < valueCount; t++) {
-                    deleteIfExists(entry.getCleanFile(t));
-                    deleteIfExists(entry.getDirtyFile(t));
-                }
-                i.remove();
-            }
-        }
-    }
-
-    /**
-     * Creates a new journal that omits redundant information. This replaces the
-     * current journal if it exists.
-     */
-    private synchronized void rebuildJournal() throws IOException {
-        if (journalWriter != null) {
-            journalWriter.close();
-        }
-
-        try (Writer writer = new BufferedWriter(
-                new OutputStreamWriter(new FileOutputStream(journalFileTmp), Util.US_ASCII))) {
-            writer.write(MAGIC);
-            writer.write("\n");
-            writer.write(VERSION_1);
-            writer.write("\n");
-            writer.write(Integer.toString(appVersion));
-            writer.write("\n");
-            writer.write(Integer.toString(valueCount));
-            writer.write("\n");
-            writer.write("\n");
-
-            for (Entry entry : lruEntries.values()) {
-                if (entry.currentEditor != null) {
-                    writer.write(DIRTY + ' ' + entry.key + '\n');
-                } else {
-                    writer.write(CLEAN + ' ' + entry.key + entry.getLengths() + '\n');
-                }
-            }
-        }
-
-        if (journalFile.exists()) {
-            renameTo(journalFile, journalFileBackup, true);
-        }
-        renameTo(journalFileTmp, journalFile, false);
-        journalFileBackup.delete();
-
-        journalWriter = new BufferedWriter(
-                new OutputStreamWriter(new FileOutputStream(journalFile, true), Util.US_ASCII));
-    }    private final Callable<Void> cleanupCallable = new Callable<>() {
-        public Void call() throws Exception {
-            synchronized (DiskLruCache.this) {
-                if (journalWriter == null) {
-                    return null; // Closed.
-                }
-                trimToSize();
-                if (journalRebuildRequired()) {
-                    rebuildJournal();
-                    redundantOpCount = 0;
-                }
-            }
-            return null;
-        }
-    };
-
-    /**
-     * Return {@code true} if it contains the key
-     */
-    public synchronized boolean contain(String key) {
-        checkNotClosed();
-        validateKey(key);
-        Entry entry = lruEntries.get(key);
-        return entry != null && entry.readable;
-    }
-
-    /**
-     * Returns a snapshot of the entry named {@code key}, or null if it doesn't
-     * exist is not currently readable. If a value is returned, it is moved to
-     * the head of the LRU queue.
-     */
-    public synchronized Snapshot get(String key) throws IOException {
-        checkNotClosed();
-        validateKey(key);
-        Entry entry = lruEntries.get(key);
-        if (entry == null) {
-            return null;
-        }
-
-        if (!entry.readable) {
-            return null;
-        }
-
-        // Open all streams eagerly to guarantee that we see a single published
-        // snapshot. If we opened streams lazily then the streams could come
-        // from different edits.
-        InputStream[] ins = new InputStream[valueCount];
-        try {
-            for (int i = 0; i < valueCount; i++) {
-                ins[i] = new FileInputStream(entry.getCleanFile(i));
-            }
-        } catch (FileNotFoundException e) {
-            // A file must have been deleted manually!
-            for (int i = 0; i < valueCount; i++) {
-                if (ins[i] != null) {
-                    Util.closeQuietly(ins[i]);
-                } else {
-                    break;
-                }
-            }
-            return null;
-        }
-
-        redundantOpCount++;
-        journalWriter.append(READ + ' ').append(key).append(String.valueOf('\n'));
-        if (journalRebuildRequired()) {
-            executorService.submit(cleanupCallable);
-        }
-
-        return new Snapshot(key, entry.sequenceNumber, ins, entry.lengths);
-    }
-
-    /**
-     * Returns an editor for the entry named {@code key}, or null if another
-     * edit is in progress.
-     */
-    public Editor edit(String key) throws IOException {
-        return edit(key, ANY_SEQUENCE_NUMBER);
-    }
-
-    private synchronized Editor edit(String key, long expectedSequenceNumber) throws IOException {
-        checkNotClosed();
-        validateKey(key);
-        Entry entry = lruEntries.get(key);
-        if (expectedSequenceNumber != ANY_SEQUENCE_NUMBER && (entry == null
-                || entry.sequenceNumber != expectedSequenceNumber)) {
-            return null; // Snapshot is stale.
-        }
-        if (entry == null) {
-            entry = new Entry(key);
-            lruEntries.put(key, entry);
-        } else if (entry.currentEditor != null) {
-            return null; // Another edit is in progress.
-        }
-
-        Editor editor = new Editor(entry);
-        entry.currentEditor = editor;
-
-        // Flush the journal before creating files to prevent file leaks.
-        journalWriter.write(DIRTY + ' ' + key + '\n');
-        journalWriter.flush();
-        return editor;
-    }
-
-    /**
-     * Returns the directory where this cache stores its data.
-     */
-    public File getDirectory() {
-        return directory;
-    }
-
-    /**
-     * Returns the maximum number of bytes that this cache should use to store
-     * its data.
-     */
-    public synchronized long getMaxSize() {
-        return maxSize;
-    }
-
-    /**
-     * Changes the maximum number of bytes the cache can store and queues a job
-     * to trim the existing store, if necessary.
-     */
-    public synchronized void setMaxSize(long maxSize) {
-        this.maxSize = maxSize;
-        executorService.submit(cleanupCallable);
-    }
-
-    /**
-     * Returns the number of bytes currently being used to store the values in
-     * this cache. This may be greater than the max size if a background
-     * deletion is pending.
-     */
-    public synchronized long size() {
-        return size;
-    }
-
-    private synchronized void completeEdit(Editor editor, boolean success) throws IOException {
-        Entry entry = editor.entry;
-        if (entry.currentEditor != editor) {
-            throw new IllegalStateException();
-        }
-
-        // If this edit is creating the entry for the first time, every index must have a value.
-        if (success && !entry.readable) {
-            for (int i = 0; i < valueCount; i++) {
-                if (!editor.written[i]) {
-                    editor.abort();
-                    throw new IllegalStateException("Newly created entry didn't create value for index " + i);
-                }
-                if (!entry.getDirtyFile(i).exists()) {
-                    editor.abort();
-                    return;
-                }
-            }
-        }
-
-        for (int i = 0; i < valueCount; i++) {
-            File dirty = entry.getDirtyFile(i);
-            if (success) {
-                if (dirty.exists()) {
-                    File clean = entry.getCleanFile(i);
-                    dirty.renameTo(clean);
-                    long oldLength = entry.lengths[i];
-                    long newLength = clean.length();
-                    entry.lengths[i] = newLength;
-                    size = size - oldLength + newLength;
-                }
-            } else {
-                deleteIfExists(dirty);
-            }
-        }
-
-        redundantOpCount++;
-        entry.currentEditor = null;
-        if (entry.readable | success) {
-            entry.readable = true;
-            journalWriter.write(CLEAN + ' ' + entry.key + entry.getLengths() + '\n');
-            if (success) {
-                entry.sequenceNumber = nextSequenceNumber++;
-            }
-        } else {
-            lruEntries.remove(entry.key);
-            journalWriter.write(REMOVE + ' ' + entry.key + '\n');
-        }
-        journalWriter.flush();
-
-        if (size > maxSize || journalRebuildRequired()) {
-            executorService.submit(cleanupCallable);
-        }
-    }
-
-    /**
-     * We only rebuild the journal when it will halve the size of the journal
-     * and eliminate at least 2000 ops.
-     */
-    private boolean journalRebuildRequired() {
-        final int redundantOpCompactThreshold = 2000;
-        return redundantOpCount >= redundantOpCompactThreshold //
-                && redundantOpCount >= lruEntries.size();
-    }
-
-    /**
-     * Drops the entry for {@code key} if it exists and can be removed. Entries
-     * actively being edited cannot be removed.
-     *
-     * @return true if an entry was removed.
-     */
-    public synchronized boolean remove(String key) throws IOException {
-        checkNotClosed();
-        validateKey(key);
-        Entry entry = lruEntries.get(key);
-        if (entry == null || entry.currentEditor != null) {
-            return false;
-        }
-
-        for (int i = 0; i < valueCount; i++) {
-            File file = entry.getCleanFile(i);
-            if (file.exists() && !file.delete()) {
-                throw new IOException("failed to delete " + file);
-            }
-            size -= entry.lengths[i];
-            entry.lengths[i] = 0;
-        }
-
-        redundantOpCount++;
-        journalWriter.append(REMOVE + ' ').append(key).append(String.valueOf('\n'));
-        lruEntries.remove(key);
-
-        if (journalRebuildRequired()) {
-            executorService.submit(cleanupCallable);
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns true if this cache has been closed.
-     */
-    public synchronized boolean isClosed() {
-        return journalWriter == null;
-    }
-
-    private void checkNotClosed() {
-        if (journalWriter == null) {
-            throw new IllegalStateException("cache is closed");
-        }
-    }
-
-    /**
-     * Force buffered operations to the filesystem.
-     */
-    public synchronized void flush() throws IOException {
-        checkNotClosed();
-        trimToSize();
-        journalWriter.flush();
-    }
-
-    /**
-     * Closes this cache. Stored values will remain on the filesystem.
-     */
-    public synchronized void close() throws IOException {
-        if (journalWriter == null) {
-            return; // Already closed.
-        }
-        for (Entry entry : new ArrayList<>(lruEntries.values())) {
-            if (entry.currentEditor != null) {
-                entry.currentEditor.abort();
-            }
-        }
-        trimToSize();
-        journalWriter.close();
-        journalWriter = null;
-    }
-
-    private void trimToSize() throws IOException {
-        while (size > maxSize) {
-            Map.Entry<String, Entry> toEvict = lruEntries.entrySet().iterator().next();
-            remove(toEvict.getKey());
-        }
-    }
-
-    /**
-     * Closes the cache and deletes all of its stored values. This will delete
-     * all files in the cache directory including files that weren't created by
-     * the cache.
-     */
-    public void delete() throws IOException {
-        close();
-        Util.deleteContents(directory);
-    }
-
-    private void validateKey(String key) {
-        Matcher matcher = LEGAL_KEY_PATTERN.matcher(key);
-        if (!matcher.matches()) {
-            throw new IllegalArgumentException("keys must match regex "
-                    + STRING_KEY_PATTERN + ": \"" + key + "\"");
-        }
-    }
-
-    /**
-     * A snapshot of the values for an entry.
-     */
-    public final class Snapshot implements Closeable {
-        private final String key;
-        private final long sequenceNumber;
-        private final InputStream[] ins;
-        private final long[] lengths;
-
-        private Snapshot(String key, long sequenceNumber, InputStream[] ins, long[] lengths) {
-            this.key = key;
-            this.sequenceNumber = sequenceNumber;
-            this.ins = ins;
-            this.lengths = lengths;
-        }
-
-        /**
-         * Returns an editor for this snapshot's entry, or null if either the
-         * entry has changed since this snapshot was created or if another edit
-         * is in progress.
-         */
-        public Editor edit() throws IOException {
-            return DiskLruCache.this.edit(key, sequenceNumber);
-        }
-
-        /**
-         * Returns the unbuffered stream with the value for {@code index}.
-         */
-        public InputStream getInputStream(int index) {
-            return ins[index];
-        }
-
-        /**
-         * Returns the string value for {@code index}.
-         */
-        public String getString(int index) throws IOException {
-            return inputStreamToString(getInputStream(index));
-        }
-
-        /**
-         * Returns the byte length of the value for {@code index}.
-         */
-        public long getLength(int index) {
-            return lengths[index];
-        }
-
-        public void close() {
-            for (InputStream in : ins) {
-                Util.closeQuietly(in);
-            }
-        }
-    }
-
-    /**
-     * Edits the values for an entry.
-     */
-    public final class Editor {
-        private final Entry entry;
-        private final boolean[] written;
-        private boolean hasErrors;
-        private boolean committed;
-
-        private Editor(Entry entry) {
-            this.entry = entry;
-            this.written = (entry.readable) ? null : new boolean[valueCount];
-        }
-
-        /**
-         * Returns an unbuffered input stream to read the last committed value,
-         * or null if no value has been committed.
-         */
-        public InputStream newInputStream(int index) {
-            synchronized (DiskLruCache.this) {
-                if (entry.currentEditor != this) {
-                    throw new IllegalStateException();
-                }
-                if (!entry.readable) {
-                    return null;
-                }
-                try {
-                    return new FileInputStream(entry.getCleanFile(index));
-                } catch (FileNotFoundException e) {
-                    return null;
-                }
-            }
-        }
-
-        /**
-         * Returns the last committed value as a string, or null if no value
-         * has been committed.
-         */
-        public String getString(int index) throws IOException {
-            InputStream in = newInputStream(index);
-            return in != null ? inputStreamToString(in) : null;
-        }
-
-        /**
-         * Returns a new unbuffered output stream to write the value at
-         * {@code index}. If the underlying output stream encounters errors
-         * when writing to the filesystem, this edit will be aborted when
-         * {@link #commit} is called. The returned output stream does not throw
-         * IOExceptions.
-         */
-        public OutputStream newOutputStream(int index) throws IOException {
-            if (index < 0 || index >= valueCount) {
-                throw new IllegalArgumentException("Expected index " + index + " to "
-                        + "be greater than 0 and less than the maximum value count "
-                        + "of " + valueCount);
-            }
-            synchronized (DiskLruCache.this) {
-                if (entry.currentEditor != this) {
-                    throw new IllegalStateException();
-                }
-                if (!entry.readable) {
-                    written[index] = true;
-                }
-                File dirtyFile = entry.getDirtyFile(index);
-                FileOutputStream outputStream;
-                try {
-                    outputStream = new FileOutputStream(dirtyFile);
-                } catch (FileNotFoundException e) {
-                    // Attempt to recreate the cache directory.
-                    directory.mkdirs();
-                    try {
-                        outputStream = new FileOutputStream(dirtyFile);
-                    } catch (FileNotFoundException e2) {
-                        // We are unable to recover. Silently eat the writes.
-                        return NULL_OUTPUT_STREAM;
-                    }
-                }
-                return new FaultHidingOutputStream(outputStream);
-            }
-        }
-
-        /**
-         * Sets the value at {@code index} to {@code value}.
-         */
-        public void set(int index, String value) throws IOException {
-            Writer writer = null;
-            try {
-                writer = new OutputStreamWriter(newOutputStream(index), Util.UTF_8);
-                writer.write(value);
-            } finally {
-                Util.closeQuietly(writer);
-            }
-        }
-
-        /**
-         * Commits this edit so it is visible to readers.  This releases the
-         * edit lock so another edit may be started on the same key.
-         */
-        public void commit() throws IOException {
-            if (hasErrors) {
-                completeEdit(this, false);
-                remove(entry.key); // The previous entry is stale.
-            } else {
-                completeEdit(this, true);
-            }
-            committed = true;
-        }
-
-        /**
-         * Aborts this edit. This releases the edit lock so another edit may be
-         * started on the same key.
-         */
-        public void abort() throws IOException {
-            completeEdit(this, false);
-        }
-
-        public void abortUnlessCommitted() {
-            if (!committed) {
-                try {
-                    abort();
-                } catch (IOException ignored) {
-                }
-            }
-        }
-
-        private class FaultHidingOutputStream extends FilterOutputStream {
-            private FaultHidingOutputStream(OutputStream out) {
-                super(out);
-            }
-
-            @Override
-            public void write(int oneByte) {
-                try {
-                    out.write(oneByte);
-                } catch (IOException e) {
-                    hasErrors = true;
-                }
-            }
-
-            @Override
-            public void write(byte[] buffer, int offset, int length) {
-                try {
-                    out.write(buffer, offset, length);
-                } catch (IOException e) {
-                    hasErrors = true;
-                }
-            }
-
-            @Override
-            public void close() {
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    hasErrors = true;
-                }
-            }
-
-            @Override
-            public void flush() {
-                try {
-                    out.flush();
-                } catch (IOException e) {
-                    hasErrors = true;
-                }
-            }
-        }
-    }
-
-    private final class Entry {
-        private final String key;
-
-        /**
-         * Lengths of this entry's files.
-         */
-        private final long[] lengths;
-
-        /**
-         * True if this entry has ever been published.
-         */
-        private boolean readable;
-
-        /**
-         * The ongoing edit or null if this entry is not being edited.
-         */
-        private Editor currentEditor;
-
-        /**
-         * The sequence number of the most recently committed edit to this entry.
-         */
-        private long sequenceNumber;
-
-        private Entry(String key) {
-            this.key = key;
-            this.lengths = new long[valueCount];
-        }
-
-        public String getLengths() {
-            StringBuilder result = new StringBuilder();
-            for (long size : lengths) {
-                result.append(' ').append(size);
-            }
-            return result.toString();
-        }
-
-        /**
-         * Set lengths using decimal numbers like "10123".
-         */
-        private void setLengths(String[] strings) throws IOException {
-            if (strings.length != valueCount) {
-                throw invalidLengths(strings);
-            }
-
-            try {
-                for (int i = 0; i < strings.length; i++) {
-                    lengths[i] = Long.parseLong(strings[i]);
-                }
-            } catch (NumberFormatException e) {
-                throw invalidLengths(strings);
-            }
-        }
-
-        private IOException invalidLengths(String[] strings) throws IOException {
-            throw new IOException("unexpected journal line: " + java.util.Arrays.toString(strings));
-        }
-
-        public File getCleanFile(int i) {
-            return new File(directory, key + "." + i);
-        }
-
-        public File getDirtyFile(int i) {
-            return new File(directory, key + "." + i + ".tmp");
-        }
-    }
-
-
-
-
-}

app/src/main/java/com/hippo/beerbelly/SimpleDiskCache.java

@@ -1,504 +0,0 @@
-/*
- * Copyright 2015-2016 Hippo Seven
- *
- * 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 com.hippo.beerbelly;
-
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.hippo.streampipe.InputStreamPipe;
-import com.hippo.streampipe.OutputStreamPipe;
-import com.hippo.util.HashCodeUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-public class SimpleDiskCache {
-
-    private static final String TAG = SimpleDiskCache.class.getSimpleName();
-
-    /**
-     * Disk cache is free
-     */
-    private static final int STATE_DISK_CACHE_NONE = 0;
-
-    /**
-     * Disk cache is flushing or clearing
-     */
-    private static final int STATE_DISK_CACHE_IN_USE = 1;
-
-    /**
-     * Disk cache is reading or writing
-     */
-    private static final int STATE_DISK_CACHE_BUSY = 2;
-
-    private final File mCacheDir;
-    private final int mSize;
-    @NonNull
-    private final Map<String, CounterLock> mLockMap = new HashMap<>();
-    @NonNull
-    private final LockPool mLockPool = new LockPool();
-    private int mDiskCacheState;
-    @Nullable
-    private DiskLruCache mDiskLruCache;
-
-    public SimpleDiskCache(File cacheDir, int size) {
-        mCacheDir = cacheDir;
-        mSize = size;
-
-        try {
-            init();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * A hashing method that changes a string (like a URL) into a hash suitable
-     * for using as a disk filename.
-     *
-     * @param key The key used to store the file
-     */
-    private static String hashKeyForDisk(final String key) {
-        String cacheKey;
-        try {
-            final MessageDigest digest = MessageDigest.getInstance("MD5");
-            digest.update(key.getBytes());
-            cacheKey = HashCodeUtils.bytesToHexString(digest.digest());
-        } catch (final NoSuchAlgorithmException e) {
-            cacheKey = String.valueOf(key.hashCode());
-        }
-        return cacheKey;
-    }
-
-    public synchronized boolean isValid() {
-        return mDiskLruCache != null;
-    }
-
-    private synchronized void init() throws IOException {
-        if (!isValid()) {
-            mDiskLruCache = DiskLruCache.open(mCacheDir, 1, 1, mSize);
-        }
-    }
-
-    public synchronized long size() {
-        if (null != mDiskLruCache) {
-            return mDiskLruCache.size();
-        } else {
-            return -1L;
-        }
-    }
-
-    public synchronized void flush() {
-        // Wait for cache available
-        while (mDiskCacheState != STATE_DISK_CACHE_NONE) {
-            try {
-                wait();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-        mDiskCacheState = STATE_DISK_CACHE_BUSY;
-
-        if (null != mDiskLruCache) {
-            try {
-                mDiskLruCache.flush();
-            } catch (IOException e) {
-                Log.e(TAG, "SimpleDiskCache flush", e);
-            }
-        }
-
-        mDiskCacheState = STATE_DISK_CACHE_NONE;
-        notifyAll();
-    }
-
-    public synchronized boolean clear() {
-        boolean result = true;
-        if (null == mDiskLruCache) {
-            return false;
-        }
-
-        // Wait for cache available
-        while (mDiskCacheState != STATE_DISK_CACHE_NONE) {
-            try {
-                wait();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-        mDiskCacheState = STATE_DISK_CACHE_BUSY;
-
-        try {
-            mDiskLruCache.delete();
-        } catch (IOException e) {
-            Log.e(TAG, "SimpleDiskCache clearCache", e);
-        }
-        mDiskLruCache = null;
-        try {
-            init();
-        } catch (IOException e) {
-            Log.e(TAG, "SimpleDiskCache init", e);
-            result = false;
-        }
-
-        mDiskCacheState = STATE_DISK_CACHE_NONE;
-        notifyAll();
-        return result;
-    }
-
-    private synchronized CounterLock obtainLock(String key) {
-        // Wait for clear over
-        while (mDiskCacheState == STATE_DISK_CACHE_BUSY) {
-            try {
-                wait();
-            } catch (InterruptedException e) {
-                // Empty
-            }
-        }
-        mDiskCacheState = STATE_DISK_CACHE_IN_USE;
-
-        // Get lock from key
-        CounterLock lock;
-        lock = mLockMap.get(key);
-        if (lock == null) {
-            lock = mLockPool.get();
-            mLockMap.put(key, lock);
-        }
-        lock.obtain();
-
-        return lock;
-    }
-
-    private synchronized void releaseLock(String key, CounterLock lock) {
-        lock.release();
-        if (lock.isFree()) {
-            mLockMap.remove(key);
-            mLockPool.push(lock);
-        }
-
-        if (mLockMap.isEmpty()) {
-            mDiskCacheState = STATE_DISK_CACHE_NONE;
-            notifyAll();
-        }
-    }
-
-    public boolean contain(@NonNull String key) {
-        String diskKey = hashKeyForDisk(key);
-        CounterLock lock = obtainLock(diskKey);
-        if (null == mDiskLruCache) {
-            releaseLock(diskKey, lock);
-            return false;
-        }
-        lock.readLock().lock();
-
-        boolean result = mDiskLruCache.contain(diskKey);
-
-        lock.readLock().unlock();
-        releaseLock(diskKey, lock);
-
-        return result;
-    }
-
-    public boolean remove(@NonNull String key) {
-        String diskKey = hashKeyForDisk(key);
-        CounterLock lock = obtainLock(diskKey);
-        if (null == mDiskLruCache) {
-            releaseLock(diskKey, lock);
-            return false;
-        }
-        lock.writeLock().lock();
-
-        boolean result;
-        try {
-            result = mDiskLruCache.remove(diskKey);
-        } catch (IOException e) {
-            e.printStackTrace();
-            result = false;
-        }
-
-        lock.writeLock().unlock();
-        releaseLock(diskKey, lock);
-
-        return result;
-    }
-
-    public boolean put(@NonNull String key, @NonNull InputStream is) {
-        String diskKey = hashKeyForDisk(key);
-        CounterLock lock = obtainLock(diskKey);
-        if (null == mDiskLruCache) {
-            releaseLock(diskKey, lock);
-            return false;
-        }
-        lock.writeLock().lock();
-
-        boolean result = false;
-        if (isValid()) {
-            result = putToDisk(diskKey, is);
-        }
-
-        lock.writeLock().unlock();
-        releaseLock(diskKey, lock);
-
-        return result;
-    }
-
-    private boolean putToDisk(String key, InputStream is) {
-        DiskLruCache.Editor editor = null;
-        OutputStream os = null;
-        boolean completeEdit = false;
-        try {
-            //noinspection ConstantConditions
-            editor = mDiskLruCache.edit(key);
-            if (editor == null) {
-                // The editor is in progress
-                return false;
-            }
-
-            os = editor.newOutputStream(0);
-            if (os != null) {
-                Util.copy(is, os);
-                completeEdit = true;
-                editor.commit();
-                return true;
-            } else {
-                // Can't get OutputStream
-                completeEdit = true;
-                editor.abort();
-                return false;
-            }
-        } catch (IOException e) {
-            Util.closeQuietly(os);
-            try {
-                if (!completeEdit && editor != null) {
-                    editor.abort();
-                }
-            } catch (IOException ignored) {
-            }
-            return false;
-        }
-    }
-
-    /**
-     * @param key the key of the target
-     * @return the InputStreamPipe, <code>null</code> for missing
-     */
-    @Nullable
-    public InputStreamPipe getInputStreamPipe(@NonNull String key) {
-        if (contain(key)) {
-            String diskKey = hashKeyForDisk(key);
-            return new CacheInputStreamPipe(diskKey);
-        } else {
-            return null;
-        }
-    }
-
-    @NonNull
-    public OutputStreamPipe getOutputStreamPipe(@NonNull String key) {
-        String diskKey = hashKeyForDisk(key);
-        return new CacheOutputStreamPipe(diskKey);
-    }
-
-    private class CacheInputStreamPipe implements InputStreamPipe {
-
-        private final String mKey;
-        private CounterLock mLock;
-        private DiskLruCache.Snapshot mCurrentSnapshot;
-
-        private CacheInputStreamPipe(String key) {
-            mKey = key;
-        }
-
-        @Override
-        public void obtain() {
-            if (mLock == null) {
-                mLock = obtainLock(mKey);
-                mLock.readLock().lock();
-            }
-        }
-
-        @Override
-        public void release() {
-            if (mCurrentSnapshot != null) {
-                throw new IllegalStateException("Please close it first");
-            }
-
-            if (mLock != null) {
-                mLock.readLock().unlock();
-                releaseLock(mKey, mLock);
-                mLock = null;
-            }
-        }
-
-        @Override
-        public @NonNull
-        InputStream open() throws IOException {
-            if (mLock == null) {
-                throw new IllegalStateException("Please obtain it first");
-            }
-            if (mCurrentSnapshot != null) {
-                throw new IllegalStateException("Please close it before reopen");
-            }
-            if (null == mDiskLruCache) {
-                throw new IOException("Can't find disk lru cache");
-            }
-
-            DiskLruCache.Snapshot snapshot;
-            snapshot = mDiskLruCache.get(mKey);
-            if (snapshot == null) {
-                throw new IOException("Miss the key " + mKey);
-            }
-            mCurrentSnapshot = snapshot;
-            return snapshot.getInputStream(0);
-        }
-
-        @Override
-        public void close() {
-            Util.closeQuietly(mCurrentSnapshot);
-            mCurrentSnapshot = null;
-        }
-    }
-
-    private class CacheOutputStreamPipe implements OutputStreamPipe {
-
-        private final String mKey;
-        private CounterLock mLock;
-        private DiskLruCache.Editor mCurrentEditor;
-
-        private CacheOutputStreamPipe(String key) {
-            mKey = key;
-        }
-
-        @Override
-        public void obtain() {
-            if (mLock == null) {
-                mLock = obtainLock(mKey);
-                mLock.writeLock().lock();
-            }
-        }
-
-        @Override
-        public void release() {
-            if (mCurrentEditor != null) {
-                throw new IllegalStateException("Please close it first");
-            }
-
-            if (mLock != null) {
-                mLock.writeLock().unlock();
-                releaseLock(mKey, mLock);
-                mLock = null;
-            }
-        }
-
-        @Override
-        public @NonNull
-        OutputStream open() throws IOException {
-            if (mLock == null) {
-                throw new IllegalStateException("Please obtain it first");
-            }
-            if (mCurrentEditor != null) {
-                throw new IllegalStateException("Please close it before reopen");
-            }
-            if (null == mDiskLruCache) {
-                throw new IOException("Can't find disk lru cache");
-            }
-
-            DiskLruCache.Editor editor = mDiskLruCache.edit(mKey);
-            if (editor == null) {
-                throw new IOException("Miss the key " + mKey);
-            }
-
-            OutputStream os;
-            try {
-                os = editor.newOutputStream(0);
-                mCurrentEditor = editor;
-                return os;
-            } catch (IOException e) {
-                // Get trouble
-                try {
-                    editor.abort();
-                } catch (IOException ex) {
-                    // Ignore
-                }
-                throw e;
-            }
-        }
-
-        @Override
-        public void close() {
-            if (mCurrentEditor != null) {
-                try {
-                    mCurrentEditor.commit();
-                } catch (IOException e) {
-                    // Empty
-                }
-                mCurrentEditor = null;
-            }
-        }
-    }
-
-    private class CounterLock extends ReentrantReadWriteLock {
-
-        private int mCount;
-
-        public boolean isFree() {
-            return mCount == 0;
-        }
-
-        public void release() {
-            if (--mCount < 0) {
-                throw new IllegalStateException("Release time is more than occupy time");
-            }
-        }
-
-        public void obtain() {
-            ++mCount;
-        }
-    }
-
-    private class LockPool {
-
-        private static final int MAX_SIZE = 10;
-
-        private final CounterLock[] mArray = new CounterLock[MAX_SIZE];
-        private final int mMaxSize = MAX_SIZE;
-        private int mSize;
-
-        public void push(CounterLock lock) {
-            if (lock != null && mSize < mMaxSize) {
-                mArray[mSize++] = lock;
-            }
-        }
-
-        public CounterLock get() {
-            if (mSize > 0) {
-                CounterLock lock = mArray[--mSize];
-                mArray[mSize] = null;
-                return lock;
-            } else {
-                return new CounterLock();
-            }
-        }
-    }
-}

app/src/main/java/com/hippo/beerbelly/StrictLineReader.java

@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * 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 com.hippo.beerbelly;
-
-import androidx.annotation.NonNull;
-
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-
-/**
- * Buffers input from an {@link InputStream} for reading lines.
- *
- * <p>This class is used for buffered reading of lines. For purposes of this class, a line ends
- * with "\n" or "\r\n". End of input is reported by throwing {@code EOFException}. Unterminated
- * line at end of input is invalid and will be ignored, the caller may use {@code
- * hasUnterminatedLine()} to detect it after catching the {@code EOFException}.
- *
- * <p>This class is intended for reading input that strictly consists of lines, such as line-based
- * cache entries or cache journal. Unlike the {@link java.io.BufferedReader} which in conjunction
- * with {@link java.io.InputStreamReader} provides similar functionality, this class uses different
- * end-of-input reporting and a more restrictive definition of a line.
- *
- * <p>This class supports only charsets that encode '\r' and '\n' as a single byte with value 13
- * and 10, respectively, and the representation of no other character contains these values.
- * We currently check in constructor that the charset is one of US-ASCII, UTF-8 and ISO-8859-1.
- * The default charset is US_ASCII.
- */
-class StrictLineReader implements Closeable {
-    private static final byte CR = (byte) '\r';
-    private static final byte LF = (byte) '\n';
-
-    private final InputStream in;
-    private final Charset charset;
-
-    /*
-     * Buffered data is stored in {@code buf}. As long as no exception occurs, 0 <= pos <= end
-     * and the data in the range [pos, end) is buffered for reading. At end of input, if there is
-     * an unterminated line, we set end == -1, otherwise end == pos. If the underlying
-     * {@code InputStream} throws an {@code IOException}, end may remain as either pos or -1.
-     */
-    private byte[] buf;
-    private int pos;
-    private int end;
-
-    /**
-     * Constructs a new {@code LineReader} with the specified charset and the default capacity.
-     *
-     * @param in      the {@code InputStream} to read data from.
-     * @param charset the charset used to decode data. Only US-ASCII, UTF-8 and ISO-8859-1 are
-     *                supported.
-     * @throws NullPointerException     if {@code in} or {@code charset} is null.
-     * @throws IllegalArgumentException if the specified charset is not supported.
-     */
-    public StrictLineReader(InputStream in, Charset charset) {
-        this(in, 8192, charset);
-    }
-
-    /**
-     * Constructs a new {@code LineReader} with the specified capacity and charset.
-     *
-     * @param in       the {@code InputStream} to read data from.
-     * @param capacity the capacity of the buffer.
-     * @param charset  the charset used to decode data. Only US-ASCII, UTF-8 and ISO-8859-1 are
-     *                 supported.
-     * @throws NullPointerException     if {@code in} or {@code charset} is null.
-     * @throws IllegalArgumentException if {@code capacity} is negative or zero
-     *                                  or the specified charset is not supported.
-     */
-    public StrictLineReader(InputStream in, int capacity, Charset charset) {
-        if (in == null || charset == null) {
-            throw new NullPointerException();
-        }
-        if (capacity < 0) {
-            throw new IllegalArgumentException("capacity <= 0");
-        }
-        if (!(charset.equals(Util.US_ASCII))) {
-            throw new IllegalArgumentException("Unsupported encoding");
-        }
-
-        this.in = in;
-        this.charset = charset;
-        buf = new byte[capacity];
-    }
-
-    /**
-     * Closes the reader by closing the underlying {@code InputStream} and
-     * marking this reader as closed.
-     *
-     * @throws IOException for errors when closing the underlying {@code InputStream}.
-     */
-    public void close() throws IOException {
-        synchronized (in) {
-            if (buf != null) {
-                buf = null;
-                in.close();
-            }
-        }
-    }
-
-    /**
-     * Reads the next line. A line ends with {@code "\n"} or {@code "\r\n"},
-     * this end of line marker is not included in the result.
-     *
-     * @return the next line from the input.
-     * @throws IOException  for underlying {@code InputStream} errors.
-     * @throws EOFException for the end of source stream.
-     */
-    public String readLine() throws IOException {
-        synchronized (in) {
-            if (buf == null) {
-                throw new IOException("LineReader is closed");
-            }
-
-            // Read more data if we are at the end of the buffered data.
-            // Though it's an error to read after an exception, we will let {@code fillBuf()}
-            // throw again if that happens; thus we need to handle end == -1 as well as end == pos.
-            if (pos >= end) {
-                fillBuf();
-            }
-            // Try to find LF in the buffered data and return the line if successful.
-            for (int i = pos; i != end; ++i) {
-                if (buf[i] == LF) {
-                    int lineEnd = (i != pos && buf[i - 1] == CR) ? i - 1 : i;
-                    String res = new String(buf, pos, lineEnd - pos, charset);
-                    pos = i + 1;
-                    return res;
-                }
-            }
-
-            // Let's anticipate up to 80 characters on top of those already read.
-            ByteArrayOutputStream out = new ByteArrayOutputStream(end - pos + 80) {
-                @NonNull
-                @Override
-                public String toString() {
-                    int length = (count > 0 && buf[count - 1] == CR) ? count - 1 : count;
-                    return new String(buf, 0, length, charset);
-                }
-            };
-
-            while (true) {
-                out.write(buf, pos, end - pos);
-                // Mark unterminated line in case fillBuf throws EOFException or IOException.
-                end = -1;
-                fillBuf();
-                // Try to find LF in the buffered data and return the line if successful.
-                for (int i = pos; i != end; ++i) {
-                    if (buf[i] == LF) {
-                        if (i != pos) {
-                            out.write(buf, pos, i - pos);
-                        }
-                        pos = i + 1;
-                        return out.toString();
-                    }
-                }
-            }
-        }
-    }
-
-    public boolean hasUnterminatedLine() {
-        return end == -1;
-    }
-
-    /**
-     * Reads new input data into the buffer. Call only with pos == end or end == -1,
-     * depending on the desired outcome if the function throws.
-     */
-    private void fillBuf() throws IOException {
-        int result = in.read(buf, 0, buf.length);
-        if (result == -1) {
-            throw new EOFException();
-        }
-        pos = 0;
-        end = result;
-    }
-}

app/src/main/java/com/hippo/beerbelly/Util.java

@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * 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 com.hippo.beerbelly;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
-/**
- * Junk drawer of utility methods.
- */
-final class Util {
-    static final Charset US_ASCII = StandardCharsets.US_ASCII;
-    static final Charset UTF_8 = StandardCharsets.UTF_8;
-    private static final int EOF = -1;
-    private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
-
-    private Util() {
-    }
-
-    static String readFully(Reader reader) throws IOException {
-        try (reader) {
-            StringWriter writer = new StringWriter();
-            char[] buffer = new char[1024];
-            int count;
-            while ((count = reader.read(buffer)) != -1) {
-                writer.write(buffer, 0, count);
-            }
-            return writer.toString();
-        }
-    }
-
-    /**
-     * Deletes the contents of {@code dir}. Throws an IOException if any file
-     * could not be deleted, or if {@code dir} is not a readable directory.
-     */
-    static void deleteContents(File dir) throws IOException {
-        File[] files = dir.listFiles();
-        if (files == null) {
-            throw new IOException("not a readable directory: " + dir);
-        }
-        for (File file : files) {
-            if (file.isDirectory()) {
-                deleteContents(file);
-            }
-            if (!file.delete()) {
-                throw new IOException("failed to delete file: " + file);
-            }
-        }
-    }
-
-    static void closeQuietly(/*Auto*/Closeable closeable) {
-        if (closeable != null) {
-            try {
-                closeable.close();
-            } catch (RuntimeException rethrown) {
-                throw rethrown;
-            } catch (Exception ignored) {
-            }
-        }
-    }
-
-    /**
-     * Copy bytes from an <code>InputStream</code> to an
-     * <code>OutputStream</code>.
-     *
-     * @param input  the InputStream
-     * @param output the OutputStream
-     * @return the number of bytes copied
-     */
-    public static long copy(InputStream input, OutputStream output)
-            throws IOException {
-        byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
-        long count = 0;
-        int n;
-        while (EOF != (n = input.read(buffer))) {
-            output.write(buffer, 0, n);
-            count += n;
-        }
-        return count;
-    }
-}

app/src/main/java/com/hippo/ehviewer/EhApplication.kt

@@ -281,7 +281,7 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor
             private set
 
         @JvmStatic
-        val ehCookieStore by lazy { EhCookieStore(application) }
+        val ehCookieStore by lazy { EhCookieStore }
 
         @JvmStatic
         val ehProxySelector by lazy { EhProxySelector() }

app/src/main/java/com/hippo/ehviewer/Hosts.java

@@ -291,7 +291,7 @@ public class Hosts {
         }
     }
 
-    private boolean contains(String host) {
+    public boolean contains(String host) {
         try (Cursor cursor = db.rawQuery("SELECT * FROM " + TABLE_HOSTS + " WHERE " + COLUMN_HOST + " = ?;", new String[]{host})) {
             return cursor.moveToNext();
         }

app/src/main/java/com/hippo/ehviewer/Settings.java

@@ -85,13 +85,12 @@ public class Settings {
     public static final int DEFAULT_READ_CACHE_SIZE = 320;
     public static final String KEY_BUILT_IN_HOSTS = "built_in_hosts_2";
     public static final String KEY_DOMAIN_FRONTING = "domain_fronting";
+    public static final String KEY_BYPASS_VPN = "bypass_vpn";
     public static final String KEY_LIST_THUMB_SIZE = "list_tile_size";
     private static final String KEY_HIDE_HV_EVENTS = "hide_hv_events";
     private static final boolean DEFAULT_HIDE_HV_EVENTS = true;
     private static final String KEY_SHOW_COMMENTS = "show_gallery_comments";
     private static final boolean DEFAULT_SHOW_COMMENTS = true;
-    private static final String KEY_PREVIEW_NUM = "preview_num";
-    private static final int DEFAULT_PREVIEW_NUM = 60;
     private static final String TAG = Settings.class.getSimpleName();
     private static final String KEY_DISPLAY_NAME = "display_name";
     private static final String DEFAULT_DISPLAY_NAME = null;
@@ -181,6 +180,7 @@ public class Settings {
     private static final boolean DEFAULT_SAVE_CRASH_LOG = true;
     private static final boolean DEFAULT_BUILT_IN_HOSTS = false;
     private static final boolean DEFAULT_FRONTING = false;
+    private static final boolean DEFAULT_BYPASS_VPN = true;
     private static final String KEY_PROXY_TYPE = "proxy_type";
     private static final int DEFAULT_PROXY_TYPE = EhProxySelector.TYPE_SYSTEM;
     private static final String KEY_PROXY_IP = "proxy_ip";
@@ -423,10 +423,6 @@ public class Settings {
         putBoolean(KEY_SHOW_TAG_TRANSLATIONS, value);
     }
 
-    public static int getPreviewNum() {
-        return getInt(KEY_PREVIEW_NUM, DEFAULT_PREVIEW_NUM);
-    }
-
     public static int getDefaultCategories() {
         return getInt(KEY_DEFAULT_CATEGORIES, DEFAULT_DEFAULT_CATEGORIES);
     }
@@ -679,6 +675,10 @@ public class Settings {
         putBoolean(KEY_DOMAIN_FRONTING, value);
     }
 
+    public static boolean getBypassVPN() {
+        return getBoolean(KEY_BYPASS_VPN, DEFAULT_BYPASS_VPN);
+    }
+
     public static int getProxyType() {
         return getInt(KEY_PROXY_TYPE, DEFAULT_PROXY_TYPE);
     }

app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.java

@@ -1,116 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.client;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import com.hippo.network.CookieRepository;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import okhttp3.Cookie;
-import okhttp3.HttpUrl;
-
-public class EhCookieStore extends CookieRepository {
-
-    public static final String KEY_IPD_MEMBER_ID = "ipb_member_id";
-    public static final String KEY_IPD_PASS_HASH = "ipb_pass_hash";
-    public static final String KEY_IGNEOUS = "igneous";
-
-    public static final Cookie sTipsCookie =
-            new Cookie.Builder()
-                    .name(EhConfig.KEY_CONTENT_WARNING)
-                    .value(EhConfig.CONTENT_WARNING_NOT_SHOW)
-                    .domain(EhUrl.DOMAIN_E)
-                    .path("/")
-                    .expiresAt(Long.MAX_VALUE)
-                    .build();
-
-    public EhCookieStore(Context context) {
-        super(context, "okhttp3-cookie.db");
-    }
-
-    public static Cookie newCookie(Cookie cookie, String newDomain, boolean forcePersistent,
-                                   boolean forceLongLive, boolean forceNotHostOnly) {
-        Cookie.Builder builder = new Cookie.Builder();
-        builder.name(cookie.name());
-        builder.value(cookie.value());
-
-        if (forceLongLive) {
-            builder.expiresAt(Long.MAX_VALUE);
-        } else if (cookie.persistent()) {
-            builder.expiresAt(cookie.expiresAt());
-        } else if (forcePersistent) {
-            builder.expiresAt(Long.MAX_VALUE);
-        }
-        if (cookie.hostOnly() && !forceNotHostOnly) {
-            builder.hostOnlyDomain(newDomain);
-        } else {
-            builder.domain(newDomain);
-        }
-        builder.path(cookie.path());
-        if (cookie.secure()) {
-            builder.secure();
-        }
-        if (cookie.httpOnly()) {
-            builder.httpOnly();
-        }
-        return builder.build();
-    }
-
-    public void signOut() {
-        clear();
-    }
-
-    public boolean hasSignedIn() {
-        HttpUrl url = HttpUrl.parse(EhUrl.HOST_E);
-        return contains(url, KEY_IPD_MEMBER_ID) &&
-                contains(url, KEY_IPD_PASS_HASH);
-    }
-
-    @NonNull
-    @Override
-    public List<Cookie> loadForRequest(@NonNull HttpUrl url) {
-        List<Cookie> cookies = super.loadForRequest(url);
-
-        boolean checkTips = domainMatch(url, EhUrl.DOMAIN_E);
-
-        if (checkTips) {
-            List<Cookie> result = new ArrayList<>(cookies.size() + 1);
-            // Add all but skip some
-            for (Cookie cookie : cookies) {
-                String name = cookie.name();
-                if (EhConfig.KEY_CONTENT_WARNING.equals(name)) {
-                    continue;
-                }
-                if (EhConfig.KEY_UCONFIG.equals(name)) {
-                    continue;
-                }
-                result.add(cookie);
-            }
-            // Add some
-            result.add(sTipsCookie);
-            return Collections.unmodifiableList(result);
-        } else {
-            return cookies;
-        }
-    }
-}

app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.kt

@@ -0,0 +1,247 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * 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 com.hippo.ehviewer.client
+
+import com.hippo.ehviewer.EhApplication
+import com.hippo.network.CookieDatabase
+import com.hippo.network.CookieSet
+import okhttp3.Cookie
+import okhttp3.CookieJar
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import java.util.Collections
+import java.util.regex.Pattern
+
+object EhCookieStore : CookieJar {
+    private val db: CookieDatabase = CookieDatabase(EhApplication.application, "okhttp3-cookie.db")
+    private val map: MutableMap<String, CookieSet> = db.allCookies
+
+    fun signOut() {
+        clear()
+    }
+
+    fun hasSignedIn(): Boolean {
+        val url = EhUrl.HOST_E.toHttpUrl()
+        return contains(url, KEY_IPD_MEMBER_ID) &&
+                contains(url, KEY_IPD_PASS_HASH)
+    }
+
+    const val KEY_IPD_MEMBER_ID = "ipb_member_id"
+    const val KEY_IPD_PASS_HASH = "ipb_pass_hash"
+    const val KEY_IGNEOUS = "igneous"
+    private val sTipsCookie: Cookie = Cookie.Builder()
+        .name(EhConfig.KEY_CONTENT_WARNING)
+        .value(EhConfig.CONTENT_WARNING_NOT_SHOW)
+        .domain(EhUrl.DOMAIN_E)
+        .path("/")
+        .expiresAt(Long.MAX_VALUE)
+        .build()
+
+    fun newCookie(
+        cookie: Cookie, newDomain: String, forcePersistent: Boolean,
+        forceLongLive: Boolean, forceNotHostOnly: Boolean
+    ): Cookie {
+        val builder = Cookie.Builder()
+        builder.name(cookie.name)
+        builder.value(cookie.value)
+        if (forceLongLive) {
+            builder.expiresAt(Long.MAX_VALUE)
+        } else if (cookie.persistent) {
+            builder.expiresAt(cookie.expiresAt)
+        } else if (forcePersistent) {
+            builder.expiresAt(Long.MAX_VALUE)
+        }
+        if (cookie.hostOnly && !forceNotHostOnly) {
+            builder.hostOnlyDomain(newDomain)
+        } else {
+            builder.domain(newDomain)
+        }
+        builder.path(cookie.path)
+        if (cookie.secure) {
+            builder.secure()
+        }
+        if (cookie.httpOnly) {
+            builder.httpOnly()
+        }
+        return builder.build()
+    }
+
+    @Synchronized
+    fun addCookie(cookie: Cookie) {
+        // For cookie database
+        var toAdd: Cookie? = null
+        var toUpdate: Cookie? = null
+        var toRemove: Cookie? = null
+        var set = map[cookie.domain]
+        if (set == null) {
+            set = CookieSet()
+            map[cookie.domain] = set
+        }
+        if (cookie.expiresAt <= System.currentTimeMillis()) {
+            toRemove = set.remove(cookie)
+            // If the cookie is not persistent, it's not in database
+            if (toRemove != null && !toRemove.persistent) {
+                toRemove = null
+            }
+        } else {
+            toAdd = cookie
+            toUpdate = set.add(cookie)
+            // If the cookie is not persistent, it's not in database
+            if (!toAdd.persistent) toAdd = null
+            if (toUpdate != null && !toUpdate.persistent) toUpdate = null
+            // Remove the cookie if it updates to null
+            if (toAdd == null && toUpdate != null) {
+                toRemove = toUpdate
+                toUpdate = null
+            }
+        }
+        if (toRemove != null) {
+            db.remove(toRemove)
+        }
+        if (toAdd != null) {
+            if (toUpdate != null) {
+                db.update(toUpdate, toAdd)
+            } else {
+                db.add(toAdd)
+            }
+        }
+    }
+
+    fun getCookieHeader(url: HttpUrl): String {
+        val cookies = getCookies(url)
+        val cookieHeader = StringBuilder()
+        var i = 0
+        val size = cookies.size
+        while (i < size) {
+            if (i > 0) {
+                cookieHeader.append("; ")
+            }
+            val cookie = cookies[i]
+            cookieHeader.append(cookie.name).append('=').append(cookie.value)
+            i++
+        }
+        return cookieHeader.toString()
+    }
+
+    @Synchronized
+    fun getCookies(url: HttpUrl): List<Cookie> {
+        val accepted: MutableList<Cookie> = ArrayList()
+        val expired: MutableList<Cookie> = ArrayList()
+        for ((domain, cookieSet) in map) {
+            if (domainMatch(url, domain)) {
+                cookieSet[url, accepted, expired]
+            }
+        }
+        for (cookie in expired) {
+            if (cookie.persistent) {
+                db.remove(cookie)
+            }
+        }
+
+        // RFC 6265 Section-5.4 step 2, sort the cookie-list
+        // Cookies with longer paths are listed before cookies with shorter paths.
+        // Ignore creation-time, we don't store them.
+        accepted.sortWith { o1: Cookie, o2: Cookie -> o2.path.length - o1.path.length }
+        return accepted
+    }
+
+    fun contains(url: HttpUrl, name: String?): Boolean {
+        for (cookie in getCookies(url)) {
+            if (cookie.name == name) {
+                return true
+            }
+        }
+        return false
+    }
+
+    /**
+     * Remove all cookies in this `CookieRepository`.
+     */
+    @Synchronized
+    fun clear() {
+        map.clear()
+        db.clear()
+    }
+
+    @Synchronized
+    fun close() {
+        db.close()
+    }
+
+    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
+        for (cookie in cookies) {
+            addCookie(cookie)
+        }
+    }
+
+    /**
+     * Quick and dirty pattern to differentiate IP addresses from hostnames. This is an approximation
+     * of Android's private InetAddress#isNumeric API.
+     *
+     *
+     * This matches IPv6 addresses as a hex string containing at least one colon, and possibly
+     * including dots after the first colon. It matches IPv4 addresses as strings containing only
+     * decimal digits and dots. This pattern matches strings like "a:.23" and "54" that are neither IP
+     * addresses nor hostnames; they will be verified as IP addresses (which is a more strict
+     * verification).
+     */
+    private val VERIFY_AS_IP_ADDRESS =
+        Pattern.compile("([0-9a-fA-F]*:[0-9a-fA-F:.]*)|([\\d.]+)")
+
+    /**
+     * Returns true if `host` is not a host name and might be an IP address.
+     */
+    private fun verifyAsIpAddress(host: String): Boolean {
+        return VERIFY_AS_IP_ADDRESS.matcher(host).matches()
+    }
+
+    // okhttp3.Cookie.domainMatch(HttpUrl, String)
+    @JvmStatic
+    fun domainMatch(url: HttpUrl, domain: String?): Boolean {
+        val urlHost = url.host
+        return if (urlHost == domain) {
+            true // As in 'example.com' matching 'example.com'.
+        } else urlHost.endsWith(domain!!)
+                && urlHost[urlHost.length - domain.length - 1] == '.' && !verifyAsIpAddress(
+            urlHost
+        )
+        // As in 'example.com' matching 'www.example.com'.
+    }
+
+    override fun loadForRequest(url: HttpUrl): List<Cookie> {
+        val cookies = getCookies(url)
+        val checkTips = domainMatch(url, EhUrl.DOMAIN_E)
+        return if (checkTips) {
+            val result: MutableList<Cookie> = ArrayList(cookies.size + 1)
+            // Add all but skip some
+            for (cookie in cookies) {
+                val name = cookie.name
+                if (EhConfig.KEY_CONTENT_WARNING == name) {
+                    continue
+                }
+                if (EhConfig.KEY_UCONFIG == name) {
+                    continue
+                }
+                result.add(cookie)
+            }
+            // Add some
+            result.add(sTipsCookie)
+            Collections.unmodifiableList(result)
+        } else {
+            cookies
+        }
+    }
+}

app/src/main/java/com/hippo/ehviewer/client/EhDns.kt

@@ -123,4 +123,8 @@ object EhDns : Dns {
         return hosts[hostname] ?: builtInHosts[hostname].takeIf { Settings.getBuiltInHosts() }
         ?: Dns.SYSTEM.lookup(hostname)
     }
-}
+
+    fun isInHosts(hostname: String): Boolean {
+        return hosts.contains(hostname) || (builtInHosts.contains(hostname) && Settings.getBuiltInHosts())
+    }
+}

app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt

@@ -75,7 +75,7 @@ object EhEngine {
     private const val SAD_PANDA_LENGTH = "9615"
     private const val KOKOMADE_URL = "https://exhentai.org/img/kokomade.jpg"
     private val MEDIA_TYPE_JPEG: MediaType = "image/jpeg".toMediaType()
-    private var sEhFilter = EhFilter.getInstance()
+    private var sEhFilter = EhFilter
     private val okHttpClient = EhApplication.okHttpClient
 
     private fun transformException(code: Int, headers: Headers?, body: String?, e: Throwable?) {
@@ -213,7 +213,7 @@ object EhEngine {
 
     @Throws(Throwable::class)
     suspend fun getGalleryList(url: String): GalleryListParser.Result {
-        val referer = EhUrl.getReferer()
+        val referer = EhUrl.referer
         Log.d(TAG, url)
         val request = EhRequestBuilder(url, referer).build()
         val call = okHttpClient.newCall(request)
@@ -279,8 +279,8 @@ object EhEngine {
         }
         json.put("gidlist", ja)
         json.put("namespace", 1)
-        val url = EhUrl.getApiUrl()
-        val origin = EhUrl.getOrigin()
+        val url = EhUrl.apiUrl
+        val origin = EhUrl.origin
         Log.d(TAG, url)
         val request = EhRequestBuilder(url, referer, origin)
             .post(json.toString().toRequestBody(MEDIA_TYPE_JSON))
@@ -306,7 +306,7 @@ object EhEngine {
 
     @Throws(Throwable::class)
     suspend fun getGalleryDetail(url: String?): GalleryDetail {
-        val referer = EhUrl.getReferer()
+        val referer = EhUrl.referer
         Log.d(TAG, url!!)
         val request = EhRequestBuilder(url, referer).build()
         val call = okHttpClient.newCall(request)
@@ -334,7 +334,7 @@ object EhEngine {
 
     @Throws(Throwable::class)
     suspend fun getPreviewSet(url: String?): Pair<PreviewSet, Int> {
-        val referer = EhUrl.getReferer()
+        val referer = EhUrl.referer
         Log.d(TAG, url!!)
         val request = EhRequestBuilder(url, referer).build()
         val call = okHttpClient.newCall(request)
@@ -372,9 +372,9 @@ object EhEngine {
         json.put("token", token)
         json.put("rating", ceil((rating * 2).toDouble()).toInt())
         val requestBody: RequestBody = json.toString().toRequestBody(MEDIA_TYPE_JSON)
-        val url = EhUrl.getApiUrl()
+        val url = EhUrl.apiUrl
         val referer = EhUrl.getGalleryDetailUrl(gid, token)
-        val origin = EhUrl.getOrigin()
+        val origin = EhUrl.origin
         Log.d(TAG, url)
         val request = EhRequestBuilder(url, referer, origin)
             .post(requestBody)
@@ -409,7 +409,7 @@ object EhEngine {
             builder.add("commenttext_edit", comment)
             builder.add("edit_comment", id)
         }
-        val origin = EhUrl.getOrigin()
+        val origin = EhUrl.origin
         Log.d(TAG, url!!)
         val request = EhRequestBuilder(url, url, origin)
             .post(builder.build())
@@ -451,9 +451,9 @@ object EhEngine {
                 )
             )
         val requestBody: RequestBody = json.toString().toRequestBody(MEDIA_TYPE_JSON)
-        val url = EhUrl.getApiUrl()
-        val referer = EhUrl.getReferer()
-        val origin = EhUrl.getOrigin()
+        val url = EhUrl.apiUrl
+        val referer = EhUrl.referer
+        val origin = EhUrl.origin
         Log.d(TAG, url)
         val request = EhRequestBuilder(url, referer, origin)
             .post(requestBody)
@@ -480,7 +480,7 @@ object EhEngine {
     suspend fun getFavorites(
         url: String
     ): FavoritesParser.Result {
-        val referer = EhUrl.getReferer()
+        val referer = EhUrl.referer
         Log.d(TAG, url)
         val request = EhRequestBuilder(url, referer).build()
         val call = okHttpClient.newCall(request)
@@ -534,7 +534,7 @@ object EhEngine {
         builder.add("submit", "Apply Changes")
         builder.add("update", "1")
         val url = EhUrl.getAddFavorites(gid, token)
-        val origin = EhUrl.getOrigin()
+        val origin = EhUrl.origin
         Log.d(TAG, url)
         val request = EhRequestBuilder(url, url, origin)
             .post(builder.build())
@@ -597,7 +597,7 @@ object EhEngine {
             builder.add("modifygids[]", gid.toString())
         }
         builder.add("apply", "Apply")
-        val origin = EhUrl.getOrigin()
+        val origin = EhUrl.origin
         Log.d(TAG, url)
         val request = EhRequestBuilder(url, url, origin)
             .post(builder.build())
@@ -669,7 +669,14 @@ object EhEngine {
                 code = response.code
                 headers = response.headers
                 body = response.body.string()
-                result = ArchiveParser.parse(body)
+                result = ArchiveParser.parse(body!!)!!
+                if (result.funds == null) {
+                    try {
+                        result.funds = getFunds()
+                    } catch (e: Throwable) {
+                        e.printStackTrace()
+                    }
+                }
             }
         } catch (e: Throwable) {
             ExceptionUtils.throwIfFatal(e)
@@ -703,7 +710,7 @@ object EhEngine {
         }
         val url = EhUrl.getDownloadArchive(gid, token, or)
         val referer = EhUrl.getGalleryDetailUrl(gid, token)
-        val origin = EhUrl.getOrigin()
+        val origin = EhUrl.origin
         Log.d(TAG, url)
         val request = EhRequestBuilder(url, referer, origin)
             .post(builder.build())
@@ -711,43 +718,68 @@ object EhEngine {
         val call = okHttpClient.newCall(request)
         var body: String? = null
         var headers: Headers? = null
+        var result: String?
+        var code = -1
+        try {
+            call.executeAsync().use { response ->
+                code = response.code
+                headers = response.headers
+                body = response.body.string()
+                transformException(code, headers, body, null)
+                result = ArchiveParser.parseArchiveUrl(body!!)
+            }
+        } catch (e: Throwable) {
+            ExceptionUtils.throwIfFatal(e)
+            transformException(code, headers, body, e)
+            throw e
+        }
+        if (!isHAtH) {
+            if (result == null) {
+                // Wait for the server to prepare archives
+                delay(1000)
+                try {
+                    call.clone().executeAsync().use { response ->
+                        code = response.code
+                        headers = response.headers
+                        body = response.body.string()
+                        transformException(code, headers, body, null)
+                        result = ArchiveParser.parseArchiveUrl(body!!)
+                    }
+                } catch (e: Throwable) {
+                    ExceptionUtils.throwIfFatal(e)
+                    transformException(code, headers, body, e)
+                    throw e
+                }
+                if (result == null) {
+                    throw EhException("Archive unavailable")
+                }
+            }
+            return result
+        }
+        return null
+    }
+
+    @Throws(Throwable::class)
+    suspend fun getFunds(): ArchiveParser.Funds? {
+        val url = EhUrl.URL_FUNDS
+        Log.d(TAG, url)
+        val request = EhRequestBuilder(url, null).build()
+        val call = okHttpClient.newCall(request)
+        var body: String? = null
+        var headers: Headers? = null
         var code = -1
         try {
             call.executeAsync().use { response ->
                 code = response.code
                 headers = response.headers
                 body = response.body.string()
-                transformException(code, headers, body, null)
+                return ArchiveParser.parseFunds(body!!)
             }
         } catch (e: Throwable) {
             ExceptionUtils.throwIfFatal(e)
             transformException(code, headers, body, e)
             throw e
         }
-        var result = ArchiveParser.parseArchiveUrl(body)
-        if (!isHAtH) {
-            if (result == null) {
-                delay(1000)
-                try {
-                    call.clone().executeAsync().use { response ->
-                        code = response.code
-                        headers = response.headers
-                        body = response.body.string()
-                        transformException(code, headers, body, null)
-                    }
-                } catch (e: Throwable) {
-                    ExceptionUtils.throwIfFatal(e)
-                    transformException(code, headers, body, e)
-                    throw e
-                }
-                result = ArchiveParser.parseArchiveUrl(body)
-                if (result == null) {
-                    throw EhException("Archive unavailable")
-                }
-            }
-            return result
-        }
-        return null
     }
 
     @Throws(Throwable::class)
@@ -799,7 +831,7 @@ object EhEngine {
 
     @Throws(Throwable::class)
     suspend fun getUConfig(): Void? {
-        val url = EhUrl.getUConfigUrl()
+        val url = EhUrl.uConfigUrl
         Log.d(TAG, url)
         var request = EhRequestBuilder(url, null).build()
         var call = okHttpClient.newCall(request)
@@ -855,9 +887,9 @@ object EhEngine {
         json.put("comment_id", commentId)
         json.put("comment_vote", commentVote)
         val requestBody: RequestBody = json.toString().toRequestBody(MEDIA_TYPE_JSON)
-        val url = EhUrl.getApiUrl()
-        val referer = EhUrl.getReferer()
-        val origin = EhUrl.getOrigin()
+        val url = EhUrl.apiUrl
+        val referer = EhUrl.referer
+        val origin = EhUrl.origin
         Log.d(TAG, url)
         val request = EhRequestBuilder(url, referer, origin)
             .post(requestBody)
@@ -894,9 +926,9 @@ object EhEngine {
         json.put("tags", tags)
         json.put("vote", vote)
         val requestBody: RequestBody = json.toString().toRequestBody(MEDIA_TYPE_JSON)
-        val url = EhUrl.getApiUrl()
-        val referer = EhUrl.getReferer()
-        val origin = EhUrl.getOrigin()
+        val url = EhUrl.apiUrl
+        val referer = EhUrl.referer
+        val origin = EhUrl.origin
         Log.d(TAG, url)
         val request = EhRequestBuilder(url, referer, origin)
             .post(requestBody)
@@ -958,9 +990,9 @@ object EhEngine {
             Headers.headersOf("Content-Disposition", "form-data; name=\"f_sfile\""),
             "File Search".toRequestBody()
         )
-        val url = EhUrl.getImageSearchUrl()
-        val referer = EhUrl.getReferer()
-        val origin = EhUrl.getOrigin()
+        val url = EhUrl.imageSearchUrl
+        val referer = EhUrl.referer
+        val origin = EhUrl.origin
         Log.d(TAG, url)
         val request = EhRequestBuilder(url, referer, origin)
             .post(builder.build())
@@ -1032,12 +1064,12 @@ object EhEngine {
         json.put("imgkey", pToken)
         json.put("showkey", showKey)
         val requestBody: RequestBody = json.toString().toRequestBody(MEDIA_TYPE_JSON)
-        val url = EhUrl.getApiUrl()
+        val url = EhUrl.apiUrl
         var referer: String? = null
         if (index > 0 && previousPToken != null) {
             referer = EhUrl.getPageUrl(gid, index - 1, previousPToken)
         }
-        val origin = EhUrl.getOrigin()
+        val origin = EhUrl.origin
         Log.d(TAG, url)
         val request = EhRequestBuilder(url, referer, origin)
             .post(requestBody)

app/src/main/java/com/hippo/ehviewer/client/EhFilter.java

@@ -1,315 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.client;
-
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-
-import com.hippo.ehviewer.EhDB;
-import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.ehviewer.dao.Filter;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public final class EhFilter {
-
-    public static final int MODE_TITLE = 0;
-    public static final int MODE_UPLOADER = 1;
-    public static final int MODE_TAG = 2;
-    public static final int MODE_TAG_NAMESPACE = 3;
-    public static final int MODE_COMMENTER = 4;
-    public static final int MODE_COMMENT = 5;
-    private static final String TAG = EhFilter.class.getSimpleName();
-    private static EhFilter sInstance;
-    private final List<Filter> mTitleFilterList = new ArrayList<>();
-    private final List<Filter> mUploaderFilterList = new ArrayList<>();
-    private final List<Filter> mTagFilterList = new ArrayList<>();
-    private final List<Filter> mTagNamespaceFilterList = new ArrayList<>();
-    private final List<Filter> mCommenterFilterList = new ArrayList<>();
-    private final List<Filter> mCommentFilterList = new ArrayList<>();
-
-    private EhFilter() {
-        List<Filter> list = EhDB.getAllFilter();
-        for (int i = 0, n = list.size(); i < n; i++) {
-            Filter filter = list.get(i);
-            switch (filter.mode) {
-                case MODE_TITLE -> {
-                    filter.text = filter.text.toLowerCase();
-                    mTitleFilterList.add(filter);
-                }
-                case MODE_TAG -> {
-                    filter.text = filter.text.toLowerCase();
-                    mTagFilterList.add(filter);
-                }
-                case MODE_TAG_NAMESPACE -> {
-                    filter.text = filter.text.toLowerCase();
-                    mTagNamespaceFilterList.add(filter);
-                }
-                case MODE_UPLOADER -> mUploaderFilterList.add(filter);
-                case MODE_COMMENTER -> mCommenterFilterList.add(filter);
-                case MODE_COMMENT -> mCommentFilterList.add(filter);
-                default -> Log.d(TAG, "Unknown mode: " + filter.mode);
-            }
-        }
-    }
-
-    public static @NonNull EhFilter getInstance() {
-        if (sInstance == null) {
-            sInstance = new EhFilter();
-        }
-        return sInstance;
-    }
-
-    public List<Filter> getTitleFilterList() {
-        return mTitleFilterList;
-    }
-
-    public List<Filter> getUploaderFilterList() {
-        return mUploaderFilterList;
-    }
-
-    public List<Filter> getTagFilterList() {
-        return mTagFilterList;
-    }
-
-    public List<Filter> getTagNamespaceFilterList() {
-        return mTagNamespaceFilterList;
-    }
-
-    public List<Filter> getCommenterFilterList() {
-        return mCommenterFilterList;
-    }
-
-    public List<Filter> getCommentFilterList() {
-        return mCommentFilterList;
-    }
-
-    public synchronized boolean addFilter(Filter filter) {
-        // enable filter by default before it is added to database
-        filter.enable = true;
-        if (!EhDB.addFilter(filter)) return false;
-
-        switch (filter.mode) {
-            case MODE_TITLE -> {
-                filter.text = filter.text.toLowerCase();
-                mTitleFilterList.add(filter);
-            }
-            case MODE_TAG -> {
-                filter.text = filter.text.toLowerCase();
-                mTagFilterList.add(filter);
-            }
-            case MODE_TAG_NAMESPACE -> {
-                filter.text = filter.text.toLowerCase();
-                mTagNamespaceFilterList.add(filter);
-            }
-            case MODE_UPLOADER -> mUploaderFilterList.add(filter);
-            case MODE_COMMENTER -> mCommenterFilterList.add(filter);
-            case MODE_COMMENT -> mCommentFilterList.add(filter);
-            default -> Log.d(TAG, "Unknown mode: " + filter.mode);
-        }
-        return true;
-    }
-
-    public synchronized void triggerFilter(Filter filter) {
-        EhDB.triggerFilter(filter);
-    }
-
-    public synchronized void deleteFilter(Filter filter) {
-        EhDB.deleteFilter(filter);
-
-        switch (filter.mode) {
-            case MODE_TITLE -> mTitleFilterList.remove(filter);
-            case MODE_TAG -> mTagFilterList.remove(filter);
-            case MODE_TAG_NAMESPACE -> mTagNamespaceFilterList.remove(filter);
-            case MODE_UPLOADER -> mUploaderFilterList.remove(filter);
-            case MODE_COMMENTER -> mCommenterFilterList.remove(filter);
-            case MODE_COMMENT -> mCommentFilterList.remove(filter);
-            default -> Log.d(TAG, "Unknown mode: " + filter.mode);
-        }
-    }
-
-    public synchronized boolean needTags() {
-        return 0 != mTagFilterList.size() || 0 != mTagNamespaceFilterList.size();
-    }
-
-    public synchronized boolean filterTitle(GalleryInfo info) {
-        if (null == info) {
-            return false;
-        }
-
-        // Title
-        String title = info.getTitle();
-        List<Filter> filters = mTitleFilterList;
-        if (null != title && filters.size() > 0) {
-            for (int i = 0, n = filters.size(); i < n; i++) {
-                if (filters.get(i).enable && title.toLowerCase().contains(filters.get(i).text)) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    public synchronized boolean filterUploader(GalleryInfo info) {
-        if (null == info) {
-            return false;
-        }
-
-        // Uploader
-        String uploader = info.getUploader();
-        List<Filter> filters = mUploaderFilterList;
-        if (null != uploader && filters.size() > 0) {
-            for (int i = 0, n = filters.size(); i < n; i++) {
-                if (filters.get(i).enable && uploader.equals(filters.get(i).text)) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private boolean matchTag(String tag, String filter) {
-        if (null == tag || null == filter) {
-            return false;
-        }
-
-        String tagNamespace;
-        String tagName;
-        String filterNamespace;
-        String filterName;
-        int index = tag.indexOf(':');
-        if (index < 0) {
-            tagNamespace = null;
-            tagName = tag;
-        } else {
-            tagNamespace = tag.substring(0, index);
-            tagName = tag.substring(index + 1);
-        }
-        index = filter.indexOf(':');
-        if (index < 0) {
-            filterNamespace = null;
-            filterName = filter;
-        } else {
-            filterNamespace = filter.substring(0, index);
-            filterName = filter.substring(index + 1);
-        }
-
-        if (null != tagNamespace && null != filterNamespace &&
-                !tagNamespace.equals(filterNamespace)) {
-            return false;
-        }
-        return tagName.equals(filterName);
-    }
-
-    public synchronized boolean filterTag(GalleryInfo info) {
-        if (null == info) {
-            return false;
-        }
-
-        // Tag
-        String[] tags = info.getSimpleTags();
-        List<Filter> filters = mTagFilterList;
-        if (null != tags && filters.size() > 0) {
-            for (String tag : tags) {
-                for (int i = 0, n = filters.size(); i < n; i++) {
-                    if (filters.get(i).enable && matchTag(tag, filters.get(i).text)) {
-                        return false;
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private boolean matchTagNamespace(String tag, String filter) {
-        if (null == tag || null == filter) {
-            return false;
-        }
-
-        String tagNamespace;
-        int index = tag.indexOf(':');
-        if (index >= 0) {
-            tagNamespace = tag.substring(0, index);
-            return tagNamespace.equals(filter);
-        } else {
-            return false;
-        }
-    }
-
-    public synchronized boolean filterTagNamespace(GalleryInfo info) {
-        if (null == info) {
-            return false;
-        }
-
-        String[] tags = info.getSimpleTags();
-        List<Filter> filters = mTagNamespaceFilterList;
-        if (null != tags && filters.size() > 0) {
-            for (String tag : tags) {
-                for (int i = 0, n = filters.size(); i < n; i++) {
-                    if (filters.get(i).enable && matchTagNamespace(tag, filters.get(i).text)) {
-                        return false;
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
-    public synchronized boolean filterCommenter(String commenter) {
-        if (null == commenter) {
-            return false;
-        }
-
-        List<Filter> filters = mCommenterFilterList;
-        if (filters.size() > 0) {
-            for (int i = 0, n = filters.size(); i < n; i++) {
-                if (filters.get(i).enable && commenter.equals(filters.get(i).text)) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    public synchronized boolean filterComment(String comment) {
-        if (null == comment) {
-            return false;
-        }
-
-        List<Filter> filters = mCommentFilterList;
-        if (filters.size() > 0) {
-            for (int i = 0, n = filters.size(); i < n; i++) {
-                if (filters.get(i).enable) {
-                    Pattern p = Pattern.compile(filters.get(i).text);
-                    Matcher m = p.matcher(comment);
-                    if (m.find()) return false;
-                }
-            }
-        }
-
-        return true;
-    }
-}

app/src/main/java/com/hippo/ehviewer/client/EhFilter.kt

@@ -0,0 +1,315 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * 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 com.hippo.ehviewer.client
+
+import android.util.Log
+import com.hippo.ehviewer.EhDB
+import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.dao.Filter
+import java.util.Locale
+import java.util.regex.Pattern
+
+object EhFilter {
+    private val mTitleFilterList: MutableList<Filter> = ArrayList()
+    private val mUploaderFilterList: MutableList<Filter> = ArrayList()
+    private val mTagFilterList: MutableList<Filter> = ArrayList()
+    private val mTagNamespaceFilterList: MutableList<Filter> = ArrayList()
+    private val mCommenterFilterList: MutableList<Filter> = ArrayList()
+    private val mCommentFilterList: MutableList<Filter> = ArrayList()
+
+    const val MODE_TITLE = 0
+    const val MODE_UPLOADER = 1
+    const val MODE_TAG = 2
+    const val MODE_TAG_NAMESPACE = 3
+    const val MODE_COMMENTER = 4
+    const val MODE_COMMENT = 5
+    private val TAG = EhFilter::class.java.simpleName
+
+    init {
+        val list = EhDB.getAllFilter()
+        var i = 0
+        val n = list.size
+        while (i < n) {
+            val filter = list[i]
+            when (filter.mode) {
+                MODE_TITLE -> {
+                    filter.text = filter.text!!.lowercase(Locale.getDefault())
+                    mTitleFilterList.add(filter)
+                }
+
+                MODE_TAG -> {
+                    filter.text = filter.text!!.lowercase(Locale.getDefault())
+                    mTagFilterList.add(filter)
+                }
+
+                MODE_TAG_NAMESPACE -> {
+                    filter.text = filter.text!!.lowercase(Locale.getDefault())
+                    mTagNamespaceFilterList.add(filter)
+                }
+
+                MODE_UPLOADER -> mUploaderFilterList.add(filter)
+                MODE_COMMENTER -> mCommenterFilterList.add(filter)
+                MODE_COMMENT -> mCommentFilterList.add(filter)
+                else -> Log.d(TAG, "Unknown mode: " + filter.mode)
+            }
+            i++
+        }
+    }
+
+    val titleFilterList: List<Filter>
+        get() = mTitleFilterList
+    val uploaderFilterList: List<Filter>
+        get() = mUploaderFilterList
+    val tagFilterList: List<Filter>
+        get() = mTagFilterList
+    val tagNamespaceFilterList: List<Filter>
+        get() = mTagNamespaceFilterList
+    val commenterFilterList: List<Filter>
+        get() = mCommenterFilterList
+    val commentFilterList: List<Filter>
+        get() = mCommentFilterList
+
+    @Synchronized
+    fun addFilter(filter: Filter): Boolean {
+        // enable filter by default before it is added to database
+        filter.enable = true
+        if (!EhDB.addFilter(filter)) return false
+        when (filter.mode) {
+            MODE_TITLE -> {
+                filter.text = filter.text!!.lowercase(Locale.getDefault())
+                mTitleFilterList.add(filter)
+            }
+
+            MODE_TAG -> {
+                filter.text = filter.text!!.lowercase(Locale.getDefault())
+                mTagFilterList.add(filter)
+            }
+
+            MODE_TAG_NAMESPACE -> {
+                filter.text = filter.text!!.lowercase(Locale.getDefault())
+                mTagNamespaceFilterList.add(filter)
+            }
+
+            MODE_UPLOADER -> mUploaderFilterList.add(filter)
+            MODE_COMMENTER -> mCommenterFilterList.add(filter)
+            MODE_COMMENT -> mCommentFilterList.add(filter)
+            else -> Log.d(TAG, "Unknown mode: " + filter.mode)
+        }
+        return true
+    }
+
+    @Synchronized
+    fun triggerFilter(filter: Filter?) {
+        EhDB.triggerFilter(filter)
+    }
+
+    @Synchronized
+    fun deleteFilter(filter: Filter) {
+        EhDB.deleteFilter(filter)
+        when (filter.mode) {
+            MODE_TITLE -> mTitleFilterList.remove(filter)
+            MODE_TAG -> mTagFilterList.remove(filter)
+            MODE_TAG_NAMESPACE -> mTagNamespaceFilterList.remove(filter)
+            MODE_UPLOADER -> mUploaderFilterList.remove(filter)
+            MODE_COMMENTER -> mCommenterFilterList.remove(filter)
+            MODE_COMMENT -> mCommentFilterList.remove(filter)
+            else -> Log.d(TAG, "Unknown mode: " + filter.mode)
+        }
+    }
+
+    @Synchronized
+    fun needTags(): Boolean {
+        return 0 != mTagFilterList.size || 0 != mTagNamespaceFilterList.size
+    }
+
+    @Synchronized
+    fun filterTitle(info: GalleryInfo?): Boolean {
+        if (null == info) {
+            return false
+        }
+
+        // Title
+        val title = info.title
+        val filters: List<Filter> = mTitleFilterList
+        if (null != title && filters.isNotEmpty()) {
+            var i = 0
+            val n = filters.size
+            while (i < n) {
+                if (filters[i].enable!! && title.lowercase(Locale.getDefault()).contains(
+                        filters[i].text!!
+                    )
+                ) {
+                    return false
+                }
+                i++
+            }
+        }
+        return true
+    }
+
+    @Synchronized
+    fun filterUploader(info: GalleryInfo?): Boolean {
+        if (null == info) {
+            return false
+        }
+
+        // Uploader
+        val uploader = info.uploader
+        val filters: List<Filter> = mUploaderFilterList
+        if (null != uploader && filters.isNotEmpty()) {
+            var i = 0
+            val n = filters.size
+            while (i < n) {
+                if (filters[i].enable!! && uploader == filters[i].text) {
+                    return false
+                }
+                i++
+            }
+        }
+        return true
+    }
+
+    private fun matchTag(tag: String?, filter: String?): Boolean {
+        if (null == tag || null == filter) {
+            return false
+        }
+        val tagNamespace: String?
+        val tagName: String
+        val filterNamespace: String?
+        val filterName: String
+        var index = tag.indexOf(':')
+        if (index < 0) {
+            tagNamespace = null
+            tagName = tag
+        } else {
+            tagNamespace = tag.substring(0, index)
+            tagName = tag.substring(index + 1)
+        }
+        index = filter.indexOf(':')
+        if (index < 0) {
+            filterNamespace = null
+            filterName = filter
+        } else {
+            filterNamespace = filter.substring(0, index)
+            filterName = filter.substring(index + 1)
+        }
+        return if (null != tagNamespace && null != filterNamespace &&
+            tagNamespace != filterNamespace
+        ) {
+            false
+        } else tagName == filterName
+    }
+
+    @Synchronized
+    fun filterTag(info: GalleryInfo?): Boolean {
+        if (null == info) {
+            return false
+        }
+
+        // Tag
+        val tags = info.simpleTags
+        val filters: List<Filter> = mTagFilterList
+        if (null != tags && filters.isNotEmpty()) {
+            for (tag in tags) {
+                var i = 0
+                val n = filters.size
+                while (i < n) {
+                    if (filters[i].enable!! && matchTag(tag, filters[i].text)) {
+                        return false
+                    }
+                    i++
+                }
+            }
+        }
+        return true
+    }
+
+    private fun matchTagNamespace(tag: String?, filter: String?): Boolean {
+        if (null == tag || null == filter) {
+            return false
+        }
+        val tagNamespace: String
+        val index = tag.indexOf(':')
+        return if (index >= 0) {
+            tagNamespace = tag.substring(0, index)
+            tagNamespace == filter
+        } else {
+            false
+        }
+    }
+
+    @Synchronized
+    fun filterTagNamespace(info: GalleryInfo?): Boolean {
+        if (null == info) {
+            return false
+        }
+        val tags = info.simpleTags
+        val filters: List<Filter> = mTagNamespaceFilterList
+        if (null != tags && filters.isNotEmpty()) {
+            for (tag in tags) {
+                var i = 0
+                val n = filters.size
+                while (i < n) {
+                    if (filters[i].enable!! && matchTagNamespace(tag, filters[i].text)) {
+                        return false
+                    }
+                    i++
+                }
+            }
+        }
+        return true
+    }
+
+    @Synchronized
+    fun filterCommenter(commenter: String?): Boolean {
+        if (null == commenter) {
+            return false
+        }
+        val filters: List<Filter> = mCommenterFilterList
+        if (filters.isNotEmpty()) {
+            var i = 0
+            val n = filters.size
+            while (i < n) {
+                if (filters[i].enable!! && commenter == filters[i].text) {
+                    return false
+                }
+                i++
+            }
+        }
+        return true
+    }
+
+    @Synchronized
+    fun filterComment(comment: String?): Boolean {
+        if (null == comment) {
+            return false
+        }
+        val filters: List<Filter> = mCommentFilterList
+        if (filters.isNotEmpty()) {
+            var i = 0
+            val n = filters.size
+            while (i < n) {
+                if (filters[i].enable!!) {
+                    val p = Pattern.compile(filters[i].text!!)
+                    val m = p.matcher(comment)
+                    if (m.find()) return false
+                }
+                i++
+            }
+        }
+        return true
+    }
+}

app/src/main/java/com/hippo/ehviewer/client/EhRequest.kt

@@ -31,7 +31,7 @@ class EhRequest {
         get() = job?.isActive ?: false
     var method = 0
         private set
-    var args: Array<out Any>? = null
+    var args: Array<out Any?>? = null
         private set
     var callback: EhClient.Callback<Any?>? = null
         private set
@@ -41,7 +41,7 @@ class EhRequest {
         return this
     }
 
-    fun setArgs(vararg args: Any): EhRequest {
+    fun setArgs(vararg args: Any?): EhRequest {
         this.args = args
         return this
     }

app/src/main/java/com/hippo/ehviewer/client/EhSSLSocketFactory.kt

@@ -34,8 +34,8 @@ object EhSSLSocketFactory : SSLSocketFactory() {
     }
 
     override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket {
-        val address = s.inetAddress.hostAddress
-        val socket = sslSocketFactory.createSocket(s, address, port, autoClose) as SSLSocket
+        val address = s.inetAddress.hostAddress.takeIf { EhDns.isInHosts(host) }
+        val socket = sslSocketFactory.createSocket(s, address ?: host, port, autoClose) as SSLSocket
         val sslSession = socket.session
         Log.d(
             "EhSSLSocketFactory",

app/src/main/java/com/hippo/ehviewer/client/EhUrl.java

@@ -1,196 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.client;
-
-import androidx.annotation.NonNull;
-
-import com.hippo.ehviewer.Settings;
-import com.hippo.network.UrlBuilder;
-
-public class EhUrl {
-
-    public static final int SITE_E = 0;
-    public static final int SITE_EX = 1;
-
-    public static final String DOMAIN_EX = "exhentai.org";
-    public static final String DOMAIN_E = "e-hentai.org";
-    public static final String DOMAIN_LOFI = "lofi.e-hentai.org";
-
-    public static final String HOST_EX = "https://" + DOMAIN_EX + "/";
-    public static final String API_EX = HOST_EX + "api.php";
-    public static final String URL_FAVORITES_EX = HOST_EX + "favorites.php";
-    public static final String URL_UCONFIG_EX = HOST_EX + "uconfig.php";
-    public static final String URL_MY_TAGS_EX = HOST_EX + "mytags";
-    public static final String URL_WATCHED_EX = HOST_EX + "watched";
-    public static final String HOST_E = "https://" + DOMAIN_E + "/";
-    public static final String API_E = HOST_E + "api.php";
-    public static final String URL_FAVORITES_E = HOST_E + "favorites.php";
-    public static final String URL_UCONFIG_E = HOST_E + "uconfig.php";
-    public static final String URL_MY_TAGS_E = HOST_E + "mytags";
-    public static final String URL_WATCHED_E = HOST_E + "watched";
-    public static final String API_SIGN_IN = "https://forums.e-hentai.org/index.php?act=Login&CODE=01";
-    public static final String URL_POPULAR_E = "https://e-hentai.org/popular";
-    public static final String URL_POPULAR_EX = "https://exhentai.org/popular";
-    public static final String URL_IMAGE_SEARCH_E = "https://upload.e-hentai.org/image_lookup.php";
-    public static final String URL_IMAGE_SEARCH_EX = "https://exhentai.org/upload/image_lookup.php";
-    public static final String URL_SIGN_IN = "https://forums.e-hentai.org/index.php?act=Login";
-    public static final String URL_REGISTER = "https://forums.e-hentai.org/index.php?act=Reg&CODE=00";
-    public static final String URL_FORUMS = "https://forums.e-hentai.org/";
-    public static final String REFERER_EX = "https://" + DOMAIN_EX;
-    public static final String ORIGIN_EX = REFERER_EX;
-    public static final String REFERER_E = "https://" + DOMAIN_E;
-    public static final String ORIGIN_E = REFERER_E;
-
-    public static String getGalleryDetailUrl(long gid, String token) {
-        return getGalleryDetailUrl(gid, token, 0, false);
-    }
-
-    public static String getHost() {
-        switch (Settings.getGallerySite()) {
-            default:
-            case SITE_E:
-                return HOST_E;
-            case SITE_EX:
-                return HOST_EX;
-        }
-    }
-
-    public static String getFavoritesUrl() {
-        switch (Settings.getGallerySite()) {
-            default:
-            case SITE_E:
-                return URL_FAVORITES_E;
-            case SITE_EX:
-                return URL_FAVORITES_EX;
-        }
-    }
-
-    public static String getApiUrl() {
-        switch (Settings.getGallerySite()) {
-            default:
-            case SITE_E:
-                return API_E;
-            case SITE_EX:
-                return API_EX;
-        }
-    }
-
-    public static String getReferer() {
-        switch (Settings.getGallerySite()) {
-            default:
-            case SITE_E:
-                return REFERER_E;
-            case SITE_EX:
-                return REFERER_EX;
-        }
-    }
-
-    public static String getOrigin() {
-        switch (Settings.getGallerySite()) {
-            default:
-            case SITE_E:
-                return ORIGIN_E;
-            case SITE_EX:
-                return ORIGIN_EX;
-        }
-    }
-
-    public static String getUConfigUrl() {
-        switch (Settings.getGallerySite()) {
-            default:
-            case SITE_E:
-                return URL_UCONFIG_E;
-            case SITE_EX:
-                return URL_UCONFIG_EX;
-        }
-    }
-
-    public static String getMyTagsUrl() {
-        switch (Settings.getGallerySite()) {
-            default:
-            case SITE_E:
-                return URL_MY_TAGS_E;
-            case SITE_EX:
-                return URL_MY_TAGS_EX;
-        }
-    }
-
-    public static String getGalleryDetailUrl(long gid, String token, int index, boolean allComment) {
-        UrlBuilder builder = new UrlBuilder(getHost() + "g/" + gid + '/' + token + '/');
-        if (index != 0) {
-            builder.addQuery("p", index);
-        }
-        if (allComment) {
-            builder.addQuery("hc", 1);
-        }
-        return builder.build();
-    }
-
-    public static String getGalleryMultiPageViewerUrl(long gid, String token) {
-        UrlBuilder builder = new UrlBuilder(getHost() + "mpv/" + gid + '/' + token + '/');
-        return builder.build();
-    }
-
-    public static String getPageUrl(long gid, int index, String pToken) {
-        return getHost() + "s/" + pToken + '/' + gid + '-' + (index + 1);
-    }
-
-    public static String getAddFavorites(long gid, String token) {
-        return getHost() + "gallerypopups.php?gid=" + gid + "&t=" + token + "&act=addfav";
-    }
-
-    public static String getDownloadArchive(long gid, String token, String or) {
-        return getHost() + "archiver.php?gid=" + gid + "&token=" + token + "&or=" + or;
-    }
-
-    public static String getTagDefinitionUrl(String tag) {
-        return "https://ehwiki.org/wiki/" + tag.replace(' ', '_');
-    }
-
-    @NonNull
-    public static String getPopularUrl() {
-        switch (Settings.getGallerySite()) {
-            default:
-            case SITE_E:
-                return URL_POPULAR_E;
-            case SITE_EX:
-                return URL_POPULAR_EX;
-        }
-    }
-
-    @NonNull
-    public static String getImageSearchUrl() {
-        switch (Settings.getGallerySite()) {
-            default:
-            case SITE_E:
-                return URL_IMAGE_SEARCH_E;
-            case SITE_EX:
-                return URL_IMAGE_SEARCH_EX;
-        }
-    }
-
-    @NonNull
-    public static String getWatchedUrl() {
-        switch (Settings.getGallerySite()) {
-            default:
-            case SITE_E:
-                return URL_WATCHED_E;
-            case SITE_EX:
-                return URL_WATCHED_EX;
-        }
-    }
-}

app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt

@@ -0,0 +1,174 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * 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 com.hippo.ehviewer.client
+
+import com.hippo.ehviewer.Settings
+import com.hippo.network.UrlBuilder
+
+object EhUrl {
+    const val SITE_E = 0
+    const val SITE_EX = 1
+    const val DOMAIN_EX = "exhentai.org"
+    const val DOMAIN_E = "e-hentai.org"
+    const val DOMAIN_LOFI = "lofi.e-hentai.org"
+    const val HOST_EX = "https://$DOMAIN_EX/"
+    const val API_EX = HOST_EX + "api.php"
+    const val URL_FAVORITES_EX = HOST_EX + "favorites.php"
+    const val URL_UCONFIG_EX = HOST_EX + "uconfig.php"
+    const val URL_MY_TAGS_EX = HOST_EX + "mytags"
+    const val URL_WATCHED_EX = HOST_EX + "watched"
+    const val HOST_E = "https://$DOMAIN_E/"
+    const val API_E = HOST_E + "api.php"
+    const val URL_FAVORITES_E = HOST_E + "favorites.php"
+    const val URL_UCONFIG_E = HOST_E + "uconfig.php"
+    const val URL_MY_TAGS_E = HOST_E + "mytags"
+    const val URL_WATCHED_E = HOST_E + "watched"
+    const val API_SIGN_IN = "https://forums.e-hentai.org/index.php?act=Login&CODE=01"
+    const val URL_POPULAR_E = "https://e-hentai.org/popular"
+    const val URL_POPULAR_EX = "https://exhentai.org/popular"
+    const val URL_IMAGE_SEARCH_E = "https://upload.e-hentai.org/image_lookup.php"
+    const val URL_IMAGE_SEARCH_EX = "https://exhentai.org/upload/image_lookup.php"
+    const val URL_SIGN_IN = "https://forums.e-hentai.org/index.php?act=Login"
+    const val URL_REGISTER = "https://forums.e-hentai.org/index.php?act=Reg&CODE=00"
+    const val URL_FORUMS = "https://forums.e-hentai.org/"
+    const val URL_FUNDS = "https://e-hentai.org/exchange.php?t=gp"
+    const val REFERER_EX = "https://$DOMAIN_EX"
+    const val ORIGIN_EX = REFERER_EX
+    const val REFERER_E = "https://$DOMAIN_E"
+    const val ORIGIN_E = REFERER_E
+    const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
+    const val URL_PREFIX_THUMB_EX = "https://exhentai.org/t/"
+
+    val host: String
+        get() = when (Settings.getGallerySite()) {
+            SITE_E -> HOST_E
+            SITE_EX -> HOST_EX
+            else -> HOST_E
+        }
+
+    val favoritesUrl: String
+        get() = when (Settings.getGallerySite()) {
+            SITE_E -> URL_FAVORITES_E
+            SITE_EX -> URL_FAVORITES_EX
+            else -> URL_FAVORITES_E
+        }
+
+    val apiUrl: String
+        get() = when (Settings.getGallerySite()) {
+            SITE_E -> API_E
+            SITE_EX -> API_EX
+            else -> API_E
+        }
+
+    @JvmStatic
+    val referer: String
+        get() = when (Settings.getGallerySite()) {
+            SITE_E -> REFERER_E
+            SITE_EX -> REFERER_EX
+            else -> REFERER_E
+        }
+
+    val origin: String
+        get() = when (Settings.getGallerySite()) {
+            SITE_E -> ORIGIN_E
+            SITE_EX -> ORIGIN_EX
+            else -> ORIGIN_E
+        }
+
+    @JvmStatic
+    val uConfigUrl: String
+        get() = when (Settings.getGallerySite()) {
+            SITE_E -> URL_UCONFIG_E
+            SITE_EX -> URL_UCONFIG_EX
+            else -> URL_UCONFIG_E
+        }
+
+    @JvmStatic
+    val myTagsUrl: String
+        get() = when (Settings.getGallerySite()) {
+            SITE_E -> URL_MY_TAGS_E
+            SITE_EX -> URL_MY_TAGS_EX
+            else -> URL_MY_TAGS_E
+        }
+
+    val popularUrl: String
+        get() = when (Settings.getGallerySite()) {
+            SITE_E -> URL_POPULAR_E
+            SITE_EX -> URL_POPULAR_EX
+            else -> URL_POPULAR_E
+        }
+
+    val imageSearchUrl: String
+        get() = when (Settings.getGallerySite()) {
+            SITE_E -> URL_IMAGE_SEARCH_E
+            SITE_EX -> URL_IMAGE_SEARCH_EX
+            else -> URL_IMAGE_SEARCH_E
+        }
+
+    val watchedUrl: String
+        get() = when (Settings.getGallerySite()) {
+            SITE_E -> URL_WATCHED_E
+            SITE_EX -> URL_WATCHED_EX
+            else -> URL_WATCHED_E
+        }
+
+    fun getGalleryDetailUrl(gid: Long, token: String?): String {
+        return getGalleryDetailUrl(gid, token, 0, false)
+    }
+
+    @JvmStatic
+    fun getGalleryDetailUrl(gid: Long, token: String?, index: Int, allComment: Boolean): String {
+        val builder = UrlBuilder(host + "g/" + gid + '/' + token + '/')
+        if (index != 0) {
+            builder.addQuery("p", index)
+        }
+        if (allComment) {
+            builder.addQuery("hc", 1)
+        }
+        return builder.build()
+    }
+
+    @JvmStatic
+    fun getGalleryMultiPageViewerUrl(gid: Long, token: String): String {
+        val builder = UrlBuilder(host + "mpv/" + gid + '/' + token + '/')
+        return builder.build()
+    }
+
+    @JvmStatic
+    fun getPageUrl(gid: Long, index: Int, pToken: String): String {
+        return host + "s/" + pToken + '/' + gid + '-' + (index + 1)
+    }
+
+    fun getAddFavorites(gid: Long, token: String?): String {
+        return host + "gallerypopups.php?gid=" + gid + "&t=" + token + "&act=addfav"
+    }
+
+    fun getDownloadArchive(gid: Long, token: String?, or: String): String {
+        return host + "archiver.php?gid=" + gid + "&token=" + token + "&or=" + or
+    }
+
+    fun getTagDefinitionUrl(tag: String): String {
+        return "https://ehwiki.org/wiki/" + tag.replace(' ', '_')
+    }
+
+    fun getThumbUrlPrefix(): String {
+        return when (Settings.getGallerySite()) {
+            SITE_E -> URL_PREFIX_THUMB_E
+            SITE_EX -> URL_PREFIX_THUMB_EX
+            else -> URL_PREFIX_THUMB_E
+        }
+    }
+}

app/src/main/java/com/hippo/ehviewer/client/EhUtils.java

@@ -1,189 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.client;
-
-import android.graphics.Color;
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.hippo.ehviewer.EhApplication;
-import com.hippo.ehviewer.Settings;
-import com.hippo.ehviewer.client.data.GalleryInfo;
-
-import java.util.regex.Pattern;
-
-public class EhUtils {
-
-    public static final int NONE = -1; // Use it for homepage
-    public static final int PRIVATE = 0x400;
-    public static final int UNKNOWN = 0x800;
-
-    public static final int BG_COLOR_DOUJINSHI = 0xfff44336;
-    public static final int BG_COLOR_MANGA = 0xffff9800;
-    public static final int BG_COLOR_ARTIST_CG = 0xfffbc02d;
-    public static final int BG_COLOR_GAME_CG = 0xff4caf50;
-    public static final int BG_COLOR_WESTERN = 0xff8bc34a;
-    public static final int BG_COLOR_NON_H = 0xff2196f3;
-    public static final int BG_COLOR_IMAGE_SET = 0xff3f51b5;
-    public static final int BG_COLOR_COSPLAY = 0xff9c27b0;
-    public static final int BG_COLOR_ASIAN_PORN = 0xff9575cd;
-    public static final int BG_COLOR_MISC = 0xfff06292;
-    public static final int BG_COLOR_UNKNOWN = Color.BLACK;
-
-    // Remove [XXX], (XXX), {XXX}, ~XXX~ stuff
-    public static final Pattern PATTERN_TITLE_PREFIX = Pattern.compile(
-            "^(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*");
-    // Remove [XXX], (XXX), {XXX}, ~XXX~ stuff and something like ch. 1-23
-    public static final Pattern PATTERN_TITLE_SUFFIX = Pattern.compile(
-            "(?:\\s+ch.[\\s\\d-]+)?(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*$",
-            Pattern.CASE_INSENSITIVE);
-
-    private static final int[] CATEGORY_VALUES = {
-            EhConfig.MISC,
-            EhConfig.DOUJINSHI,
-            EhConfig.MANGA,
-            EhConfig.ARTIST_CG,
-            EhConfig.GAME_CG,
-            EhConfig.IMAGE_SET,
-            EhConfig.COSPLAY,
-            EhConfig.ASIAN_PORN,
-            EhConfig.NON_H,
-            EhConfig.WESTERN,
-            PRIVATE,
-            UNKNOWN};
-
-    private static final String[][] CATEGORY_STRINGS = {
-            new String[]{"misc"},
-            new String[]{"doujinshi"},
-            new String[]{"manga"},
-            new String[]{"artistcg", "Artist CG Sets", "Artist CG"},
-            new String[]{"gamecg", "Game CG Sets", "Game CG"},
-            new String[]{"imageset", "Image Sets", "Image Set"},
-            new String[]{"cosplay"},
-            new String[]{"asianporn", "Asian Porn"},
-            new String[]{"non-h"},
-            new String[]{"western"},
-            new String[]{"private"},
-            new String[]{"unknown"}
-    };
-
-    public static int getCategory(String type) {
-        int i;
-        for (i = 0; i < CATEGORY_STRINGS.length - 1; i++) {
-            for (String str : CATEGORY_STRINGS[i])
-                if (str.equalsIgnoreCase(type))
-                    return CATEGORY_VALUES[i];
-        }
-
-        return CATEGORY_VALUES[i];
-    }
-
-    @NonNull
-    public static String getCategory(int type) {
-        int i;
-        for (i = 0; i < CATEGORY_VALUES.length - 1; i++) {
-            if (CATEGORY_VALUES[i] == type)
-                break;
-        }
-        return CATEGORY_STRINGS[i][0];
-    }
-
-    public static int getCategoryColor(int category) {
-        return switch (category) {
-            case EhConfig.DOUJINSHI -> BG_COLOR_DOUJINSHI;
-            case EhConfig.MANGA -> BG_COLOR_MANGA;
-            case EhConfig.ARTIST_CG -> BG_COLOR_ARTIST_CG;
-            case EhConfig.GAME_CG -> BG_COLOR_GAME_CG;
-            case EhConfig.WESTERN -> BG_COLOR_WESTERN;
-            case EhConfig.NON_H -> BG_COLOR_NON_H;
-            case EhConfig.IMAGE_SET -> BG_COLOR_IMAGE_SET;
-            case EhConfig.COSPLAY -> BG_COLOR_COSPLAY;
-            case EhConfig.ASIAN_PORN -> BG_COLOR_ASIAN_PORN;
-            case EhConfig.MISC -> BG_COLOR_MISC;
-            default -> BG_COLOR_UNKNOWN;
-        };
-    }
-
-    public static void signOut() {
-        EhApplication.getEhCookieStore().signOut();
-        Settings.putAvatar(null);
-        Settings.putDisplayName(null);
-        Settings.putNeedSignIn(true);
-    }
-
-    public static boolean needSignedIn() {
-        return Settings.getNeedSignIn() && !EhApplication.getEhCookieStore().hasSignedIn();
-    }
-
-    public static String getSuitableTitle(GalleryInfo gi) {
-        if (Settings.getShowJpnTitle()) {
-            return TextUtils.isEmpty(gi.getTitleJpn()) ? gi.getTitle() : gi.getTitleJpn();
-        } else {
-            return TextUtils.isEmpty(gi.getTitle()) ? gi.getTitleJpn() : gi.getTitle();
-        }
-    }
-
-    @Nullable
-    public static String extractTitle(String title) {
-        if (null == title) {
-            return null;
-        }
-        title = PATTERN_TITLE_PREFIX.matcher(title).replaceFirst("");
-        title = PATTERN_TITLE_SUFFIX.matcher(title).replaceFirst("");
-        // Sometimes title is combined by romaji and english translation.
-        // Only need romaji.
-        // TODO But not sure every '|' means that
-        int index = title.indexOf('|');
-        if (index >= 0) {
-            title = title.substring(0, index);
-        }
-        if (title.isEmpty()) {
-            return null;
-        } else {
-            return title;
-        }
-    }
-
-    public static String handleThumbUrlResolution(String url) {
-        if (null == url) {
-            return null;
-        }
-
-        String resolution;
-        switch (Settings.getThumbResolution()) {
-            default:
-            case 0: // Auto
-                return url;
-            case 1: // 250
-                resolution = "250";
-                break;
-            case 2: // 300
-                resolution = "300";
-                break;
-        }
-
-        int index1 = url.lastIndexOf('_');
-        int index2 = url.lastIndexOf('.');
-        if (index1 >= 0 && index2 >= 0 && index1 < index2) {
-            return url.substring(0, index1 + 1) + resolution + url.substring(index2);
-        } else {
-            return url;
-        }
-    }
-}

app/src/main/java/com/hippo/ehviewer/client/EhUtils.kt

@@ -0,0 +1,158 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * 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 com.hippo.ehviewer.client
+
+import android.text.TextUtils
+import com.hippo.ehviewer.EhApplication.Companion.ehCookieStore
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.client.data.GalleryInfo
+import java.util.regex.Pattern
+
+object EhUtils {
+    const val NONE = -1 // Use it for homepage
+    const val PRIVATE = 0x400
+    const val UNKNOWN = 0x800
+
+    // https://youtrack.jetbrains.com/issue/KT-4749
+    private const val BG_COLOR_DOUJINSHI = 0xfff44336u
+    private const val BG_COLOR_MANGA = 0xffff9800u
+    private const val BG_COLOR_ARTIST_CG = 0xfffbc02du
+    private const val BG_COLOR_GAME_CG = 0xff4caf50u
+    private const val BG_COLOR_WESTERN = 0xff8bc34au
+    private const val BG_COLOR_NON_H = 0xff2196f3u
+    private const val BG_COLOR_IMAGE_SET = 0xff3f51b5u
+    private const val BG_COLOR_COSPLAY = 0xff9c27b0u
+    private const val BG_COLOR_ASIAN_PORN = 0xff9575cdu
+    private const val BG_COLOR_MISC = 0xfff06292u
+    private const val BG_COLOR_UNKNOWN = 0xff000000u
+
+    // Remove [XXX], (XXX), {XXX}, ~XXX~ stuff
+    private val PATTERN_TITLE_PREFIX = Pattern.compile(
+        "^(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*"
+    )
+
+    // Remove [XXX], (XXX), {XXX}, ~XXX~ stuff and something like ch. 1-23
+    private val PATTERN_TITLE_SUFFIX = Pattern.compile(
+        "(?:\\s+ch.[\\s\\d-]+)?(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*$",
+        Pattern.CASE_INSENSITIVE
+    )
+
+    private val CATEGORY_VALUES = hashMapOf(
+        EhConfig.MISC to arrayOf("misc"),
+        EhConfig.DOUJINSHI to arrayOf("doujinshi"),
+        EhConfig.MANGA to arrayOf("manga"),
+        EhConfig.ARTIST_CG to arrayOf("artistcg", "Artist CG Sets", "Artist CG"),
+        EhConfig.GAME_CG to arrayOf("gamecg", "Game CG Sets", "Game CG"),
+        EhConfig.IMAGE_SET to arrayOf("imageset", "Image Sets", "Image Set"),
+        EhConfig.COSPLAY to arrayOf("cosplay"),
+        EhConfig.ASIAN_PORN to arrayOf("asianporn", "Asian Porn"),
+        EhConfig.NON_H to arrayOf("non-h"),
+        EhConfig.WESTERN to arrayOf("western"),
+        PRIVATE to arrayOf("private"),
+        UNKNOWN to arrayOf("unknown")
+    )
+    private val CATEGORY_STRINGS = CATEGORY_VALUES.entries.map { (k, v) -> v to k }
+
+    @JvmStatic
+    fun getCategory(type: String?): Int {
+        for (entry in CATEGORY_STRINGS) {
+            for (str in entry.first)
+                if (str.equals(type, ignoreCase = true))
+                    return entry.second
+        }
+        return UNKNOWN
+    }
+
+    fun getCategory(type: Int): String {
+        return CATEGORY_VALUES.getOrDefault(type, CATEGORY_VALUES[UNKNOWN])!![0]
+    }
+
+    fun getCategoryColor(category: Int): Int {
+        return when (category) {
+            EhConfig.DOUJINSHI -> BG_COLOR_DOUJINSHI
+            EhConfig.MANGA -> BG_COLOR_MANGA
+            EhConfig.ARTIST_CG -> BG_COLOR_ARTIST_CG
+            EhConfig.GAME_CG -> BG_COLOR_GAME_CG
+            EhConfig.WESTERN -> BG_COLOR_WESTERN
+            EhConfig.NON_H -> BG_COLOR_NON_H
+            EhConfig.IMAGE_SET -> BG_COLOR_IMAGE_SET
+            EhConfig.COSPLAY -> BG_COLOR_COSPLAY
+            EhConfig.ASIAN_PORN -> BG_COLOR_ASIAN_PORN
+            EhConfig.MISC -> BG_COLOR_MISC
+            else -> BG_COLOR_UNKNOWN
+        }.toInt()
+    }
+
+    fun signOut() {
+        ehCookieStore.signOut()
+        Settings.putAvatar(null)
+        Settings.putDisplayName(null)
+        Settings.putGallerySite(EhUrl.SITE_E)
+        Settings.putNeedSignIn(true)
+    }
+
+    fun needSignedIn(): Boolean {
+        return Settings.getNeedSignIn() && !ehCookieStore.hasSignedIn()
+    }
+
+    @JvmStatic
+    fun getSuitableTitle(gi: GalleryInfo): String? {
+        return if (Settings.getShowJpnTitle()) {
+            if (TextUtils.isEmpty(gi.titleJpn)) gi.title else gi.titleJpn
+        } else {
+            if (TextUtils.isEmpty(gi.title)) gi.titleJpn else gi.title
+        }
+    }
+
+    fun extractTitle(fullTitle: String?): String? {
+        var title: String = fullTitle ?: return null
+        title = PATTERN_TITLE_PREFIX.matcher(title).replaceFirst("")
+        title = PATTERN_TITLE_SUFFIX.matcher(title).replaceFirst("")
+        // Sometimes title is combined by romaji and english translation.
+        // Only need romaji.
+        // TODO But not sure every '|' means that
+        val index = title.indexOf('|')
+        if (index >= 0) {
+            title = title.substring(0, index)
+        }
+        return title.ifEmpty { null }
+    }
+
+    fun fixThumbUrl(url: String): String {
+        return EhUrl.getThumbUrlPrefix() +
+                url.removePrefix(EhUrl.URL_PREFIX_THUMB_E).removePrefix(EhUrl.URL_PREFIX_THUMB_EX)
+    }
+
+    @JvmStatic
+    fun handleThumbUrlResolution(url: String?): String? {
+        if (null == url) {
+            return null
+        }
+        val resolution = when (Settings.getThumbResolution()) {
+            0 -> return url
+            1 -> "250"
+            2 -> "300"
+            else -> return url
+        }
+        val index1 = url.lastIndexOf('_')
+        val index2 = url.lastIndexOf('.')
+        return if (index1 >= 0 && index2 >= 0 && index1 < index2) {
+            url.substring(0, index1 + 1) + resolution + url.substring(index2)
+        } else {
+            url
+        }
+    }
+}

app/src/main/java/com/hippo/ehviewer/client/data/FavListUrlBuilder.kt

@@ -35,7 +35,7 @@ class FavListUrlBuilder(
     }
 
     fun build(): String {
-        val ub = UrlBuilder(EhUrl.getFavoritesUrl())
+        val ub = UrlBuilder(EhUrl.favoritesUrl)
         if (isValidFavCat(favCat)) {
             ub.addQuery("favcat", favCat.toString())
         } else if (favCat == FAV_CAT_ALL) {

app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt

@@ -275,9 +275,9 @@ data class ListUrlBuilder(
         return when (mode) {
             MODE_NORMAL, MODE_SUBSCRIPTION -> {
                 val url: String = if (mode == MODE_NORMAL) {
-                    EhUrl.getHost()
+                    EhUrl.host
                 } else {
-                    EhUrl.getWatchedUrl()
+                    EhUrl.watchedUrl
                 }
                 val ub = UrlBuilder(url)
                 if (this.category != EhUtils.NONE) {
@@ -326,7 +326,7 @@ data class ListUrlBuilder(
             }
 
             MODE_UPLOADER -> {
-                val sb = StringBuilder(EhUrl.getHost())
+                val sb = StringBuilder(EhUrl.host)
                 mKeyword?.let {
                     sb.append("uploader/")
                     sb.append(encodeUTF8(it))
@@ -344,7 +344,7 @@ data class ListUrlBuilder(
             }
 
             MODE_TAG -> {
-                val sb = StringBuilder(EhUrl.getHost())
+                val sb = StringBuilder(EhUrl.host)
                 mKeyword?.let {
                     sb.append("tag/")
                     sb.append(encodeUTF8(it))
@@ -361,8 +361,8 @@ data class ListUrlBuilder(
                 sb.toString()
             }
 
-            MODE_WHATS_HOT -> EhUrl.getPopularUrl()
-            MODE_IMAGE_SEARCH -> EhUrl.getImageSearchUrl()
+            MODE_WHATS_HOT -> EhUrl.popularUrl
+            MODE_IMAGE_SEARCH -> EhUrl.imageSearchUrl
             MODE_TOPLIST -> {
                 val sb = StringBuilder(EhUrl.HOST_E)
                 sb.append("toplist.php?tl=")

app/src/main/java/com/hippo/ehviewer/client/parser/ArchiveParser.java

@@ -1,208 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.client.parser;
-
-import androidx.annotation.NonNull;
-
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.client.exception.NoHAtHClientException;
-
-import org.jsoup.Jsoup;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.IntFunction;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class ArchiveParser {
-
-    private static final Pattern PATTERN_ARCHIVE_URL = Pattern.compile("<strong>(.*)</strong>.*<a href=\"([^\"]*)\">Click Here To Start Downloading</a>");
-    private static final Pattern PATTERN_HATH_FORM = Pattern.compile("<form id=\"hathdl_form\" action=\"[^\"]*?or=([^=\"]*?)\" method=\"post\">");
-    private static final Pattern PATTERN_HATH_ARCHIVE = Pattern.compile("<p><a href=\"[^\"]*\" onclick=\"return do_hathdl\\('([0-9]+|org)'\\)\">([^<]+)</a></p>\\s*<p>([\\w. ]+)</p>\\s*<p>([\\w. ]+)</p>");
-    private static final Pattern PATTERN_NEED_HATH_CLIENT = Pattern.compile("You must have a H@H client assigned to your account to use this feature\\.");
-
-    public static Result parse(String body) {
-        Matcher m = PATTERN_HATH_FORM.matcher(body);
-        if (!m.find()) {
-            return new Result(null, null);
-        }
-        String paramOr = m.group(1);
-
-        var archiveList = new ArrayList<Archive>();
-        var d = Jsoup.parse(body);
-        var es = d.select("#db>div>div");
-        for (var e : es) {
-            try {
-                var res = e.selectFirst("form>input").attr("value");
-                var name = e.selectFirst("form>div>input").attr("value");
-                var size = e.selectFirst("p>strong").text();
-                var cost = e.selectFirst("div>strong").text();
-                var item = new Archive(res, name, size, cost, false);
-                archiveList.add(item);
-            } catch (NullPointerException ex) {
-                ex.printStackTrace();
-            }
-        }
-
-        m = PATTERN_HATH_ARCHIVE.matcher(body);
-        while (m.find()) {
-            String res = ParserUtils.trim(m.group(1));
-            String name = ParserUtils.trim(m.group(2));
-            String size = ParserUtils.trim(m.group(3));
-            String cost = ParserUtils.trim(m.group(4));
-            var item = new Archive(res, name, size, cost, true);
-            archiveList.add(item);
-        }
-
-        return new Result(paramOr, archiveList);
-    }
-
-    public static String parseArchiveUrl(String body) throws NoHAtHClientException {
-        Matcher m = PATTERN_NEED_HATH_CLIENT.matcher(body);
-        if (m.find()) {
-            throw new NoHAtHClientException("No H@H client");
-        }
-
-        var d = Jsoup.parse(body);
-        var a = d.selectFirst("#continue>a[href]");
-        if (a != null) {
-            return a.attr("href") + "?start=1";
-        }
-
-        // TODO: Check more errors
-        return null;
-    }
-
-    public static final class Archive {
-        private final String res;
-        private final String name;
-        private final String size;
-        private final String cost;
-        private final boolean isHAtH;
-
-        public Archive(String res, String name, String size, String cost, boolean isHAtH) {
-            this.res = res;
-            this.name = name;
-            this.size = size;
-            this.cost = cost;
-            this.isHAtH = isHAtH;
-        }
-
-        public String format(IntFunction<String> getString) {
-            if (isHAtH) {
-                var costStr = cost.equals("Free") ? getString.apply(R.string.archive_free) : cost;
-                return String.format("[H@H] %s [%s] [%s]", name, size, costStr);
-            } else {
-                var nameStr = getString.apply(res.equals("org") ? R.string.archive_original : R.string.archive_resample);
-                var costStr = cost.equals("Free!") ? getString.apply(R.string.archive_free) : cost;
-                return String.format("%s [%s] [%s]", nameStr, size, costStr);
-            }
-        }
-
-        public String res() {
-            return res;
-        }
-
-        public String name() {
-            return name;
-        }
-
-        public String size() {
-            return size;
-        }
-
-        public String cost() {
-            return cost;
-        }
-
-        public boolean isHAtH() {
-            return isHAtH;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == this) return true;
-            if (obj == null || obj.getClass() != this.getClass()) return false;
-            var that = (Archive) obj;
-            return Objects.equals(this.res, that.res) &&
-                    Objects.equals(this.name, that.name) &&
-                    Objects.equals(this.size, that.size) &&
-                    Objects.equals(this.cost, that.cost) &&
-                    this.isHAtH == that.isHAtH;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(res, name, size, cost, isHAtH);
-        }
-
-        @NonNull
-        @Override
-        public String toString() {
-            return "Archive[" +
-                    "res=" + res + ", " +
-                    "name=" + name + ", " +
-                    "size=" + size + ", " +
-                    "cost=" + cost + ", " +
-                    "isHAtH=" + isHAtH + ']';
-        }
-
-    }
-
-    public static final class Result {
-        private final String paramOr;
-        private final List<Archive> archiveList;
-
-        public Result(String paramOr, List<Archive> archiveList) {
-            this.paramOr = paramOr;
-            this.archiveList = archiveList;
-        }
-
-        public String paramOr() {
-            return paramOr;
-        }
-
-        public List<Archive> archiveList() {
-            return archiveList;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == this) return true;
-            if (obj == null || obj.getClass() != this.getClass()) return false;
-            var that = (Result) obj;
-            return Objects.equals(this.paramOr, that.paramOr) &&
-                    Objects.equals(this.archiveList, that.archiveList);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(paramOr, archiveList);
-        }
-
-        @NonNull
-        @Override
-        public String toString() {
-            return "Result[" +
-                    "paramOr=" + paramOr + ", " +
-                    "archiveList=" + archiveList + ']';
-        }
-
-    }
-}

app/src/main/java/com/hippo/ehviewer/client/parser/ArchiveParser.kt

@@ -0,0 +1,127 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * 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 com.hippo.ehviewer.client.parser
+
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.client.exception.NoHAtHClientException
+import org.jsoup.Jsoup
+import java.util.function.IntFunction
+import java.util.regex.Pattern
+
+object ArchiveParser {
+    private val PATTERN_ARCHIVE_URL =
+        Pattern.compile("<strong>(.*)</strong>.*<a href=\"([^\"]*)\">Click Here To Start Downloading</a>")
+    private val PATTERN_CURRENT_FUNDS =
+        Pattern.compile("<p>([\\d,]+) GP \\[[^]]*] &nbsp; ([\\d,]+) Credits \\[[^]]*]</p>")
+    private val PATTERN_FUNDS =
+        Pattern.compile("Available: ([\\d,]+) Credits.*Available: ([\\d,]+) kGP", Pattern.DOTALL)
+    private val PATTERN_HATH_FORM =
+        Pattern.compile("<form id=\"hathdl_form\" action=\"[^\"]*?or=([^=\"]*?)\" method=\"post\">")
+    private val PATTERN_HATH_ARCHIVE =
+        Pattern.compile("<p><a href=\"[^\"]*\" onclick=\"return do_hathdl\\('([0-9]+|org)'\\)\">([^<]+)</a></p>\\s*<p>([\\w. ]+)</p>\\s*<p>([\\w. ]+)</p>")
+    private val PATTERN_NEED_HATH_CLIENT =
+        Pattern.compile("You must have a H@H client assigned to your account to use this feature\\.")
+
+    fun parse(body: String): Result? {
+        var m = PATTERN_HATH_FORM.matcher(body)
+        if (!m.find()) {
+            return null
+        }
+        val paramOr = m.group(1)
+        val archiveList = ArrayList<Archive>()
+        val d = Jsoup.parse(body)
+        val es = d.select("#db>div>div")
+        for (e in es) {
+            if (e.childrenSize() > 0 && !e.attr("style").contains("color:#CCCCCC")) {
+                try {
+                    val res = e.selectFirst("form>input")!!.attr("value")
+                    val name = e.selectFirst("form>div>input")!!.attr("value")
+                    val size = e.selectFirst("p>strong")!!.text()
+                    val cost = e.selectFirst("div>strong")!!.text().replace(",", "")
+                    val item = Archive(res, name, size, cost, false)
+                    archiveList.add(item)
+                } catch (ex: NullPointerException) {
+                    ex.printStackTrace()
+                }
+            }
+        }
+        m = PATTERN_HATH_ARCHIVE.matcher(body)
+        while (m.find()) {
+            val res = ParserUtils.trim(m.group(1))
+            val name = ParserUtils.trim(m.group(2))
+            val size = ParserUtils.trim(m.group(3))
+            val cost = ParserUtils.trim(m.group(4))
+            val item = Archive(res, name, size, cost, true)
+            archiveList.add(item)
+        }
+        var funds: Funds? = null
+        m = PATTERN_CURRENT_FUNDS.matcher(body)
+        if (m.find()) {
+            val fundsGP = ParserUtils.parseInt(m.group(1), 0)
+            val fundsC = ParserUtils.parseInt(m.group(2), 0)
+            funds = Funds(fundsGP, fundsC)
+        }
+        return Result(paramOr, archiveList, funds)
+    }
+
+    @Throws(NoHAtHClientException::class)
+    fun parseArchiveUrl(body: String): String? {
+        val m = PATTERN_NEED_HATH_CLIENT.matcher(body)
+        if (m.find()) {
+            throw NoHAtHClientException("No H@H client")
+        }
+        val d = Jsoup.parse(body)
+        val a = d.selectFirst("#continue>a[href]")
+        return if (a != null) {
+            a.attr("href") + "?start=1"
+        } else null
+
+        // TODO: Check more errors
+    }
+
+    fun parseFunds(body: String): Funds? {
+        val m = PATTERN_FUNDS.matcher(body)
+        return if (m.find()) {
+            val fundsC = ParserUtils.parseInt(m.group(1), 0)
+            val fundsGP = ParserUtils.parseInt(m.group(2), 0) * 1000
+            return Funds(fundsGP, fundsC)
+        } else null
+    }
+
+    class Archive(
+        val res: String,
+        val name: String,
+        val size: String,
+        val cost: String,
+        val isHAtH: Boolean
+    ) {
+        fun format(getString: IntFunction<String?>): String {
+            return if (isHAtH) {
+                val costStr = if (cost == "Free") getString.apply(R.string.archive_free) else cost
+                "[H@H] $name [$size] [$costStr]"
+            } else {
+                val nameStr =
+                    getString.apply(if (res == "org") R.string.archive_original else R.string.archive_resample)
+                val costStr = if (cost == "Free!") getString.apply(R.string.archive_free) else cost
+                "$nameStr [$size] [$costStr]"
+            }
+        }
+    }
+
+    class Funds(var fundsGP: Int, var fundsC: Int)
+
+    class Result(val paramOr: String?, val archiveList: List<Archive>, var funds: Funds?)
+}

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java

@@ -477,7 +477,7 @@ public class GalleryDetailParser {
             comment.comment = JsoupUtils.getElementByClass(element, "c6").html();
             // filter comment
             if (!comment.uploader) {
-                EhFilter sEhFilter = EhFilter.getInstance();
+                EhFilter sEhFilter = EhFilter.INSTANCE;
                 if (!sEhFilter.filterCommenter(comment.user) || !sEhFilter.filterComment(comment.comment)) {
                     return null;
                 }

app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java

@@ -158,6 +158,11 @@ public class DownloadManager implements SpiderQueen.OnSpiderListener {
         return mLabelList;
     }
 
+    @NonNull
+    public List<DownloadInfo> getAllDownloadInfoList() {
+        return mAllInfoList;
+    }
+
     @NonNull
     public List<DownloadInfo> getDefaultDownloadInfoList() {
         return mDefaultInfoList;

app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.java

@@ -17,7 +17,6 @@
 package com.hippo.ehviewer.gallery;
 
 import android.content.Context;
-import android.graphics.ImageDecoder;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Process;
@@ -38,7 +37,6 @@ import com.hippo.yorozuya.thread.PriorityThread;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -56,7 +54,7 @@ public class ArchivePageLoader extends PageLoader2 {
     public static PVLock pv = new PVLock(0);
     private final UriArchiveAccessor archiveAccessor;
     private final Stack<Integer> requests = new Stack<>();
-    private final LinkedHashMap<Integer, ByteBuffer> streams = new LinkedHashMap<>();
+    private final LinkedHashMap<Integer, Image.ByteBufferSource> streams = new LinkedHashMap<>();
     private final Thread[] decodeThread = new Thread[]{
             new Thread(new DecodeTask()),
             new Thread(new DecodeTask()),
@@ -305,10 +303,10 @@ public class ArchivePageLoader extends PageLoader2 {
                     }
                 }
 
-                ByteBuffer buffer = archiveAccessor.extractToByteBuffer(index);
+                Image.ByteBufferSource src = archiveAccessor.getImageSource(index);
 
                 synchronized (streams) {
-                    streams.put(index, buffer);
+                    streams.put(index, src);
                     streams.notify();
                 }
             }
@@ -320,7 +318,7 @@ public class ArchivePageLoader extends PageLoader2 {
         public void run() {
             while (!Thread.currentThread().isInterrupted()) {
                 int index;
-                ByteBuffer buffer;
+                Image.ByteBufferSource src;
                 synchronized (streams) {
                     if (streams.isEmpty()) {
                         try {
@@ -331,21 +329,16 @@ public class ArchivePageLoader extends PageLoader2 {
                         continue;
                     }
 
-                    Iterator<Map.Entry<Integer, ByteBuffer>> iterator = streams.entrySet().iterator();
-                    Map.Entry<Integer, ByteBuffer> entry = iterator.next();
+                    Iterator<Map.Entry<Integer, Image.ByteBufferSource>> iterator = streams.entrySet().iterator();
+                    Map.Entry<Integer, Image.ByteBufferSource> entry = iterator.next();
                     iterator.remove();
                     index = entry.getKey();
-                    buffer = entry.getValue();
+                    src = entry.getValue();
                 }
 
                 Image image = null;
-                if (buffer != null) {
-                    try {
-                        image = Image.decode(buffer.asReadOnlyBuffer());
-                    } catch (ImageDecoder.DecodeException e) {
-                        UriArchiveAccessor.releaseByteBuffer(buffer);
-                        e.printStackTrace();
-                    }
+                if (src != null) {
+                    image = Image.decode(src);
                 }
                 if (image != null) {
                     notifyPageSucceed(index, image);

app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.kt

@@ -97,7 +97,7 @@ class RestoreDownloadPreference constructor(
                 runBlocking {
                     fillGalleryListByApi(
                         ArrayList(restoreItemList),
-                        EhUrl.getReferer()
+                        EhUrl.referer
                     )
                 }
             } catch (e: Throwable) {

app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.java

@@ -17,22 +17,24 @@
 package com.hippo.ehviewer.spider;
 
 import android.content.Context;
-import android.graphics.BitmapFactory;
-import android.webkit.MimeTypeMap;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.hippo.beerbelly.SimpleDiskCache;
+import com.hippo.Native;
+import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.EhDB;
 import com.hippo.ehviewer.Settings;
 import com.hippo.ehviewer.client.EhCacheKeyFactory;
 import com.hippo.ehviewer.client.EhUtils;
 import com.hippo.ehviewer.client.data.GalleryInfo;
 import com.hippo.ehviewer.gallery.PageLoader2;
+import com.hippo.image.Image;
 import com.hippo.io.UniFileInputStreamPipe;
 import com.hippo.io.UniFileOutputStreamPipe;
 import com.hippo.streampipe.InputStreamPipe;
 import com.hippo.streampipe.OutputStreamPipe;
+import com.hippo.unifile.RawFile;
 import com.hippo.unifile.UniFile;
 import com.hippo.yorozuya.FileUtils;
 import com.hippo.yorozuya.IOUtils;
@@ -40,14 +42,24 @@ import com.hippo.yorozuya.MathUtils;
 import com.hippo.yorozuya.Utilities;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
 import java.util.Locale;
 
+import coil.disk.DiskCache;
+import okio.BufferedSource;
+import okio.Okio;
+
 public final class SpiderDen {
 
     @Nullable
-    private static SimpleDiskCache sCache;
+    private static DiskCache sCache; // We use data to store image file, and metadata for image type
     private final GalleryInfo mGalleryInfo;
     private final long mGid;
     @Nullable
@@ -61,8 +73,8 @@ public final class SpiderDen {
     }
 
     public static void initialize(Context context) {
-        sCache = new SimpleDiskCache(new File(context.getCacheDir(), "image"),
-                MathUtils.clamp(Settings.getReadCacheSize(), 40, 1280) * 1024 * 1024);
+        sCache = new DiskCache.Builder().directory(new File(context.getCacheDir(), "gallery_image"))
+                .maxSizeBytes((long) MathUtils.clamp(Settings.getReadCacheSize(), 40, 1280) * 1024 * 1024).build();
     }
 
     public static UniFile getGalleryDownloadDir(long gid) {
@@ -137,7 +149,10 @@ public final class SpiderDen {
         }
 
         String key = EhCacheKeyFactory.getImageKey(mGid, index);
-        return sCache.contain(key);
+        var snapshot = sCache.get(key);
+        var exist = snapshot != null;
+        if (exist) snapshot.close();
+        return exist;
     }
 
     private boolean containInDownloadDir(int index) {
@@ -171,42 +186,27 @@ public final class SpiderDen {
         }
         // Find image file in cache
         String key = EhCacheKeyFactory.getImageKey(mGid, index);
-        InputStreamPipe pipe = sCache.getInputStreamPipe(key);
-        if (pipe == null) {
+        var snapshot = sCache.get(key);
+        if (snapshot == null) {
             return false;
         }
 
         OutputStream os = null;
-        try {
+        try (snapshot; FileInputStream is = new FileInputStream(snapshot.getData().toFile()); BufferedSource buf = Okio.buffer(Okio.source(snapshot.getMetadata().toFile()))) {
             // Get extension
-            String extension;
-            BitmapFactory.Options options = new BitmapFactory.Options();
-            options.inJustDecodeBounds = true;
-            pipe.obtain();
-            BitmapFactory.decodeStream(pipe.open(), null, options);
-            pipe.close();
-            extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(options.outMimeType);
-            if (extension != null) {
-                extension = '.' + extension;
-            } else {
-                return false;
-            }
-            // Fix extension
-            extension = fixExtension(extension);
+            String extension = fixExtension("." + buf.readUtf8Line());
             // Copy from cache to download dir
             UniFile file = dir.createFile(generateImageFilename(index, extension));
             if (file == null) {
                 return false;
             }
             os = file.openOutputStream();
-            IOUtils.copy(pipe.open(), os);
+            IOUtils.copy(is, os);
             return true;
         } catch (IOException e) {
             return false;
         } finally {
             IOUtils.closeQuietly(os);
-            pipe.close();
-            pipe.release();
         }
     }
 
@@ -253,13 +253,40 @@ public final class SpiderDen {
     }
 
     @Nullable
-    private OutputStreamPipe openCacheOutputStreamPipe(int index) {
+    private OutputStreamPipe openCacheOutputStreamPipe(int index, @Nullable String extension) {
         if (sCache == null) {
             return null;
         }
 
         String key = EhCacheKeyFactory.getImageKey(mGid, index);
-        return sCache.getOutputStreamPipe(key);
+        var editor = sCache.edit(key);
+        if (editor == null) return null;
+        try (var sink = Okio.buffer(Okio.sink(editor.getMetadata().toFile()))) {
+            sink.writeUtf8(extension);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new OutputStreamPipe() {
+            private OutputStream os = null;
+
+            @Override
+            public void release() {
+                editor.commit();
+            }
+
+            @NonNull
+            @Override
+            public OutputStream open() throws IOException {
+                if (os != null) IOUtils.closeQuietly(os);
+                os = new FileOutputStream(editor.getData().toFile());
+                return os;
+            }
+
+            @Override
+            public void close() {
+                if (os != null) IOUtils.closeQuietly(os);
+            }
+        };
     }
 
     /**
@@ -287,7 +314,7 @@ public final class SpiderDen {
             // Return the download pipe is the gallery has been downloaded
             OutputStreamPipe pipe = openDownloadOutputStreamPipe(index, extension);
             if (pipe == null) {
-                pipe = openCacheOutputStreamPipe(index);
+                pipe = openCacheOutputStreamPipe(index, extension);
             }
             return pipe;
         } else if (mMode == SpiderQueen.MODE_DOWNLOAD) {
@@ -304,7 +331,29 @@ public final class SpiderDen {
         }
 
         String key = EhCacheKeyFactory.getImageKey(mGid, index);
-        return sCache.getInputStreamPipe(key);
+        var snapshot = sCache.get(key);
+        if (snapshot == null) return null;
+        return new InputStreamPipe() {
+            private InputStream is = null;
+
+            @Override
+            public void release() {
+                snapshot.close();
+            }
+
+            @NonNull
+            @Override
+            public InputStream open() throws IOException {
+                if (is != null) IOUtils.closeQuietly(is);
+                is = new FileInputStream(snapshot.getData().toFile());
+                return is;
+            }
+
+            @Override
+            public void close() {
+                if (is != null) IOUtils.closeQuietly(is);
+            }
+        };
     }
 
     @Nullable
@@ -341,4 +390,94 @@ public final class SpiderDen {
         }
     }
 
+    @Nullable
+    public Image.ByteBufferSource getImageSource(int index) {
+        if (mMode == SpiderQueen.MODE_READ) {
+            String key = EhCacheKeyFactory.getImageKey(mGid, index);
+            if (sCache != null) {
+                var snapshot = sCache.get(key);
+                if (snapshot != null) {
+                    try {
+                        var file = new RandomAccessFile(snapshot.getData().toFile(), "rw");
+                        var chan = file.getChannel();
+                        var map = chan.map(FileChannel.MapMode.PRIVATE, 0, file.length());
+                        return new Image.ByteBufferSource() {
+                            @NonNull
+                            @Override
+                            public ByteBuffer getByteBuffer() {
+                                return map;
+                            }
+
+                            @Override
+                            public void close() throws Exception {
+                                chan.close();
+                                file.close();
+                                snapshot.close();
+                            }
+                        };
+                    } catch (Throwable e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        UniFile dir = getDownloadDir();
+        if (dir == null) {
+            return null;
+        }
+        UniFile file = findImageFile(dir, index);
+        if (file != null && mMode == SpiderQueen.MODE_DOWNLOAD) {
+            if (copyFromCacheToDownloadDir(index)) {
+                file = findImageFile(dir, index);
+            }
+        }
+        if (file instanceof RawFile rawFile) {
+            try {
+                var file2 = new RandomAccessFile(rawFile.mFile, "rw");
+                var chan = file2.getChannel();
+                var map = chan.map(FileChannel.MapMode.PRIVATE, 0, file2.length());
+                return new Image.ByteBufferSource() {
+                    @NonNull
+                    @Override
+                    public ByteBuffer getByteBuffer() {
+                        return map;
+                    }
+
+                    @Override
+                    public void close() throws Exception {
+                        chan.close();
+                        file2.close();
+                    }
+                };
+            } catch (Throwable e) {
+                e.printStackTrace();
+            }
+        }
+        if (file != null) {
+            try {
+                var pfd = EhApplication.getApplication().getContentResolver().openFileDescriptor(file.getUri(), "rw");
+                var map = Native.mapFd(pfd.getFd(), pfd.getStatSize());
+                if (map != null) {
+                    return new Image.ByteBufferSource() {
+                        @NonNull
+                        @Override
+                        public ByteBuffer getByteBuffer() {
+                            return map;
+                        }
+
+                        @Override
+                        public void close() throws Exception {
+                            Native.unmapDirectByteBuffer(map);
+                            pfd.close();
+                        }
+                    };
+                } else {
+                    pfd.close();
+                }
+            } catch (Throwable e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
 }

app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java

@@ -17,7 +17,6 @@
 package com.hippo.ehviewer.spider;
 
 import android.graphics.BitmapFactory;
-import android.graphics.ImageDecoder;
 import android.os.AsyncTask;
 import android.os.Process;
 import android.text.TextUtils;
@@ -46,7 +45,6 @@ import com.hippo.ehviewer.client.parser.GalleryMultiPageViewerPTokenParser;
 import com.hippo.ehviewer.client.parser.GalleryPageApiParser;
 import com.hippo.ehviewer.client.parser.GalleryPageParser;
 import com.hippo.ehviewer.client.parser.GalleryPageUrlParser;
-import com.hippo.ehviewer.gallery.PageLoader2;
 import com.hippo.image.Image;
 import com.hippo.streampipe.InputStreamPipe;
 import com.hippo.streampipe.OutputStreamPipe;
@@ -57,7 +55,6 @@ import com.hippo.yorozuya.IOUtils;
 import com.hippo.yorozuya.MathUtils;
 import com.hippo.yorozuya.OSUtils;
 import com.hippo.yorozuya.StringUtils;
-import com.hippo.yorozuya.Utilities;
 import com.hippo.yorozuya.collect.SparseJLArray;
 import com.hippo.yorozuya.thread.PriorityThread;
 import com.hippo.yorozuya.thread.PriorityThreadFactory;
@@ -103,7 +100,7 @@ public final class SpiderQueen implements Runnable {
     public static final String SPIDER_INFO_FILENAME = ".ehviewer";
     private static final String TAG = SpiderQueen.class.getSimpleName();
     private static final AtomicInteger sIdGenerator = new AtomicInteger();
-    private static final boolean DEBUG_LOG = false;
+    private static final boolean DEBUG_LOG = true;
     private static final boolean DEBUG_PTOKEN = true;
     private static final String[] URL_509_SUFFIX_ARRAY = {
             "/509.gif",
@@ -156,6 +153,8 @@ public final class SpiderQueen implements Runnable {
     // For download, when it go to mPageStateArray.size(), done
     private volatile int mDownloadPage = -1;
 
+    private boolean mStoped = false;
+
     private SpiderQueen(@NonNull GalleryInfo galleryInfo) {
         mHttpClient = EhApplication.getOkHttpClient();
         mSpiderInfoCache = EhApplication.getSpiderInfoCache();
@@ -388,10 +387,15 @@ public final class SpiderQueen implements Runnable {
     }
 
     private void stop() {
-        Thread queenThread = mQueenThread;
-        if (queenThread != null) {
-            queenThread.interrupt();
-            mQueenThread = null;
+        mStoped = true;
+        synchronized (mQueenLock) {
+            mQueenLock.notifyAll();
+        }
+        synchronized (mDecodeRequestQueue) {
+            mDecodeRequestQueue.notifyAll();
+        }
+        synchronized (mWorkerLock) {
+            mWorkerLock.notifyAll();
         }
     }
 
@@ -579,7 +583,6 @@ public final class SpiderQueen implements Runnable {
         OutputStream os = null;
         try {
             os = file.openOutputStream();
-            pipe.obtain();
             IOUtils.copy(pipe.open(), os);
             return true;
         } catch (IOException e) {
@@ -605,8 +608,6 @@ public final class SpiderQueen implements Runnable {
 
         OutputStream os = null;
         try {
-            pipe.obtain();
-
             // Get dst file
             BitmapFactory.Options options = new BitmapFactory.Options();
             options.inJustDecodeBounds = true;
@@ -645,8 +646,6 @@ public final class SpiderQueen implements Runnable {
         }
 
         try {
-            pipe.obtain();
-
             // Get dst file
             BitmapFactory.Options options = new BitmapFactory.Options();
             options.inJustDecodeBounds = true;
@@ -713,7 +712,7 @@ public final class SpiderQueen implements Runnable {
                 return spiderInfo;
             }
         } catch (IOException e) {
-            // Ignore
+            e.printStackTrace();
         }
 
         return null;
@@ -868,6 +867,7 @@ public final class SpiderQueen implements Runnable {
             editor.commit();
         } catch (IOException e) {
             editor.abort();
+            e.printStackTrace();
         }
     }
 
@@ -875,8 +875,8 @@ public final class SpiderQueen implements Runnable {
         // Read spider info
         SpiderInfo spiderInfo = readSpiderInfoFromLocal();
 
-        // Check interrupted
-        if (Thread.currentThread().isInterrupted()) {
+        // Check Stopped
+        if (mStoped) {
             return;
         }
 
@@ -891,16 +891,16 @@ public final class SpiderQueen implements Runnable {
         }
         mSpiderInfo.lazySet(spiderInfo);
 
-        // Check interrupted
-        if (Thread.currentThread().isInterrupted()) {
+        // Check Stopped
+        if (mStoped) {
             return;
         }
 
         // Write spider info to file
         writeSpiderInfoToLocal(spiderInfo);
 
-        // Check interrupted
-        if (Thread.currentThread().isInterrupted()) {
+        // Check Stopped
+        if (mStoped) {
             return;
         }
 
@@ -924,17 +924,19 @@ public final class SpiderQueen implements Runnable {
         }
 
         // handle pToken request
-        while (!Thread.currentThread().isInterrupted()) {
+        while (!mStoped) {
             Integer index = mRequestPTokenQueue.poll();
 
             if (index == null) {
                 // No request index, wait here
                 synchronized (mQueenLock) {
+                    if (mStoped) break;
                     try {
                         mQueenLock.wait();
                     } catch (InterruptedException e) {
                         break;
                     }
+                    if (mStoped) break;
                 }
                 continue;
             }
@@ -989,16 +991,9 @@ public final class SpiderQueen implements Runnable {
         // Set mQueenThread null
         mQueenThread = null;
 
-        // Interrupt decoder
-        for (Thread decoderThread : mDecodeThreadArray) {
-            if (decoderThread != null) {
-                decoderThread.interrupt();
-            }
-        }
-
-        // Interrupt all workers
+        // Stop all workers
         synchronized (mWorkerLock) {
-            mWorkerPoolExecutor.shutdownNow();
+            mWorkerPoolExecutor.shutdown();
             mWorkerPoolExecutor = null;
         }
         notifyFinish();
@@ -1146,7 +1141,6 @@ public final class SpiderQueen implements Runnable {
             String pageUrl = null;
             String error = null;
             boolean forceHtml = false;
-            boolean interrupt = false;
             boolean leakSkipHathKey = false;
 
             for (int i = 0; i < 5; i++) {
@@ -1191,10 +1185,9 @@ public final class SpiderQueen implements Runnable {
                             break;
                         }
 
-                        // Check interrupted
-                        if (Thread.currentThread().isInterrupted()) {
+                        // Check Stopped
+                        if (mStoped) {
                             error = "Interrupted";
-                            interrupt = true;
                             break;
                         }
                     }
@@ -1226,10 +1219,9 @@ public final class SpiderQueen implements Runnable {
                         }
                     }
 
-                    // Check interrupted
-                    if (Thread.currentThread().isInterrupted()) {
+                    // Check Stopped
+                    if (mStoped) {
                         error = "Interrupted";
-                        interrupt = true;
                         break;
                     }
                 }
@@ -1252,7 +1244,6 @@ public final class SpiderQueen implements Runnable {
                 }
 
                 // Download image
-                InputStream is = null;
                 try {
                     if (DEBUG_LOG) {
                         Log.d(TAG, "Start download image " + index);
@@ -1276,10 +1267,6 @@ public final class SpiderQueen implements Runnable {
                     if (mediaType != null) {
                         extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mediaType.toString());
                     }
-                    // Ensure extension
-                    if (!Utilities.contain(PageLoader2.SUPPORT_IMAGE_EXTENSIONS, extension)) {
-                        extension = PageLoader2.SUPPORT_IMAGE_EXTENSIONS[0];
-                    }
 
                     OutputStreamPipe osPipe = null;
                     try {
@@ -1293,29 +1280,43 @@ public final class SpiderQueen implements Runnable {
                         }
 
                         long contentLength = responseBody.contentLength();
-                        is = responseBody.byteStream();
-                        osPipe.obtain();
-                        OutputStream os = osPipe.open();
-
-                        final byte[] data = new byte[1024 * 4];
                         long receivedSize = 0;
-
-                        while (!Thread.currentThread().isInterrupted()) {
-                            int bytesRead = is.read(data);
-                            if (bytesRead == -1) {
-                                response.close();
-                                break;
+                        OutputStream os = osPipe.open();
+                        if (os instanceof FileOutputStream fileOutputStream) {
+                            try (var channel = fileOutputStream.getChannel(); var source = responseBody.source(); responseBody; response) {
+                                while (!mStoped) {
+                                    // Is 40k a good size ?
+                                    long bytesRead = channel.transferFrom(source, receivedSize, 40960);
+                                    if (bytesRead == 0) {
+                                        break;
+                                    }
+                                    receivedSize += bytesRead;
+                                    if (contentLength > 0) {
+                                        mPagePercentMap.put(index, (float) receivedSize / contentLength);
+                                    }
+                                    notifyPageDownload(index, contentLength, receivedSize, (int) bytesRead);
+                                }
                             }
-                            os.write(data, 0, bytesRead);
-                            receivedSize += bytesRead;
-                            // Update page percent
-                            if (contentLength > 0) {
-                                mPagePercentMap.put(index, (float) receivedSize / contentLength);
+                        } else {
+                            final byte[] data = new byte[1024 * 4];
+                            try (var is = responseBody.byteStream(); responseBody; response) {
+                                while (!mStoped) {
+                                    int bytesRead = is.read(data);
+                                    if (bytesRead == -1) {
+                                        break;
+                                    }
+                                    os.write(data, 0, bytesRead);
+                                    receivedSize += bytesRead;
+                                    // Update page percent
+                                    if (contentLength > 0) {
+                                        mPagePercentMap.put(index, (float) receivedSize / contentLength);
+                                    }
+                                    // Notify listener
+                                    notifyPageDownload(index, contentLength, receivedSize, bytesRead);
+                                }
+                                os.flush();
                             }
-                            // Notify listener
-                            notifyPageDownload(index, contentLength, receivedSize, bytesRead);
                         }
-                        os.flush();
 
                         // check download size
                         if (contentLength >= 0) {
@@ -1346,7 +1347,6 @@ public final class SpiderQueen implements Runnable {
                         }
 
                         // Check plain txt
-                        isPipe.obtain();
                         InputStream inputStream = new BufferedInputStream(isPipe.open());
                         boolean isPlainTxt = true;
                         int j = 0;
@@ -1377,9 +1377,8 @@ public final class SpiderQueen implements Runnable {
                         }
                     }
 
-                    // Check interrupted
-                    if (Thread.currentThread().isInterrupted()) {
-                        interrupt = true;
+                    // Check Stopped
+                    if (mStoped) {
                         error = "Interrupted";
                         break;
                     }
@@ -1395,16 +1394,12 @@ public final class SpiderQueen implements Runnable {
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
-                    Thread.sleep(0); // to make allow to catch InterruptedException
                     return true;
                 } catch (IOException e) {
                     e.printStackTrace();
                     error = GetText.getString(R.string.error_socket);
                     forceHtml = true;
-                } catch (InterruptedException ignored) {
                 } finally {
-                    IOUtils.closeQuietly(is);
-
                     if (DEBUG_LOG) {
                         Log.d(TAG, "End download image " + index);
                     }
@@ -1415,7 +1410,7 @@ public final class SpiderQueen implements Runnable {
             mSpiderDen.remove(index);
 
             updatePageState(index, STATE_FAILED, error);
-            return !interrupt;
+            return !mStoped;
         }
 
         // false for stop
@@ -1486,7 +1481,7 @@ public final class SpiderQueen implements Runnable {
 
             String pToken = null;
             // Get token
-            while (!Thread.currentThread().isInterrupted()) {
+            while (!mStoped) {
                 synchronized (mPTokenLock) {
                     pToken = spiderInfo.pTokenMap.get(index);
                 }
@@ -1498,6 +1493,7 @@ public final class SpiderQueen implements Runnable {
                     }
                     // Wait
                     synchronized (mWorkerLock) {
+                        if (mStoped) break;
                         try {
                             mWorkerLock.wait();
                         } catch (InterruptedException e) {
@@ -1507,6 +1503,7 @@ public final class SpiderQueen implements Runnable {
                             }
                             break;
                         }
+                        if (mStoped) break;
                     }
                 } else {
                     break;
@@ -1523,7 +1520,7 @@ public final class SpiderQueen implements Runnable {
             String previousPToken = null;
             int previousIndex = index - 1;
             // Get token
-            while (previousIndex >= 0 && !Thread.currentThread().isInterrupted()) {
+            while (previousIndex >= 0 && !mStoped) {
                 synchronized (mPTokenLock) {
                     previousPToken = spiderInfo.pTokenMap.get(previousIndex);
                 }
@@ -1535,6 +1532,7 @@ public final class SpiderQueen implements Runnable {
                     }
                     // Wait
                     synchronized (mWorkerLock) {
+                        if (mStoped) break;
                         try {
                             mWorkerLock.wait();
                         } catch (InterruptedException e) {
@@ -1544,6 +1542,7 @@ public final class SpiderQueen implements Runnable {
                             }
                             break;
                         }
+                        if (mStoped) break;
                     }
                 } else {
                     break;
@@ -1567,8 +1566,7 @@ public final class SpiderQueen implements Runnable {
                 Log.i(TAG, Thread.currentThread().getName() + ": start");
             }
 
-            while (mSpiderDen.isReady() && !Thread.currentThread().isInterrupted() && runInternal())
-                ;
+            while (mSpiderDen.isReady() && !mStoped && runInternal()) ;
 
             boolean finish;
             // Clear in spider worker array
@@ -1611,9 +1609,10 @@ public final class SpiderQueen implements Runnable {
                 Log.i(TAG, Thread.currentThread().getName() + ": start");
             }
 
-            while (!Thread.currentThread().isInterrupted()) {
+            while (!mStoped) {
                 int index;
                 synchronized (mDecodeRequestQueue) {
+                    if (mStoped) break;
                     if (mDecodeRequestQueue.isEmpty()) {
                         try {
                             mDecodeRequestQueue.wait();
@@ -1621,6 +1620,7 @@ public final class SpiderQueen implements Runnable {
                             // Interrupted
                             break;
                         }
+                        if (mStoped) break;
                         continue;
                     }
                     index = mDecodeRequestQueue.remove();
@@ -1634,8 +1634,8 @@ public final class SpiderQueen implements Runnable {
                     continue;
                 }
 
-                InputStreamPipe pipe = mSpiderDen.openInputStreamPipe(index);
-                if (pipe == null) {
+                Image.ByteBufferSource src = mSpiderDen.getImageSource(index);
+                if (src == null) {
                     resetDecodeIndex();
                     // Can't find the file, it might be removed from cache,
                     // Reset it state and request it
@@ -1644,36 +1644,11 @@ public final class SpiderQueen implements Runnable {
                     continue;
                 }
 
-                Image image = null;
+                Image image = Image.decode(src);
                 String error = null;
-                InputStream is;
 
-                pipe.obtain();
-                try {
-                    is = pipe.open();
-                } catch (IOException e) {
-                    // Can't open pipe
-                    error = GetText.getString(R.string.error_reading_failed);
-                    is = null;
-                    pipe.close();
-                    pipe.release();
-                }
-
-                if (is != null) {
-                    try {
-                        image = Image.decode(((FileInputStream) is));
-                    } catch (ImageDecoder.DecodeException e) {
-                        e.printStackTrace();
-                    } finally {
-                        try {
-                            is.close();
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    if (image == null) {
-                        error = GetText.getString(R.string.error_decoding_failed);
-                    }
+                if (image == null) {
+                    error = GetText.getString(R.string.error_decoding_failed);
                 }
 
                 // Notify

app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt

@@ -24,23 +24,32 @@ import android.content.pm.verify.domain.DomainVerificationManager
 import android.content.pm.verify.domain.DomainVerificationUserState
 import android.graphics.Bitmap
 import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
 import android.view.View
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
+import androidx.core.content.getSystemService
 import androidx.core.view.GravityCompat
+import androidx.customview.widget.Openable
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.ui.NavigationUI
+import androidx.navigation.ui.onNavDestinationSelected2
 import androidx.navigation.ui.setupWithNavController
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.snackbar.Snackbar
 import com.hippo.app.BaseDialogBuilder
 import com.hippo.app.EditTextDialogBuilder
@@ -54,9 +63,11 @@ import com.hippo.ehviewer.client.parser.GalleryListUrlParser
 import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
 import com.hippo.ehviewer.databinding.ActivityMainBinding
 import com.hippo.ehviewer.download.DownloadService
+import com.hippo.ehviewer.ui.login.LoginActivity
 import com.hippo.ehviewer.ui.scene.BaseScene
 import com.hippo.ehviewer.ui.scene.GalleryDetailScene
 import com.hippo.ehviewer.ui.scene.GalleryListScene
+import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs
 import com.hippo.ehviewer.ui.scene.ProgressScene
 import com.hippo.io.UniFileInputStreamPipe
 import com.hippo.unifile.UniFile
@@ -77,6 +88,8 @@ import java.io.OutputStream
 class MainActivity : EhActivity() {
     private lateinit var binding: ActivityMainBinding
     private lateinit var navController: NavController
+    private lateinit var connectivityManager: ConnectivityManager
+    private val availableNetworks: MutableList<Network> = mutableListOf()
 
     private fun saveImageToTempFile(file: UniFile?): File? {
         file ?: return null
@@ -181,7 +194,7 @@ class MainActivity : EhActivity() {
                 builder.keyword = intent.getStringExtra(Intent.EXTRA_TEXT)
                 navController.navigate(
                     R.id.galleryListScene,
-                    GalleryListScene.getStartArgs(builder)
+                    builder.toStartArgs()
                 )
                 return true
             } else if (type != null && type.startsWith("image/")) {
@@ -196,7 +209,7 @@ class MainActivity : EhActivity() {
                         builder.isUseSimilarityScan = true
                         navController.navigate(
                             R.id.galleryListScene,
-                            GalleryListScene.getStartArgs(builder)
+                            builder.toStartArgs()
                         )
                         return true
                     }
@@ -211,6 +224,10 @@ class MainActivity : EhActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        connectivityManager = getSystemService()!!
+        if (Settings.getDF() && Settings.getBypassVPN()) {
+            bypassVPN()
+        }
         if (EhUtils.needSignedIn())
             startActivity(Intent(this, LoginActivity::class.java))
         super.onCreate(savedInstanceState)
@@ -231,6 +248,26 @@ class MainActivity : EhActivity() {
         }
         binding.drawView.addDrawerListener(mDrawerOnBackPressedCallback)
         binding.navView.setupWithNavController(navController)
+
+        // Trick: Tweak NavigationUI to disable multiple backstack
+        binding.navView.setNavigationItemSelectedListener {
+            val navigationView = binding.navView
+            val handled = onNavDestinationSelected2(it, navController)
+            if (handled) {
+                val parent = navigationView.parent
+                if (parent is Openable) {
+                    parent.close()
+                } else {
+                    val bottomSheetBehavior = NavigationUI.findBottomSheetBehavior(navigationView)
+                    if (bottomSheetBehavior != null) {
+                        bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+                    }
+                }
+            }
+            handled
+        }
+        // Trick End
+
         if (savedInstanceState == null) {
             if (intent.action != Intent.ACTION_MAIN) {
                 onNewIntent(intent)
@@ -250,6 +287,19 @@ class MainActivity : EhActivity() {
         }
     }
 
+    private fun bypassVPN() {
+        val network = connectivityManager.activeNetwork
+        val capabilities = connectivityManager.getNetworkCapabilities(network)
+        capabilities?.let {
+            if (it.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
+                val builder = NetworkRequest.Builder()
+                    .addCapability(NetworkCapabilities.NET_CAPABILITY_FOREGROUND)
+                    .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
+                connectivityManager.registerNetworkCallback(builder.build(), mNetworkCallback)
+            }
+        }
+    }
+
     @RequiresApi(Build.VERSION_CODES.S)
     @Throws(PackageManager.NameNotFoundException::class)
     private fun checkAppLinkVerify() {
@@ -308,8 +358,7 @@ class MainActivity : EhActivity() {
     }
 
     private fun checkMeteredNetwork() {
-        val cm = getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager
-        if (cm.isActiveNetworkMetered) {
+        if (connectivityManager.isActiveNetworkMetered) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 Snackbar.make(
                     binding.drawView,
@@ -477,4 +526,25 @@ class MainActivity : EhActivity() {
             override fun onDrawerClosed(drawerView: View) {}
             override fun onDrawerStateChanged(newState: Int) {}
         }
+
+    private val mNetworkCallback = object : ConnectivityManager.NetworkCallback() {
+        private val TAG = "mNetworkCallback"
+
+        override fun onAvailable(network: Network) {
+            Log.d(TAG, "onAvailable: $network")
+            connectivityManager.bindProcessToNetwork(network)
+            availableNetworks.add(network)
+        }
+
+        override fun onLost(network: Network) {
+            Log.d(TAG, "onLost: $network")
+            val activeNetwork = availableNetworks.last()
+            availableNetworks.remove(network)
+            if (network == activeNetwork) {
+                connectivityManager.bindProcessToNetwork(
+                    availableNetworks.takeIf { it.isNotEmpty() }?.last()
+                )
+            }
+        }
+    }
 }

app/src/main/java/com/hippo/ehviewer/ui/annotation/DrawerLifeCircle.java

@@ -1,37 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.ui.annotation;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-
-import androidx.fragment.app.Fragment;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Created in {@link Fragment#onCreateView(LayoutInflater, ViewGroup, Bundle)},
- * destroyed in {@link Fragment#onDestroyView()}.
- */
-@Retention(RetentionPolicy.SOURCE)
-@Target({ElementType.FIELD})
-public @interface DrawerLifeCircle {
-}

app/src/main/java/com/hippo/ehviewer/ui/annotation/ViewLifeCircle.java

@@ -1,37 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.ui.annotation;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-
-import androidx.fragment.app.Fragment;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Created in {@link Fragment#onCreateView(LayoutInflater, ViewGroup, Bundle)},
- * destroyed in {@link Fragment#onDestroyView()}.
- */
-@Retention(RetentionPolicy.SOURCE)
-@Target({ElementType.FIELD})
-public @interface ViewLifeCircle {
-}

app/src/main/java/com/hippo/ehviewer/ui/annotation/WholeLifeCircle.java

@@ -1,36 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.ui.annotation;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Created in {@link Fragment#onCreate(Bundle)} or {@link Activity#onCreate(Bundle)},
- * destroyed in {@link Fragment#onDestroy()} or {@link Activity#onDestroy()}.
- */
-@Retention(RetentionPolicy.SOURCE)
-@Target({ElementType.FIELD})
-public @interface WholeLifeCircle {
-}

app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt

@@ -231,7 +231,6 @@ class AdvancedFragment : BasePreferenceFragment() {
         addPreferencesFromResource(R.xml.advanced_settings)
         val dumpLogcat = findPreference<Preference>(KEY_DUMP_LOGCAT)
         val appLanguage = findPreference<Preference>(KEY_APP_LANGUAGE)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) appLanguage!!.isVisible = false
         val importData = findPreference<Preference>(KEY_IMPORT_DATA)
         val exportData = findPreference<Preference>(KEY_EXPORT_DATA)
         val backupFavorite = findPreference<Preference>(KEY_BACKUP_FAVORITE)
@@ -378,7 +377,7 @@ class AdvancedFragment : BasePreferenceFragment() {
 
     override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
         val key = preference.key
-        if (KEY_APP_LANGUAGE == key && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+        if (KEY_APP_LANGUAGE == key) {
             if ("system" == newValue) {
                 AppCompatDelegate.setApplicationLocales(LocaleListCompat.getEmptyLocaleList())
             } else {

app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.kt

@@ -25,7 +25,9 @@ import androidx.preference.Preference
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhTagDatabase
+import eu.kanade.tachiyomi.util.lang.launchIO
 
 class EhFragment : BasePreferenceFragment() {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -67,6 +69,7 @@ class EhFragment : BasePreferenceFragment() {
             return true
         } else if (Settings.KEY_GALLERY_SITE == key) {
             requireActivity().setResult(Activity.RESULT_OK)
+            launchIO { runCatching { EhEngine.getUConfig() } }
             return true
         } else if (Settings.KEY_LIST_MODE == key) {
             requireActivity().setResult(Activity.RESULT_OK)

app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.kt

@@ -259,7 +259,7 @@ class FilterFragment : BaseFragment() {
     }
 
     private inner class FilterList {
-        private val mEhFilter: EhFilter = EhFilter.getInstance()
+        private val mEhFilter: EhFilter = EhFilter
         private val mTitleFilterList: List<Filter> = mEhFilter.titleFilterList
         private val mUploaderFilterList: List<Filter> = mEhFilter.uploaderFilterList
         private val mTagFilterList: List<Filter> = mEhFilter.tagFilterList
@@ -407,11 +407,11 @@ class FilterFragment : BaseFragment() {
             throw IndexOutOfBoundsException()
         }
 
-        fun add(filter: Filter?): Boolean {
+        fun add(filter: Filter): Boolean {
             return mEhFilter.addFilter(filter)
         }
 
-        fun delete(filter: Filter?) {
+        fun delete(filter: Filter) {
             mEhFilter.deleteFilter(filter)
         }
 

app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.login
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
@@ -49,16 +49,13 @@ import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.client.EhClient
-import com.hippo.ehviewer.client.EhClient.METHOD_GET_PROFILE
 import com.hippo.ehviewer.client.EhCookieStore
+import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.ui.LoginActivity.Companion.SELECT_SITE_ROUTE_NAME
 import com.hippo.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import okhttp3.Cookie
@@ -105,7 +102,7 @@ fun CookieSignInScene(navController: NavController) {
     }
 
     fun login() {
-        signInJob?.cancel()
+        if (signInJob?.isActive == true) return
         if (ipbMemberId.isBlank()) {
             ipbMemberIdErrorState = true
             return
@@ -123,18 +120,16 @@ fun CookieSignInScene(navController: NavController) {
         isProgressIndicatorVisible = true
         signInJob = coroutineScope.launchIO {
             runCatching {
-                EhClient.execute(METHOD_GET_PROFILE)
+                EhEngine.getProfile()
             }.onSuccess {
                 withUIContext {
                     navController.navigate(SELECT_SITE_ROUTE_NAME)
                 }
             }.onFailure {
                 EhApplication.ehCookieStore.signOut()
-                if (it !is CancellationException) {
-                    loginErrorException = it
-                    showErrorDialog = true
-                    isProgressIndicatorVisible = false
-                }
+                loginErrorException = it
+                showErrorDialog = true
+                isProgressIndicatorVisible = false
             }
         }
     }

app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt

@@ -1,19 +1,15 @@
-package com.hippo.ehviewer.ui
+package com.hippo.ehviewer.ui.login
 
 import android.os.Bundle
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.navigation.ActivityNavigator
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
-import com.hippo.ehviewer.ui.compose.CookieSignInScene
-import com.hippo.ehviewer.ui.compose.SelectSiteScreen
-import com.hippo.ehviewer.ui.compose.SignInScreen
-import com.hippo.ehviewer.ui.compose.WebviewSignInScreen
+import com.hippo.ehviewer.ui.EhActivity
 
-class LoginActivity : ComponentActivity() {
+class LoginActivity : EhActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
@@ -47,11 +43,9 @@ class LoginActivity : ComponentActivity() {
         super.finish()
         ActivityNavigator.applyPopAnimationsToPendingTransition(this)
     }
-
-    companion object {
-        const val SIGN_IN_ROUTE_NAME = "SignIn"
-        const val WEBVIEW_SIGN_IN_ROUTE_NAME = "WebViewSignIn"
-        const val COOKIE_SIGN_IN_ROUTE_NAME = "CookieSignIn"
-        const val SELECT_SITE_ROUTE_NAME = "SelectSite"
-    }
 }
+
+const val SIGN_IN_ROUTE_NAME = "SignIn"
+const val WEBVIEW_SIGN_IN_ROUTE_NAME = "WebViewSignIn"
+const val COOKIE_SIGN_IN_ROUTE_NAME = "CookieSignIn"
+const val SELECT_SITE_ROUTE_NAME = "SelectSite"

app/src/main/java/com/hippo/ehviewer/ui/login/SelectSiteScreen.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.login
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -34,9 +34,8 @@ import androidx.compose.ui.unit.dp
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.EhClient
+import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.parser.ProfileParser
 import eu.kanade.tachiyomi.util.lang.launchIO
 import kotlinx.coroutines.GlobalScope
 
@@ -135,9 +134,10 @@ fun SelectSiteScreen(finish: () -> Unit) {
 
 suspend fun getProfile() {
     runCatching {
-        (EhClient.execute(EhClient.METHOD_GET_PROFILE) as ProfileParser.Result).run {
+        EhEngine.getProfile().run {
             Settings.putDisplayName(displayName)
             Settings.putAvatar(avatar)
         }
+        EhEngine.getUConfig()
     }
 }

app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.login
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
@@ -21,10 +21,10 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -53,14 +53,10 @@ import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.UrlOpener
-import com.hippo.ehviewer.client.EhClient
+import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.ui.LoginActivity.Companion.COOKIE_SIGN_IN_ROUTE_NAME
-import com.hippo.ehviewer.ui.LoginActivity.Companion.SELECT_SITE_ROUTE_NAME
-import com.hippo.ehviewer.ui.LoginActivity.Companion.WEBVIEW_SIGN_IN_ROUTE_NAME
 import com.hippo.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
@@ -104,9 +100,7 @@ fun SignInScreen(navController: NavController) {
         EhUtils.signOut()
         signInJob = coroutineScope.launchIO {
             runCatching {
-                (EhClient.execute(EhClient.METHOD_SIGN_IN, username, password) as String).let {
-                    Settings.putDisplayName(it)
-                }
+                EhEngine.signIn(username, password)
             }.onFailure {
                 it.printStackTrace()
                 withUIContext {
@@ -194,7 +188,7 @@ fun SignInScreen(navController: NavController) {
             Spacer(modifier = Modifier.weight(1f))
 
             Row {
-                OutlinedButton(
+                FilledTonalButton(
                     onClick = {
                         UrlOpener.openUrl(
                             requireActivity(context),

app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.login
 
 import android.annotation.SuppressLint
 import android.graphics.Color
@@ -14,7 +14,6 @@ import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.ui.LoginActivity.Companion.SELECT_SITE_ROUTE_NAME
 import com.hippo.ehviewer.widget.DialogWebChromeClient
 import okhttp3.Cookie
 import okhttp3.HttpUrl
@@ -69,9 +68,9 @@ fun WebviewSignInScreen(navController: NavController) {
                         EhCookieStore.newCookie(
                             cookie,
                             domain,
-                            true,
-                            true,
-                            true
+                            forcePersistent = true,
+                            forceLongLive = true,
+                            forceNotHostOnly = true
                         )
                     )
                 }

app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.kt

@@ -236,17 +236,6 @@ abstract class BaseScene : Fragment() {
         NavHostFragment.findNavController(this).navigate(id, args, options)
     }
 
-    fun navigateToTop() {
-        val navController = NavHostFragment.findNavController(this)
-        val id = navController.graph.startDestinationId
-        val options: NavOptions = NavOptions.Builder()
-            .setEnterAnim(R.anim.scene_open_enter).setExitAnim(R.anim.scene_open_exit)
-            .setPopEnterAnim(R.anim.scene_close_enter).setPopExitAnim(R.anim.scene_close_exit)
-            .setPopUpTo(id, true)
-            .build()
-        navController.navigate(id, null, options)
-    }
-
     companion object {
         const val LENGTH_SHORT = 0
         const val LENGTH_LONG = 1

app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt

@@ -34,7 +34,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
-import androidx.core.view.ViewCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
@@ -112,8 +111,9 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
     private fun initLabels() {
         context ?: return
         val listLabel = downloadManager.labelList
-        mLabels = ArrayList(listLabel.size + 1)
-        // Add default label name
+        mLabels = ArrayList(listLabel.size + LABEL_OFFSET)
+        // Add "All" and "Default" label names
+        mLabels.add(getString(R.string.download_all))
         mLabels.add(getString(R.string.default_download_label_name))
         for ((_, label) in listLabel) {
             mLabels.add(label!!)
@@ -185,12 +185,14 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
         }
         var list: MutableList<DownloadInfo>?
         if (mLabel == null) {
+            list = mDownloadManager!!.allDownloadInfoList
+        } else if (mLabel == getString(R.string.default_download_label_name)) {
             list = mDownloadManager!!.defaultDownloadInfoList
         } else {
             list = mDownloadManager!!.getLabelDownloadInfoList(mLabel)
             if (list == null) {
                 mLabel = null
-                list = mDownloadManager!!.defaultDownloadInfoList
+                list = mDownloadManager!!.allDownloadInfoList
             }
         }
         if (mType != -1) {
@@ -213,7 +215,7 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
         setTitle(
             getString(
                 R.string.scene_download_title,
-                if (mLabel != null) mLabel else getString(R.string.default_download_label_name)
+                if (mLabel != null) mLabel else getString(R.string.download_all)
             )
         )
     }
@@ -286,7 +288,6 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
             mRecyclerView!!.scrollToPosition(mInitPosition)
             mInitPosition = -1
         }
-        val itemTouchHelper = ItemTouchHelper(DownloadItemTouchHelperCallback())
         itemTouchHelper.attachToRecyclerView(mRecyclerView)
         mFastScroller!!.attachToRecyclerView(mRecyclerView)
         val handlerDrawable = HandlerDrawable()
@@ -634,10 +635,10 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
     }
 
     override fun onUpdate(info: DownloadInfo, list: List<DownloadInfo>) {
-        if (mList !== list) {
+        if (mLabel != null && mList !== list) {
             return
         }
-        val index = list.indexOf(info)
+        val index = mList!!.indexOf(info)
         if (index >= 0 && mAdapter != null) {
             mAdapter!!.notifyItemChanged(index)
         }
@@ -785,7 +786,8 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
     private inner class DownloadLabelAdapter(private val mInflater: LayoutInflater) :
         RecyclerView.Adapter<DownloadLabelHolder>() {
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DownloadLabelHolder {
-            val holder = DownloadLabelHolder(mInflater.inflate(R.layout.item_drawer_list, parent, false))
+            val holder =
+                DownloadLabelHolder(mInflater.inflate(R.layout.item_drawer_list, parent, false))
             holder.itemView.setOnClickListener {
                 val position = holder.bindingAdapterPosition
                 val label1: String? = if (position == 0) {
@@ -827,10 +829,18 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
             }
             var list: List<DownloadInfo?>? = null
             if (mDownloadManager != null) {
-                list = if (position == 0) {
-                    mDownloadManager!!.defaultDownloadInfoList
-                } else {
-                    mDownloadManager!!.getLabelDownloadInfoList(label)
+                list = when (position) {
+                    0 -> {
+                        mDownloadManager!!.allDownloadInfoList
+                    }
+
+                    1 -> {
+                        mDownloadManager!!.defaultDownloadInfoList
+                    }
+
+                    else -> {
+                        mDownloadManager!!.getLabelDownloadInfoList(label)
+                    }
                 }
             }
             if (list != null) {
@@ -838,17 +848,17 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
             } else {
                 holder.label.text = label
             }
-            if (position > 0) {
-                holder.edit.visibility = View.VISIBLE
-                holder.option.visibility = View.VISIBLE
-            } else {
+            if (position < LABEL_OFFSET) {
                 holder.edit.visibility = View.GONE
                 holder.option.visibility = View.GONE
+            } else {
+                holder.edit.visibility = View.VISIBLE
+                holder.option.visibility = View.VISIBLE
             }
         }
 
         override fun getItemId(position: Int): Long {
-            return mLabels[position].hashCode().toLong()
+            return (if (position < LABEL_OFFSET) position else mLabels[position].hashCode()).toLong()
         }
 
         override fun getItemCount(): Int {
@@ -1019,8 +1029,8 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
                 return
             }
             val info = mList!![position]
-            if (info.thumb != null) {
-                holder.thumb.load(EhCacheKeyFactory.getThumbKey(info.gid), info.thumb!!)
+            info.thumb?.let {
+                holder.thumb.load(EhCacheKeyFactory.getThumbKey(info.gid), EhUtils.fixThumbUrl(it))
             }
             holder.title.text = EhUtils.getSuitableTitle(info)
             holder.uploader.text = info.uploader
@@ -1032,12 +1042,6 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
                 category.setBackgroundColor(EhUtils.getCategoryColor(info.category))
             }
             bindForState(holder, info)
-
-            // Update transition name
-            ViewCompat.setTransitionName(
-                holder.thumb,
-                TransitionNameFactory.getThumbTransitionName(info.gid)
-            )
         }
 
         override fun getItemCount(): Int {
@@ -1149,10 +1153,15 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
             recyclerView: RecyclerView,
             viewHolder: RecyclerView.ViewHolder
         ): Int {
-            return makeMovementFlags(
-                ItemTouchHelper.UP or ItemTouchHelper.DOWN,
-                ItemTouchHelper.LEFT
-            )
+            val position = viewHolder.bindingAdapterPosition
+            return if (position < LABEL_OFFSET) {
+                makeMovementFlags(0, 0)
+            } else {
+                makeMovementFlags(
+                    ItemTouchHelper.UP or ItemTouchHelper.DOWN,
+                    ItemTouchHelper.LEFT
+                )
+            }
         }
 
         override fun onMove(
@@ -1163,10 +1172,10 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
             val fromPosition = viewHolder.bindingAdapterPosition
             val toPosition = target.bindingAdapterPosition
             val context = context
-            if (null == context || fromPosition == toPosition || toPosition == 0 || fromPosition == 0) {
+            if (null == context || fromPosition == toPosition || toPosition < LABEL_OFFSET) {
                 return false
             }
-            downloadManager.moveLabel(fromPosition - 1, toPosition - 1)
+            downloadManager.moveLabel(fromPosition - LABEL_OFFSET, toPosition - LABEL_OFFSET)
             val item = mLabels.removeAt(fromPosition)
             mLabels.add(toPosition, item)
             mLabelAdapter!!.notifyItemMoved(fromPosition, toPosition)
@@ -1176,10 +1185,6 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
         override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
             val position = viewHolder.bindingAdapterPosition
             if (mDownloadManager == null) return
-            if (position == 0) {
-                mLabelAdapter!!.notifyItemChanged(position)
-                return
-            }
             val label = mLabels[position]
             BaseDialogBuilder(context!!)
                 .setMessage(getString(R.string.delete_label, label))
@@ -1191,13 +1196,15 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
                             mLabelAdapter!!.notifyItemRemoved(position)
                         }
                     }
-                }.setNegativeButton(android.R.string.cancel) { _, _ ->
+                }.setNegativeButton(android.R.string.cancel) { dialog, _ ->
+                    dialog.cancel()
+                }.setOnCancelListener {
                     mLabelAdapter!!.notifyItemChanged(position)
                 }.show()
         }
     }
 
-    private inner class DownloadItemTouchHelperCallback : ItemTouchHelper.Callback() {
+    private val itemTouchHelper = ItemTouchHelper(object : ItemTouchHelper.Callback() {
         override fun getMovementFlags(
             recyclerView: RecyclerView,
             viewHolder: RecyclerView.ViewHolder
@@ -1218,10 +1225,17 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
             if (fromPosition == toPosition) {
                 return false
             }
+            val allInfoList = mDownloadManager!!.allDownloadInfoList
+            val dbFromPosition = allInfoList.indexOf(mList!![fromPosition])
+            val dbToPosition = allInfoList.indexOf(mList!![toPosition])
             lifecycleScope.launchIO {
-                EhDB.moveDownloadInfo(fromPosition, toPosition)
-                val item = mList!!.removeAt(fromPosition)
-                mList!!.add(toPosition, item)
+                EhDB.moveDownloadInfo(dbFromPosition, dbToPosition)
+                val item = allInfoList.removeAt(dbFromPosition)
+                allInfoList.add(dbToPosition, item)
+                if (mLabel != null) {
+                    val item1 = mList!!.removeAt(fromPosition)
+                    mList!!.add(toPosition, item1)
+                }
                 withUIContext {
                     mAdapter!!.notifyItemMoved(fromPosition, toPosition)
                 }
@@ -1231,7 +1245,7 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
 
         override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
         }
-    }
+    })
 
     companion object {
         const val KEY_GID = "gid"
@@ -1239,5 +1253,6 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
         const val ACTION_CLEAR_DOWNLOAD_SERVICE = "clear_download_service"
         private val TAG = DownloadsScene::class.java.simpleName
         private const val KEY_LABEL = "label"
+        private const val LABEL_OFFSET = 2
     }
 }

app/src/main/java/com/hippo/ehviewer/ui/scene/EhCallback.java

@@ -1,69 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.ui.scene;
-
-import android.content.Context;
-import android.widget.Toast;
-
-import androidx.annotation.StringRes;
-import androidx.fragment.app.Fragment;
-
-import com.hippo.ehviewer.EhApplication;
-import com.hippo.ehviewer.client.EhClient;
-import com.hippo.ehviewer.ui.EhActivity;
-import com.hippo.ehviewer.ui.MainActivity;
-
-public abstract class EhCallback<E extends Fragment, T> implements EhClient.Callback<T> {
-
-    private final EhApplication mApplication;
-
-    public EhCallback(Context context) {
-        mApplication = (EhApplication) context.getApplicationContext();
-    }
-
-    public Context getContent() {
-        Context context = mApplication.getTopActivity();
-        if (context == null) {
-            context = getApplication();
-        }
-        return context;
-    }
-
-    public EhApplication getApplication() {
-        return mApplication;
-    }
-
-    public void showTip(@StringRes int id, int length) {
-        EhActivity activity = mApplication.getTopActivity();
-        if (activity instanceof MainActivity) {
-            ((MainActivity) activity).showTip(id, length);
-        } else {
-            Toast.makeText(getApplication(), id,
-                    length == BaseScene.LENGTH_LONG ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    public void showTip(String tip, int length) {
-        EhActivity activity = mApplication.getTopActivity();
-        if (activity instanceof MainActivity) {
-            ((MainActivity) activity).showTip(tip, length);
-        } else {
-            Toast.makeText(getApplication(), tip,
-                    length == BaseScene.LENGTH_LONG ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT).show();
-        }
-    }
-}

app/src/main/java/com/hippo/ehviewer/ui/scene/EhCallback.kt

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * 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 com.hippo.ehviewer.ui.scene
+
+import android.content.Context
+import android.widget.Toast
+import androidx.annotation.StringRes
+import androidx.fragment.app.Fragment
+import com.hippo.ehviewer.EhApplication
+import com.hippo.ehviewer.client.EhClient
+import com.hippo.ehviewer.ui.MainActivity
+
+abstract class EhCallback<E : Fragment?, T>(context: Context) : EhClient.Callback<T> {
+    val application: EhApplication
+
+    init {
+        application = context.applicationContext as EhApplication
+    }
+
+    val content: Context
+        get() {
+            var context: Context? = application.topActivity
+            if (context == null) {
+                context = application
+            }
+            return context
+        }
+
+    fun showTip(@StringRes id: Int, length: Int) {
+        val activity = application.topActivity
+        if (activity is MainActivity) {
+            activity.showTip(id, length)
+        } else {
+            Toast.makeText(
+                application, id,
+                if (length == BaseScene.LENGTH_LONG) Toast.LENGTH_LONG else Toast.LENGTH_SHORT
+            ).show()
+        }
+    }
+
+    fun showTip(tip: String, length: Int) {
+        val activity = application.topActivity
+        if (activity is MainActivity) {
+            activity.showTip(tip, length)
+        } else {
+            Toast.makeText(
+                application, tip,
+                if (length == BaseScene.LENGTH_LONG) Toast.LENGTH_LONG else Toast.LENGTH_SHORT
+            ).show()
+        }
+    }
+}

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.java

@@ -1,245 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.ui.scene;
-
-import android.annotation.SuppressLint;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.StaggeredGridLayoutManager;
-
-import com.hippo.drawable.TriangleDrawable;
-import com.hippo.easyrecyclerview.MarginItemDecoration;
-import com.hippo.ehviewer.EhApplication;
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.Settings;
-import com.hippo.ehviewer.client.EhCacheKeyFactory;
-import com.hippo.ehviewer.client.EhUtils;
-import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.ehviewer.download.DownloadManager;
-import com.hippo.ehviewer.widget.TileThumb;
-import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager;
-import com.hippo.yorozuya.ViewUtils;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-abstract class GalleryAdapter extends RecyclerView.Adapter<GalleryHolder> {
-
-    public static final int TYPE_INVALID = -1;
-    public static final int TYPE_LIST = 0;
-    public static final int TYPE_GRID = 1;
-    private final LayoutInflater mInflater;
-    private final Resources mResources;
-    private final RecyclerView mRecyclerView;
-    private final AutoStaggeredGridLayoutManager mLayoutManager;
-    private final int mPaddingTopSB;
-    private final int mListThumbWidth;
-    private final int mListThumbHeight;
-    private final boolean mShowFavourited;
-    private final DownloadManager mDownloadManager;
-    private MarginItemDecoration mListDecoration;
-    private MarginItemDecoration mGirdDecoration;
-    private int mType = TYPE_INVALID;
-
-    public GalleryAdapter(@NonNull LayoutInflater inflater, @NonNull Resources resources,
-                          @NonNull RecyclerView recyclerView, int type, boolean showFavourited) {
-        mInflater = inflater;
-        mResources = resources;
-        mRecyclerView = recyclerView;
-        mLayoutManager = new AutoStaggeredGridLayoutManager(0, StaggeredGridLayoutManager.VERTICAL);
-        mPaddingTopSB = resources.getDimensionPixelOffset(R.dimen.gallery_padding_top_search_bar);
-        mShowFavourited = showFavourited;
-
-        mRecyclerView.setAdapter(this);
-        mRecyclerView.setLayoutManager(mLayoutManager);
-
-        @SuppressLint("InflateParams") View calculator = inflater.inflate(R.layout.item_gallery_list_thumb_height, null);
-        ViewUtils.measureView(calculator, 1024, ViewGroup.LayoutParams.WRAP_CONTENT);
-        mListThumbHeight = calculator.getMeasuredHeight();
-        mListThumbWidth = mListThumbHeight * 2 / 3;
-
-        setType(type);
-
-        mDownloadManager = EhApplication.getDownloadManager();
-    }
-
-    private void adjustPaddings() {
-        RecyclerView recyclerView = mRecyclerView;
-        recyclerView.setPadding(recyclerView.getPaddingLeft(), recyclerView.getPaddingTop() + mPaddingTopSB,
-                recyclerView.getPaddingRight(), recyclerView.getPaddingBottom());
-    }
-
-    public int getType() {
-        return mType;
-    }
-
-    public void setType(int type) {
-        if (type == mType) {
-            return;
-        }
-        mType = type;
-
-        RecyclerView recyclerView = mRecyclerView;
-        switch (type) {
-            case GalleryAdapter.TYPE_LIST -> {
-                int columnWidth = mResources.getDimensionPixelOffset(Settings.getDetailSizeResId());
-                mLayoutManager.setColumnSize(columnWidth);
-                mLayoutManager.setStrategy(AutoStaggeredGridLayoutManager.STRATEGY_MIN_SIZE);
-                if (null != mGirdDecoration) {
-                    recyclerView.removeItemDecoration(mGirdDecoration);
-                }
-                if (null == mListDecoration) {
-                    int interval = mResources.getDimensionPixelOffset(R.dimen.gallery_list_interval);
-                    int paddingH = mResources.getDimensionPixelOffset(R.dimen.gallery_list_margin_h);
-                    int paddingV = mResources.getDimensionPixelOffset(R.dimen.gallery_list_margin_v);
-                    mListDecoration = new MarginItemDecoration(interval, paddingH, paddingV, paddingH, paddingV);
-                }
-                recyclerView.addItemDecoration(mListDecoration);
-                adjustPaddings();
-                notifyDataSetChanged();
-            }
-            case GalleryAdapter.TYPE_GRID -> {
-                int columnWidth = Settings.getThumbSize();
-                mLayoutManager.setColumnSize(columnWidth);
-                mLayoutManager.setStrategy(AutoStaggeredGridLayoutManager.STRATEGY_SUITABLE_SIZE);
-                if (null != mListDecoration) {
-                    recyclerView.removeItemDecoration(mListDecoration);
-                }
-                if (null == mGirdDecoration) {
-                    int interval = mResources.getDimensionPixelOffset(R.dimen.gallery_grid_interval);
-                    int paddingH = mResources.getDimensionPixelOffset(R.dimen.gallery_grid_margin_h);
-                    int paddingV = mResources.getDimensionPixelOffset(R.dimen.gallery_grid_margin_v);
-                    mGirdDecoration = new MarginItemDecoration(interval, paddingH, paddingV, paddingH, paddingV);
-                }
-                recyclerView.addItemDecoration(mGirdDecoration);
-                adjustPaddings();
-                notifyDataSetChanged();
-            }
-        }
-    }
-
-    @NonNull
-    @Override
-    public GalleryHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        int layoutId = switch (viewType) {
-            case TYPE_LIST -> R.layout.item_gallery_list;
-            case TYPE_GRID -> R.layout.item_gallery_grid;
-            default -> throw new IllegalStateException("Unexpected value: " + viewType);
-        };
-
-        GalleryHolder holder = new GalleryHolder(mInflater.inflate(layoutId, parent, false));
-
-        if (viewType == TYPE_LIST) {
-            ViewGroup.LayoutParams lp = holder.thumb.getLayoutParams();
-            lp.width = mListThumbWidth;
-            lp.height = mListThumbHeight;
-            holder.thumb.setLayoutParams(lp);
-        }
-
-        holder.card.setOnClickListener(v -> onItemClick(holder.itemView, holder.getBindingAdapterPosition()));
-        holder.card.setOnLongClickListener(v -> onItemLongClick(holder.itemView, holder.getBindingAdapterPosition()));
-
-        return holder;
-    }
-
-    abstract void onItemClick(View view, int position);
-
-    abstract boolean onItemLongClick(View view, int position);
-
-    @Override
-    public int getItemViewType(int position) {
-        return mType;
-    }
-
-    @Nullable
-    public abstract GalleryInfo getDataAt(int position);
-
-    @SuppressLint("SetTextI18n")
-    @Override
-    public void onBindViewHolder(@NonNull GalleryHolder holder, int position) {
-        GalleryInfo gi = getDataAt(position);
-        if (null == gi) {
-            return;
-        }
-
-        switch (mType) {
-            case TYPE_LIST -> {
-                holder.thumb.load(EhCacheKeyFactory.getThumbKey(gi.getGid()), gi.getThumb());
-                holder.title.setText(EhUtils.getSuitableTitle(gi));
-                holder.uploader.setText(gi.getUploader());
-                holder.uploader.setAlpha(gi.getDisowned() ? .5f : 1f);
-                holder.rating.setRating(gi.getRating());
-                TextView category = holder.category;
-                String newCategoryText = EhUtils.getCategory(gi.getCategory());
-                if (!newCategoryText.equals(category.getText().toString())) {
-                    category.setText(newCategoryText);
-                    category.setBackgroundColor(EhUtils.getCategoryColor(gi.getCategory()));
-                }
-                holder.posted.setText(gi.getPosted());
-                if (gi.getPages() == 0 || !Settings.getShowGalleryPages()) {
-                    holder.pages.setText(null);
-                    holder.pages.setVisibility(View.GONE);
-                } else {
-                    holder.pages.setText(gi.getPages() + "P");
-                    holder.pages.setVisibility(View.VISIBLE);
-                }
-                if (TextUtils.isEmpty(gi.getSimpleLanguage())) {
-                    holder.simpleLanguage.setText(null);
-                    holder.simpleLanguage.setVisibility(View.GONE);
-                } else {
-                    holder.simpleLanguage.setText(gi.getSimpleLanguage());
-                    holder.simpleLanguage.setVisibility(View.VISIBLE);
-                }
-                holder.favourited.setVisibility((mShowFavourited && gi.getFavoriteSlot() >= -1 && gi.getFavoriteSlot() <= 10) ? View.VISIBLE : View.GONE);
-                holder.downloaded.setVisibility(mDownloadManager.containDownloadInfo(gi.getGid()) ? View.VISIBLE : View.GONE);
-            }
-            case TYPE_GRID -> {
-                ((TileThumb) holder.thumb).setThumbSize(gi.getThumbWidth(), gi.getThumbHeight());
-                holder.thumb.load(EhCacheKeyFactory.getThumbKey(gi.getGid()), gi.getThumb());
-                View category = holder.category;
-                Drawable drawable = category.getBackground();
-                int color = EhUtils.getCategoryColor(gi.getCategory());
-                if (!(drawable instanceof TriangleDrawable)) {
-                    drawable = new TriangleDrawable(color);
-                    category.setBackground(drawable);
-                } else {
-                    ((TriangleDrawable) drawable).setColor(color);
-                }
-                holder.simpleLanguage.setText(gi.getSimpleLanguage());
-            }
-        }
-
-        // Update transition name
-        ViewCompat.setTransitionName(holder.thumb, TransitionNameFactory.getThumbTransitionName(gi.getGid()));
-    }
-
-    @IntDef({TYPE_LIST, TYPE_GRID})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface Type {
-    }
-}

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt

@@ -0,0 +1,235 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * 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 com.hippo.ehviewer.ui.scene
+
+import android.annotation.SuppressLint
+import android.content.res.Resources
+import android.text.TextUtils
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.IntDef
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import com.hippo.drawable.TriangleDrawable
+import com.hippo.easyrecyclerview.MarginItemDecoration
+import com.hippo.ehviewer.EhApplication.Companion.downloadManager
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.client.EhCacheKeyFactory
+import com.hippo.ehviewer.client.EhUtils
+import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.dao.LocalFavoriteInfo
+import com.hippo.ehviewer.download.DownloadManager
+import com.hippo.ehviewer.widget.TileThumb
+import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager
+import com.hippo.yorozuya.ViewUtils
+
+internal abstract class GalleryAdapter(
+    private val mInflater: LayoutInflater, private val mResources: Resources,
+    private val mRecyclerView: RecyclerView, type: Int, showFavourited: Boolean
+) : RecyclerView.Adapter<GalleryHolder>() {
+    private val mLayoutManager: AutoStaggeredGridLayoutManager =
+        AutoStaggeredGridLayoutManager(0, StaggeredGridLayoutManager.VERTICAL)
+    private val mPaddingTopSB: Int =
+        mResources.getDimensionPixelOffset(R.dimen.gallery_padding_top_search_bar)
+    private val mListThumbWidth: Int
+    private val mListThumbHeight: Int
+    private val mShowFavourited: Boolean
+    private val mDownloadManager: DownloadManager
+    private var mListDecoration: MarginItemDecoration? = null
+    private var mGirdDecoration: MarginItemDecoration? = null
+    private var mType = TYPE_INVALID
+
+    var type: Int
+        get() = mType
+        set(type) {
+            if (type == mType) {
+                return
+            }
+            mType = type
+            val recyclerView = mRecyclerView
+            when (type) {
+                TYPE_LIST -> {
+                    val columnWidth =
+                        mResources.getDimensionPixelOffset(Settings.getDetailSizeResId())
+                    mLayoutManager.setColumnSize(columnWidth)
+                    mLayoutManager.setStrategy(AutoStaggeredGridLayoutManager.STRATEGY_MIN_SIZE)
+                    if (null != mGirdDecoration) {
+                        recyclerView.removeItemDecoration(mGirdDecoration!!)
+                    }
+                    if (null == mListDecoration) {
+                        val interval =
+                            mResources.getDimensionPixelOffset(R.dimen.gallery_list_interval)
+                        val paddingH =
+                            mResources.getDimensionPixelOffset(R.dimen.gallery_list_margin_h)
+                        val paddingV =
+                            mResources.getDimensionPixelOffset(R.dimen.gallery_list_margin_v)
+                        mListDecoration =
+                            MarginItemDecoration(interval, paddingH, paddingV, paddingH, paddingV)
+                    }
+                    recyclerView.addItemDecoration(mListDecoration!!)
+                    adjustPaddings()
+                    notifyDataSetChanged()
+                }
+
+                TYPE_GRID -> {
+                    val columnWidth = Settings.getThumbSize()
+                    mLayoutManager.setColumnSize(columnWidth)
+                    mLayoutManager.setStrategy(AutoStaggeredGridLayoutManager.STRATEGY_SUITABLE_SIZE)
+                    if (null != mListDecoration) {
+                        recyclerView.removeItemDecoration(mListDecoration!!)
+                    }
+                    if (null == mGirdDecoration) {
+                        val interval =
+                            mResources.getDimensionPixelOffset(R.dimen.gallery_grid_interval)
+                        val paddingH =
+                            mResources.getDimensionPixelOffset(R.dimen.gallery_grid_margin_h)
+                        val paddingV =
+                            mResources.getDimensionPixelOffset(R.dimen.gallery_grid_margin_v)
+                        mGirdDecoration =
+                            MarginItemDecoration(interval, paddingH, paddingV, paddingH, paddingV)
+                    }
+                    recyclerView.addItemDecoration(mGirdDecoration!!)
+                    adjustPaddings()
+                    notifyDataSetChanged()
+                }
+            }
+        }
+
+    init {
+        mShowFavourited = showFavourited
+        mRecyclerView.adapter = this
+        mRecyclerView.layoutManager = mLayoutManager
+        @SuppressLint("InflateParams") val calculator =
+            mInflater.inflate(R.layout.item_gallery_list_thumb_height, null)
+        ViewUtils.measureView(calculator, 1024, ViewGroup.LayoutParams.WRAP_CONTENT)
+        mListThumbHeight = calculator.measuredHeight
+        mListThumbWidth = mListThumbHeight * 2 / 3
+        this.type = type
+        mDownloadManager = downloadManager
+    }
+
+    private fun adjustPaddings() {
+        val recyclerView = mRecyclerView
+        recyclerView.setPadding(
+            recyclerView.paddingLeft, recyclerView.paddingTop + mPaddingTopSB,
+            recyclerView.paddingRight, recyclerView.paddingBottom
+        )
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GalleryHolder {
+        val layoutId = when (viewType) {
+            TYPE_LIST -> R.layout.item_gallery_list
+            TYPE_GRID -> R.layout.item_gallery_grid
+            else -> throw IllegalStateException("Unexpected value: $viewType")
+        }
+        val holder = GalleryHolder(mInflater.inflate(layoutId, parent, false))
+        if (viewType == TYPE_LIST) {
+            val lp = holder.thumb.layoutParams
+            lp.width = mListThumbWidth
+            lp.height = mListThumbHeight
+            holder.thumb.layoutParams = lp
+        }
+        holder.card.setOnClickListener {
+            onItemClick(
+                holder.itemView,
+                holder.bindingAdapterPosition
+            )
+        }
+        holder.card.setOnLongClickListener {
+            onItemLongClick(
+                holder.itemView,
+                holder.bindingAdapterPosition
+            )
+        }
+        return holder
+    }
+
+    abstract fun onItemClick(view: View, position: Int)
+    abstract fun onItemLongClick(view: View, position: Int): Boolean
+    override fun getItemViewType(position: Int): Int {
+        return mType
+    }
+
+    abstract fun getDataAt(position: Int): GalleryInfo?
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: GalleryHolder, position: Int) {
+        val gi = getDataAt(position) ?: return
+        if (gi is LocalFavoriteInfo) {
+            gi.thumb = EhUtils.fixThumbUrl(gi.thumb!!)
+        }
+        when (mType) {
+            TYPE_LIST -> {
+                holder.thumb.load(EhCacheKeyFactory.getThumbKey(gi.gid), gi.thumb!!)
+                holder.title!!.text = EhUtils.getSuitableTitle(gi)
+                holder.uploader!!.text = gi.uploader
+                holder.uploader.alpha = if (gi.disowned) .5f else 1f
+                holder.rating!!.rating = gi.rating
+                val category = holder.category
+                val newCategoryText = EhUtils.getCategory(gi.category)
+                if (newCategoryText != category.text.toString()) {
+                    category.text = newCategoryText
+                    category.setBackgroundColor(EhUtils.getCategoryColor(gi.category))
+                }
+                holder.posted!!.text = gi.posted
+                if (gi.pages == 0 || !Settings.getShowGalleryPages()) {
+                    holder.pages?.text = null
+                    holder.pages!!.visibility = View.GONE
+                } else {
+                    holder.pages!!.text = gi.pages.toString() + "P"
+                    holder.pages.visibility = View.VISIBLE
+                }
+                if (TextUtils.isEmpty(gi.simpleLanguage)) {
+                    holder.simpleLanguage.text = null
+                    holder.simpleLanguage.visibility = View.GONE
+                } else {
+                    holder.simpleLanguage.text = gi.simpleLanguage
+                    holder.simpleLanguage.visibility = View.VISIBLE
+                }
+                holder.favourited!!.visibility =
+                    if (mShowFavourited && gi.favoriteSlot >= -1 && gi.favoriteSlot <= 10) View.VISIBLE else View.GONE
+                holder.downloaded!!.visibility =
+                    if (mDownloadManager.containDownloadInfo(gi.gid)) View.VISIBLE else View.GONE
+            }
+
+            TYPE_GRID -> {
+                (holder.thumb as TileThumb).setThumbSize(gi.thumbWidth, gi.thumbHeight)
+                holder.thumb.load(EhCacheKeyFactory.getThumbKey(gi.gid), gi.thumb!!)
+                val category: View = holder.category
+                var drawable = category.background
+                val color = EhUtils.getCategoryColor(gi.category)
+                if (drawable !is TriangleDrawable) {
+                    drawable = TriangleDrawable(color)
+                    category.background = drawable
+                } else {
+                    drawable.setColor(color)
+                }
+                holder.simpleLanguage.text = gi.simpleLanguage
+            }
+        }
+    }
+
+    @IntDef(TYPE_LIST, TYPE_GRID)
+    @Retention(AnnotationRetention.SOURCE)
+    annotation class Type
+    companion object {
+        const val TYPE_INVALID = -1
+        const val TYPE_LIST = 0
+        const val TYPE_GRID = 1
+    }
+}

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java

@@ -1,972 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.ui.scene;
-
-import android.animation.Animator;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.Looper;
-import android.text.Html;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.ClickableSpan;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.RelativeSizeSpan;
-import android.text.style.StyleSpan;
-import android.text.style.URLSpan;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewAnimationUtils;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.activity.OnBackPressedCallback;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsAnimationCompat;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.hippo.app.BaseDialogBuilder;
-import com.hippo.easyrecyclerview.EasyRecyclerView;
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.UrlOpener;
-import com.hippo.ehviewer.WindowInsetsAnimationHelper;
-import com.hippo.ehviewer.client.EhClient;
-import com.hippo.ehviewer.client.EhFilter;
-import com.hippo.ehviewer.client.EhRequest;
-import com.hippo.ehviewer.client.EhUrl;
-import com.hippo.ehviewer.client.data.GalleryComment;
-import com.hippo.ehviewer.client.data.GalleryCommentList;
-import com.hippo.ehviewer.client.data.GalleryDetail;
-import com.hippo.ehviewer.client.data.ListUrlBuilder;
-import com.hippo.ehviewer.client.parser.VoteCommentParser;
-import com.hippo.ehviewer.dao.Filter;
-import com.hippo.ehviewer.ui.MainActivity;
-import com.hippo.text.URLImageGetter;
-import com.hippo.util.ClipboardUtilKt;
-import com.hippo.util.ExceptionUtils;
-import com.hippo.util.ReadableTime;
-import com.hippo.util.TextUrl;
-import com.hippo.view.ViewTransition;
-import com.hippo.widget.FabLayout;
-import com.hippo.widget.LinkifyTextView;
-import com.hippo.widget.ObservedTextView;
-import com.hippo.yorozuya.AnimationUtils;
-import com.hippo.yorozuya.AssertUtils;
-import com.hippo.yorozuya.SimpleAnimatorListener;
-import com.hippo.yorozuya.StringUtils;
-import com.hippo.yorozuya.ViewUtils;
-import com.hippo.yorozuya.collect.IntList;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import rikka.core.res.ResourcesKt;
-
-public final class GalleryCommentsScene extends BaseToolbarScene
-        implements View.OnClickListener, SwipeRefreshLayout.OnRefreshListener {
-
-    public static final String TAG = GalleryCommentsScene.class.getSimpleName();
-
-    public static final String KEY_API_UID = "api_uid";
-    public static final String KEY_API_KEY = "api_key";
-    public static final String KEY_GID = "gid";
-    public static final String KEY_TOKEN = "token";
-    public static final String KEY_COMMENT_LIST = "comment_list";
-    public static final String KEY_GALLERY_DETAIL = "gallery_detail";
-    private static final int TYPE_COMMENT = 0;
-    private static final int TYPE_MORE = 1;
-    private static final int TYPE_PROGRESS = 2;
-    private final EditPanelOnBackPressedCallback mCallback = new EditPanelOnBackPressedCallback();
-    private GalleryDetail mGalleryDetail;
-    @Nullable
-    private EasyRecyclerView mRecyclerView;
-    @Nullable
-    private FabLayout mFabLayout;
-    @Nullable
-    private FloatingActionButton mFab;
-    @Nullable
-    private View mEditPanel;
-    @Nullable
-    private ImageView mSendImage;
-    @Nullable
-    private EditText mEditText;
-    @Nullable
-    private CommentAdapter mAdapter;
-    @Nullable
-    private ViewTransition mViewTransition;
-    private SwipeRefreshLayout mRefreshLayout;
-    private Drawable mSendDrawable;
-    private Drawable mPencilDrawable;
-    private long mCommentId;
-    private boolean mInAnimation = false;
-    private boolean mShowAllComments = false;
-    private boolean mRefreshingComments = false;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requireActivity().getOnBackPressedDispatcher().addCallback(mCallback);
-        if (savedInstanceState == null) {
-            onInit();
-        } else {
-            onRestore(savedInstanceState);
-        }
-    }
-
-    private void handleArgs(Bundle args) {
-        if (args == null) {
-            return;
-        }
-
-        mGalleryDetail = args.getParcelable(KEY_GALLERY_DETAIL);
-        mShowAllComments = mGalleryDetail != null && mGalleryDetail.comments != null && !mGalleryDetail.comments.hasMore;
-    }
-
-    private void onInit() {
-        handleArgs(getArguments());
-    }
-
-    private void onRestore(@NonNull Bundle savedInstanceState) {
-        mGalleryDetail = savedInstanceState.getParcelable(KEY_GALLERY_DETAIL);
-        mShowAllComments = mGalleryDetail != null && mGalleryDetail.comments != null && !mGalleryDetail.comments.hasMore;
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putParcelable(KEY_GALLERY_DETAIL, mGalleryDetail);
-    }
-
-    @NonNull
-    @Override
-    public View onCreateViewWithToolbar(LayoutInflater inflater,
-                                        @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        ViewGroup view = (ViewGroup) inflater.inflate(R.layout.scene_gallery_comments, container, false);
-        mRecyclerView = (EasyRecyclerView) ViewUtils.$$(view, R.id.recycler_view);
-        setLiftOnScrollTargetView(mRecyclerView);
-        TextView tip = (TextView) ViewUtils.$$(view, R.id.tip);
-        mEditPanel = ViewUtils.$$(view, R.id.edit_panel);
-        mSendImage = (ImageView) ViewUtils.$$(mEditPanel, R.id.send);
-        mEditText = (EditText) ViewUtils.$$(mEditPanel, R.id.edit_text);
-        mFabLayout = (FabLayout) ViewUtils.$$(view, R.id.fab_layout);
-        mFab = (FloatingActionButton) ViewUtils.$$(view, R.id.fab);
-        mRefreshLayout = (SwipeRefreshLayout) ViewUtils.$$(view, R.id.refresh_layout);
-
-
-        // Workaround for fab and edittext render out of screen
-        view.removeView(mFabLayout);
-        view.removeView((View) mEditPanel.getParent());
-        assert container != null;
-        container.addView(mFabLayout);
-        container.addView((View) mEditPanel.getParent());
-
-        ViewCompat.setWindowInsetsAnimationCallback(view, new WindowInsetsAnimationHelper(
-                WindowInsetsAnimationCompat.Callback.DISPATCH_MODE_STOP,
-                mEditPanel,
-                mFabLayout
-        ));
-        mRefreshLayout.setOnRefreshListener(this);
-
-        Context context = requireContext();
-
-        Drawable drawable = ContextCompat.getDrawable(context, R.drawable.big_sad_pandroid);
-        drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
-        tip.setCompoundDrawables(null, drawable, null, null);
-
-        mSendDrawable = ContextCompat.getDrawable(context, R.drawable.v_send_dark_x24);
-        mPencilDrawable = ContextCompat.getDrawable(context, R.drawable.v_pencil_dark_x24);
-
-        mAdapter = new CommentAdapter();
-        mRecyclerView.setAdapter(mAdapter);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(context,
-                RecyclerView.VERTICAL, false));
-        mRecyclerView.setHasFixedSize(true);
-        // Cancel change animator
-        RecyclerView.ItemAnimator itemAnimator = mRecyclerView.getItemAnimator();
-        if (itemAnimator instanceof DefaultItemAnimator) {
-            ((DefaultItemAnimator) itemAnimator).setSupportsChangeAnimations(false);
-        }
-
-        mSendImage.setOnClickListener(this);
-        mFab.setOnClickListener(this);
-
-        addAboveSnackView(mEditPanel);
-        addAboveSnackView(mFabLayout);
-
-        mViewTransition = new ViewTransition(mRecyclerView, tip);
-
-        updateView(false);
-
-        return view;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mCallback.remove();
-
-        if (null != mRecyclerView) {
-            mRecyclerView.stopScroll();
-            mRecyclerView = null;
-        }
-        if (null != mEditPanel) {
-            removeAboveSnackView(mEditPanel);
-            mEditPanel = null;
-        }
-        if (null != mFabLayout) {
-            removeAboveSnackView(mFabLayout);
-            mFabLayout = null;
-        }
-
-        mFab = null;
-        mSendImage = null;
-        mEditText = null;
-        mAdapter = null;
-        mViewTransition = null;
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        setTitle(R.string.gallery_comments);
-        setNavigationIcon(R.drawable.v_arrow_left_dark_x24);
-    }
-
-    private void showFilterCommenterDialog(String commenter, int position) {
-        Context context = getContext();
-        if (context == null || commenter == null) {
-            return;
-        }
-
-        new BaseDialogBuilder(context)
-                .setMessage(getString(R.string.filter_the_commenter, commenter))
-                .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                    Filter filter = new Filter();
-                    filter.mode = EhFilter.MODE_COMMENTER;
-                    filter.text = commenter;
-                    EhFilter.getInstance().addFilter(filter);
-                    hideComment(position);
-                    showTip(R.string.filter_added, LENGTH_SHORT);
-                })
-                .setNegativeButton(android.R.string.cancel, null)
-                .show();
-    }
-
-    private void hideComment(int position) {
-        if (mGalleryDetail == null || mGalleryDetail.comments == null || mGalleryDetail.comments.comments == null) {
-            return;
-        }
-
-        GalleryComment[] oldCommentsList = mGalleryDetail.comments.comments;
-        GalleryComment[] newCommentsList = new GalleryComment[oldCommentsList.length - 1];
-        for (int i = 0, j = 0; i < oldCommentsList.length; i++) {
-            if (i != position) {
-                newCommentsList[j] = oldCommentsList[i];
-                j++;
-            }
-        }
-
-        mGalleryDetail.comments.comments = newCommentsList;
-        mAdapter.notifyDataSetChanged();
-        updateView(true);
-    }
-
-    private void voteComment(long id, int vote) {
-        Context context = getContext();
-        MainActivity activity = getMainActivity();
-        if (null == context || null == activity) {
-            return;
-        }
-
-        EhRequest request = new EhRequest()
-                .setMethod(EhClient.METHOD_VOTE_COMMENT)
-                .setArgs(mGalleryDetail.apiUid, mGalleryDetail.apiKey, mGalleryDetail.getGid(), mGalleryDetail.getToken(), id, vote)
-                .setCallback(new VoteCommentListener(context));
-        request.enqueue(this);
-    }
-
-    @SuppressLint("InflateParams")
-    public void showVoteStatusDialog(Context context, String voteStatus) {
-        String[] temp = StringUtils.split(voteStatus, ',');
-        final int length = temp.length;
-        final String[] userArray = new String[length];
-        final String[] voteArray = new String[length];
-        for (int i = 0; i < length; i++) {
-            String str = StringUtils.trim(temp[i]);
-            int index = str.lastIndexOf(' ');
-            if (index < 0) {
-                Log.d(TAG, "Something wrong happened about vote state");
-                userArray[i] = str;
-                voteArray[i] = "";
-            } else {
-                userArray[i] = StringUtils.trim(str.substring(0, index));
-                voteArray[i] = StringUtils.trim(str.substring(index + 1));
-            }
-        }
-
-        BaseDialogBuilder builder = new BaseDialogBuilder(context);
-        context = builder.getContext();
-        final LayoutInflater inflater = LayoutInflater.from(context);
-        EasyRecyclerView rv = (EasyRecyclerView) inflater.inflate(R.layout.dialog_recycler_view, null);
-        rv.setAdapter(new RecyclerView.Adapter<InfoHolder>() {
-            @NonNull
-            @Override
-            public InfoHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-                return new InfoHolder(inflater.inflate(R.layout.item_drawer_favorites, parent, false));
-            }
-
-            @Override
-            public void onBindViewHolder(@NonNull InfoHolder holder, int position) {
-                holder.key.setText(userArray[position]);
-                holder.value.setText(voteArray[position]);
-            }
-
-            @Override
-            public int getItemCount() {
-                return length;
-            }
-        });
-        rv.setLayoutManager(new LinearLayoutManager(context));
-        rv.setClipToPadding(false);
-        builder.setView(rv).show();
-    }
-
-    private void showCommentDialog(int position) {
-        final Context context = getContext();
-        if (context == null || mGalleryDetail == null || mGalleryDetail.comments == null || mGalleryDetail.comments.comments == null || position >= mGalleryDetail.comments.comments.length || position < 0) {
-            return;
-        }
-
-        final GalleryComment comment = mGalleryDetail.comments.comments[position];
-        List<String> menu = new ArrayList<>();
-        final IntList menuId = new IntList();
-        Resources resources = context.getResources();
-
-        menu.add(resources.getString(R.string.copy_comment_text));
-        menuId.add(R.id.copy);
-        if (!comment.uploader && !comment.editable) {
-            menu.add(resources.getString(R.string.block_commenter));
-            menuId.add(R.id.block_commenter);
-        }
-        if (comment.editable) {
-            menu.add(resources.getString(R.string.edit_comment));
-            menuId.add(R.id.edit_comment);
-        }
-        if (comment.voteUpAble) {
-            menu.add(resources.getString(comment.voteUpEd ? R.string.cancel_vote_up : R.string.vote_up));
-            menuId.add(R.id.vote_up);
-        }
-        if (comment.voteDownAble) {
-            menu.add(resources.getString(comment.voteDownEd ? R.string.cancel_vote_down : R.string.vote_down));
-            menuId.add(R.id.vote_down);
-        }
-        if (!TextUtils.isEmpty(comment.voteState)) {
-            menu.add(resources.getString(R.string.check_vote_status));
-            menuId.add(R.id.check_vote_status);
-        }
-
-        new BaseDialogBuilder(context)
-                .setItems(menu.toArray(new String[0]), (dialog, which) -> {
-                    if (which < 0 || which >= menuId.size()) {
-                        return;
-                    }
-                    int id = menuId.get(which);
-                    if (id == R.id.copy) {
-                        ClipboardUtilKt.addTextToClipboard(requireActivity(), comment.comment, false);
-                    } else if (id == R.id.block_commenter) {
-                        showFilterCommenterDialog(comment.user, position);
-                    } else if (id == R.id.vote_up) {
-                        voteComment(comment.id, 1);
-                    } else if (id == R.id.vote_down) {
-                        voteComment(comment.id, -1);
-                    } else if (id == R.id.check_vote_status) {
-                        showVoteStatusDialog(context, comment.voteState);
-                    } else if (id == R.id.edit_comment) {
-                        prepareEditComment(comment.id);
-                        if (!mInAnimation && mEditPanel != null && mEditPanel.getVisibility() != View.VISIBLE) {
-                            showEditPanel(true);
-                        }
-                    }
-                }).show();
-    }
-
-    public boolean onItemClick(EasyRecyclerView parent, View view, int position) {
-        MainActivity activity = getMainActivity();
-        if (null == activity) {
-            return false;
-        }
-
-        RecyclerView.ViewHolder holder = parent.getChildViewHolder(view);
-        if (holder instanceof ActualCommentHolder commentHolder) {
-            ClickableSpan span = commentHolder.comment.getCurrentSpan();
-            commentHolder.comment.clearCurrentSpan();
-
-            if (span instanceof URLSpan) {
-                UrlOpener.openUrl(activity, ((URLSpan) span).getURL(), true, mGalleryDetail);
-            } else {
-                showCommentDialog(position);
-            }
-        } else if (holder instanceof MoreCommentHolder && !mRefreshingComments && mAdapter != null) {
-            mRefreshingComments = true;
-            mShowAllComments = true;
-            mAdapter.notifyItemChanged(position);
-
-            String url = getGalleryDetailUrl();
-            if (url != null) {
-                // Request
-                EhRequest request = new EhRequest()
-                        .setMethod(EhClient.METHOD_GET_GALLERY_DETAIL)
-                        .setArgs(url)
-                        .setCallback(new RefreshCommentListener(activity));
-                request.enqueue(this);
-            }
-        }
-
-        return true;
-    }
-
-    private void updateView(boolean animation) {
-        if (null == mViewTransition) {
-            return;
-        }
-
-        if (mGalleryDetail == null || mGalleryDetail.comments == null || mGalleryDetail.comments.comments == null || mGalleryDetail.comments.comments.length <= 0) {
-            mViewTransition.showView(1, animation);
-        } else {
-            mViewTransition.showView(0, animation);
-        }
-    }
-
-    private void prepareNewComment() {
-        mCommentId = 0;
-        if (mSendImage != null) {
-            mSendImage.setImageDrawable(mSendDrawable);
-        }
-    }
-
-    private void prepareEditComment(long commentId) {
-        mCommentId = commentId;
-        if (mSendImage != null) {
-            mSendImage.setImageDrawable(mPencilDrawable);
-        }
-    }
-
-    private void showEditPanelWithAnimation() {
-        if (null == mFab || null == mEditPanel) {
-            return;
-        }
-
-        mInAnimation = true;
-        mFab.setTranslationX(0.0f);
-        mFab.setTranslationY(0.0f);
-        mFab.setScaleX(1.0f);
-        mFab.setScaleY(1.0f);
-        int fabEndX = mEditPanel.getLeft() + (mEditPanel.getWidth() / 2) - (mFab.getWidth() / 2);
-        int fabEndY = mEditPanel.getTop() + (mEditPanel.getHeight() / 2) - (mFab.getHeight() / 2);
-        mFab.animate().x(fabEndX).y(fabEndY).scaleX(0.0f).scaleY(0.0f)
-                .setInterpolator(AnimationUtils.SLOW_FAST_SLOW_INTERPOLATOR)
-                .setDuration(300L).setListener(new SimpleAnimatorListener() {
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        if (null == mFab || null == mEditPanel) {
-                            return;
-                        }
-
-                        ((View) mFab).setVisibility(View.INVISIBLE);
-                        mEditPanel.setVisibility(View.VISIBLE);
-                        int halfW = mEditPanel.getWidth() / 2;
-                        int halfH = mEditPanel.getHeight() / 2;
-                        Animator animator = ViewAnimationUtils.createCircularReveal(mEditPanel, halfW, halfH, 0,
-                                (float) Math.hypot(halfW, halfH)).setDuration(300L);
-                        animator.addListener(new SimpleAnimatorListener() {
-                            @Override
-                            public void onAnimationEnd(Animator a) {
-                                mInAnimation = false;
-                            }
-                        });
-                        animator.start();
-                    }
-                }).start();
-    }
-
-    private void showEditPanel(boolean animation) {
-        mCallback.setEnabled(true);
-        if (animation) {
-            showEditPanelWithAnimation();
-        } else {
-            if (null == mFab || null == mEditPanel) {
-                return;
-            }
-
-            ((View) mFab).setVisibility(View.INVISIBLE);
-            mEditPanel.setVisibility(View.VISIBLE);
-        }
-    }
-
-    private void hideEditPanelWithAnimation() {
-        if (null == mFab || null == mEditPanel) {
-            return;
-        }
-
-        mInAnimation = true;
-        int halfW = mEditPanel.getWidth() / 2;
-        int halfH = mEditPanel.getHeight() / 2;
-        Animator animator = ViewAnimationUtils.createCircularReveal(mEditPanel, halfW, halfH,
-                (float) Math.hypot(halfW, halfH), 0.0f).setDuration(300L);
-        animator.addListener(new SimpleAnimatorListener() {
-            @Override
-            public void onAnimationEnd(Animator a) {
-                if (null == mFab || null == mEditPanel) {
-                    return;
-                }
-
-                if (Looper.myLooper() != Looper.getMainLooper()) {
-                    // Some devices may run this block in non-UI thread.
-                    // It might be a bug of Android OS.
-                    // Check it here to avoid crash.
-                    return;
-                }
-
-                mEditPanel.setVisibility(View.GONE);
-                ((View) mFab).setVisibility(View.VISIBLE);
-                int fabStartX = mEditPanel.getLeft() + (mEditPanel.getWidth() / 2) - (mFab.getWidth() / 2);
-                int fabStartY = mEditPanel.getTop() + (mEditPanel.getHeight() / 2) - (mFab.getHeight() / 2);
-                mFab.setX(fabStartX);
-                mFab.setY(fabStartY);
-                mFab.setScaleX(0.0f);
-                mFab.setScaleY(0.0f);
-                mFab.setRotation(-45.0f);
-                mFab.animate().translationX(0.0f).translationY(0.0f).scaleX(1.0f).scaleY(1.0f).rotation(0.0f)
-                        .setInterpolator(AnimationUtils.SLOW_FAST_SLOW_INTERPOLATOR)
-                        .setDuration(300L).setListener(new SimpleAnimatorListener() {
-                            @Override
-                            public void onAnimationEnd(Animator animation) {
-                                mInAnimation = false;
-                            }
-                        }).start();
-            }
-        });
-        animator.start();
-    }
-
-    private void hideEditPanel(boolean animation) {
-        mCallback.setEnabled(false);
-        hideSoftInput();
-        if (animation) {
-            hideEditPanelWithAnimation();
-        } else {
-            if (null == mFab || null == mEditPanel) {
-                return;
-            }
-
-            ((View) mFab).setVisibility(View.VISIBLE);
-            mEditPanel.setVisibility(View.INVISIBLE);
-        }
-    }
-
-    @Nullable
-    private String getGalleryDetailUrl() {
-        if (mGalleryDetail != null && mGalleryDetail.getGid() != -1 && mGalleryDetail.getToken() != null) {
-            return EhUrl.getGalleryDetailUrl(mGalleryDetail.getGid(), mGalleryDetail.getToken(), 0, mShowAllComments);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        Context context = getContext();
-        MainActivity activity = getMainActivity();
-        if (null == context || null == activity || null == mEditText) {
-            return;
-        }
-
-        if (mFab == v) {
-            if (!mInAnimation) {
-                prepareNewComment();
-                showEditPanel(true);
-            }
-        } else if (mSendImage == v) {
-            if (!mInAnimation) {
-                String comment = mEditText.getText().toString();
-                if (TextUtils.isEmpty(comment)) {
-                    // Comment is empty
-                    return;
-                }
-                String url = getGalleryDetailUrl();
-                if (url == null) {
-                    return;
-                }
-                // Request
-                EhRequest request = new EhRequest()
-                        .setMethod(EhClient.METHOD_GET_COMMENT_GALLERY)
-                        .setArgs(url, comment, mCommentId != 0 ? Long.toString(mCommentId) : null)
-                        .setCallback(new CommentGalleryListener(context, mCommentId));
-                request.enqueue(this);
-                hideSoftInput();
-                hideEditPanel(true);
-            }
-        }
-    }
-
-    private void onRefreshGallerySuccess(GalleryCommentList result) {
-        if (mGalleryDetail == null || mAdapter == null) {
-            return;
-        }
-
-        mRefreshLayout.setRefreshing(false);
-        mRefreshingComments = false;
-        mGalleryDetail.comments = result;
-        mAdapter.notifyDataSetChanged();
-
-        updateView(true);
-    }
-
-    private void onRefreshGalleryFailure() {
-        if (mAdapter == null) {
-            return;
-        }
-
-        mRefreshLayout.setRefreshing(false);
-        mRefreshingComments = false;
-        int position = mAdapter.getItemCount() - 1;
-        if (position >= 0) {
-            mAdapter.notifyItemChanged(position);
-        }
-    }
-
-    private void onCommentGallerySuccess(GalleryCommentList result) {
-        if (mGalleryDetail == null || mAdapter == null) {
-            return;
-        }
-
-        mGalleryDetail.comments = result;
-        mAdapter.notifyDataSetChanged();
-
-        // Remove text
-        if (mEditText != null) {
-            mEditText.setText("");
-        }
-
-        updateView(true);
-    }
-
-    private void onVoteCommentSuccess(VoteCommentParser.Result result) {
-        if (mAdapter == null || mGalleryDetail.comments == null || mGalleryDetail.comments.comments == null) {
-            return;
-        }
-
-        int position = -1;
-        for (int i = 0, n = mGalleryDetail.comments.comments.length; i < n; i++) {
-            GalleryComment comment = mGalleryDetail.comments.comments[i];
-            if (comment.id == result.id) {
-                position = i;
-                break;
-            }
-        }
-
-        if (-1 == position) {
-            Log.d(TAG, "Can't find comment with id " + result.id);
-            return;
-        }
-
-        // Update comment
-        GalleryComment comment = mGalleryDetail.comments.comments[position];
-        comment.score = result.score;
-        if (result.expectVote > 0) {
-            comment.voteUpEd = 0 != result.vote;
-            comment.voteDownEd = false;
-        } else {
-            comment.voteDownEd = 0 != result.vote;
-            comment.voteUpEd = false;
-        }
-
-        mAdapter.notifyItemChanged(position);
-    }
-
-    @Override
-    public void onRefresh() {
-        if (!mRefreshingComments && mAdapter != null) {
-            MainActivity activity = (MainActivity) requireActivity();
-            mRefreshingComments = true;
-
-            String url = getGalleryDetailUrl();
-            if (url != null) {
-                // Request
-                EhRequest request = new EhRequest()
-                        .setMethod(EhClient.METHOD_GET_GALLERY_DETAIL)
-                        .setArgs(url)
-                        .setCallback(new RefreshCommentListener(activity));
-                request.enqueue(this);
-            }
-        }
-    }
-
-    private static class InfoHolder extends RecyclerView.ViewHolder {
-
-        private final TextView key;
-        private final TextView value;
-
-        public InfoHolder(View itemView) {
-            super(itemView);
-            key = (TextView) ViewUtils.$$(itemView, R.id.key);
-            value = (TextView) ViewUtils.$$(itemView, R.id.value);
-        }
-    }
-
-    private abstract static class CommentHolder extends RecyclerView.ViewHolder {
-        public CommentHolder(LayoutInflater inflater, int resId, ViewGroup parent) {
-            super(inflater.inflate(resId, parent, false));
-        }
-    }
-
-    private static class MoreCommentHolder extends CommentHolder {
-        public MoreCommentHolder(LayoutInflater inflater, ViewGroup parent) {
-            super(inflater, R.layout.item_gallery_comment_more, parent);
-        }
-    }
-
-    private static class ProgressCommentHolder extends CommentHolder {
-        public ProgressCommentHolder(LayoutInflater inflater, ViewGroup parent) {
-            super(inflater, R.layout.item_gallery_comment_progress, parent);
-        }
-    }
-
-    private class RefreshCommentListener extends EhCallback<GalleryCommentsScene, GalleryDetail> {
-
-        public RefreshCommentListener(Context context) {
-            super(context);
-        }
-
-        @Override
-        public void onSuccess(GalleryDetail result) {
-            GalleryCommentsScene scene = GalleryCommentsScene.this;
-            scene.onRefreshGallerySuccess(result.comments);
-        }
-
-        @Override
-        public void onFailure(Exception e) {
-            GalleryCommentsScene scene = GalleryCommentsScene.this;
-            scene.onRefreshGalleryFailure();
-        }
-
-        @Override
-        public void onCancel() {
-        }
-    }
-
-    private class CommentGalleryListener extends EhCallback<GalleryCommentsScene, GalleryCommentList> {
-
-        private final long mCommentId;
-
-        public CommentGalleryListener(Context context, long commentId) {
-            super(context);
-            mCommentId = commentId;
-        }
-
-        @Override
-        public void onSuccess(GalleryCommentList result) {
-            showTip(mCommentId != 0 ? R.string.edit_comment_successfully : R.string.comment_successfully, LENGTH_SHORT);
-
-            GalleryCommentsScene scene = GalleryCommentsScene.this;
-            scene.onCommentGallerySuccess(result);
-        }
-
-        @Override
-        public void onFailure(Exception e) {
-            showTip(getContent().getString(mCommentId != 0 ? R.string.edit_comment_failed : R.string.comment_failed) + "\n" + ExceptionUtils.getReadableString(e), LENGTH_LONG);
-        }
-
-        @Override
-        public void onCancel() {
-        }
-    }
-
-    private class VoteCommentListener extends EhCallback<GalleryCommentsScene, VoteCommentParser.Result> {
-
-        public VoteCommentListener(Context context) {
-            super(context);
-        }
-
-        @Override
-        public void onSuccess(VoteCommentParser.Result result) {
-            showTip(result.expectVote > 0 ?
-                            (0 != result.vote ? R.string.vote_up_successfully : R.string.cancel_vote_up_successfully) :
-                            (0 != result.vote ? R.string.vote_down_successfully : R.string.cancel_vote_down_successfully),
-                    LENGTH_SHORT);
-
-            GalleryCommentsScene scene = GalleryCommentsScene.this;
-            scene.onVoteCommentSuccess(result);
-        }
-
-        @Override
-        public void onFailure(Exception e) {
-            showTip(R.string.vote_failed, LENGTH_LONG);
-        }
-
-        @Override
-        public void onCancel() {
-        }
-    }
-
-    private class ActualCommentHolder extends CommentHolder {
-
-        private final TextView user;
-        private final TextView time;
-        private final LinkifyTextView comment;
-
-        public ActualCommentHolder(LayoutInflater inflater, ViewGroup parent) {
-            super(inflater, R.layout.item_gallery_comment, parent);
-            user = itemView.findViewById(R.id.user);
-            time = itemView.findViewById(R.id.time);
-            comment = itemView.findViewById(R.id.comment);
-        }
-
-        private CharSequence generateComment(Context context, ObservedTextView textView, GalleryComment comment) {
-            Spanned sp = Html.fromHtml(comment.comment, Html.FROM_HTML_MODE_LEGACY, new URLImageGetter(textView), null);
-
-            SpannableStringBuilder ssb = new SpannableStringBuilder(sp);
-
-            if (0 != comment.id && 0 != comment.score) {
-                int score = comment.score;
-                String scoreString = score > 0 ? "+" + score : Integer.toString(score);
-                SpannableString ss = new SpannableString(scoreString);
-                ss.setSpan(new RelativeSizeSpan(0.8f), 0, scoreString.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                ss.setSpan(new StyleSpan(Typeface.BOLD), 0, scoreString.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                ss.setSpan(new ForegroundColorSpan(ResourcesKt.resolveColor(getTheme(), android.R.attr.textColorSecondary))
-                        , 0, scoreString.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                ssb.append("  ").append(ss);
-            }
-
-            if (comment.lastEdited != 0) {
-                String str = context.getString(R.string.last_edited, ReadableTime.getTimeAgo(comment.lastEdited));
-                SpannableString ss = new SpannableString(str);
-                ss.setSpan(new RelativeSizeSpan(0.8f), 0, str.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                ss.setSpan(new StyleSpan(Typeface.BOLD), 0, str.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                ss.setSpan(new ForegroundColorSpan(ResourcesKt.resolveColor(getTheme(), android.R.attr.textColorSecondary)),
-                        0, str.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                ssb.append("\n\n").append(ss);
-            }
-
-            return TextUrl.handleTextUrl(ssb);
-        }
-
-        public void bind(GalleryComment value) {
-            user.setText(value.uploader ? getString(R.string.comment_user_uploader, value.user) : value.user);
-            user.setOnClickListener(v -> {
-                ListUrlBuilder lub = new ListUrlBuilder();
-                lub.setMode(ListUrlBuilder.MODE_UPLOADER);
-                lub.setKeyword(value.user);
-                navigate(R.id.galleryListScene, GalleryListScene.getStartArgs(lub), true);
-            });
-            time.setText(ReadableTime.getTimeAgo(value.time));
-            comment.setText(generateComment(comment.getContext(), comment, value));
-        }
-    }
-
-    private class CommentAdapter extends RecyclerView.Adapter<CommentHolder> {
-
-        private final LayoutInflater mInflater;
-
-        public CommentAdapter() {
-            mInflater = getLayoutInflater();
-            AssertUtils.assertNotNull(mInflater);
-        }
-
-        @NonNull
-        @Override
-        public CommentHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-            switch (viewType) {
-                case TYPE_COMMENT:
-                    return new ActualCommentHolder(mInflater, parent);
-                case TYPE_MORE:
-                    return new MoreCommentHolder(mInflater, parent);
-                case TYPE_PROGRESS:
-                    return new ProgressCommentHolder(mInflater, parent);
-                default:
-                    throw new IllegalStateException("Invalid view type: " + viewType);
-            }
-        }
-
-        @Override
-        public void onBindViewHolder(@NonNull CommentHolder holder, int position) {
-            Context context = getContext();
-            if (context == null || mGalleryDetail == null || mGalleryDetail.comments == null) {
-                return;
-            }
-
-            holder.itemView.setOnClickListener(v -> onItemClick(mRecyclerView, holder.itemView, position));
-            holder.itemView.setClickable(true);
-            holder.itemView.setFocusable(true);
-
-
-            if (holder instanceof ActualCommentHolder) {
-                ((ActualCommentHolder) holder).bind(mGalleryDetail.comments.comments[position]);
-            }
-        }
-
-        @Override
-        public int getItemCount() {
-            if (mGalleryDetail == null || mGalleryDetail.comments == null || mGalleryDetail.comments.comments == null) {
-                return 0;
-            } else if (mGalleryDetail.comments.hasMore) {
-                return mGalleryDetail.comments.comments.length + 1;
-            } else {
-                return mGalleryDetail.comments.comments.length;
-            }
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            if (position >= mGalleryDetail.comments.comments.length) {
-                return mRefreshingComments ? TYPE_PROGRESS : TYPE_MORE;
-            } else {
-                return TYPE_COMMENT;
-            }
-        }
-    }
-
-    class EditPanelOnBackPressedCallback extends OnBackPressedCallback {
-        public EditPanelOnBackPressedCallback() {
-            super(false);
-        }
-
-        @Override
-        public void handleOnBackPressed() {
-            if (!mInAnimation && null != mEditPanel && mEditPanel.getVisibility() == View.VISIBLE) {
-                hideEditPanel(true);
-            }
-        }
-    }
-}

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt

@@ -0,0 +1,914 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * 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 com.hippo.ehviewer.ui.scene
+
+import android.animation.Animator
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.DialogInterface
+import android.graphics.Typeface
+import android.graphics.drawable.Drawable
+import android.os.Bundle
+import android.os.Looper
+import android.text.Html
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.TextUtils
+import android.text.style.ForegroundColorSpan
+import android.text.style.RelativeSizeSpan
+import android.text.style.StyleSpan
+import android.text.style.URLSpan
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewAnimationUtils
+import android.view.ViewGroup
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.activity.OnBackPressedCallback
+import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsAnimationCompat
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.hippo.app.BaseDialogBuilder
+import com.hippo.easyrecyclerview.EasyRecyclerView
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.UrlOpener
+import com.hippo.ehviewer.WindowInsetsAnimationHelper
+import com.hippo.ehviewer.client.EhClient
+import com.hippo.ehviewer.client.EhFilter
+import com.hippo.ehviewer.client.EhRequest
+import com.hippo.ehviewer.client.EhUrl
+import com.hippo.ehviewer.client.data.GalleryComment
+import com.hippo.ehviewer.client.data.GalleryCommentList
+import com.hippo.ehviewer.client.data.GalleryDetail
+import com.hippo.ehviewer.client.data.ListUrlBuilder
+import com.hippo.ehviewer.client.parser.VoteCommentParser
+import com.hippo.ehviewer.dao.Filter
+import com.hippo.ehviewer.ui.MainActivity
+import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs
+import com.hippo.text.URLImageGetter
+import com.hippo.util.ExceptionUtils
+import com.hippo.util.ReadableTime
+import com.hippo.util.TextUrl
+import com.hippo.util.addTextToClipboard
+import com.hippo.view.ViewTransition
+import com.hippo.widget.FabLayout
+import com.hippo.widget.LinkifyTextView
+import com.hippo.widget.ObservedTextView
+import com.hippo.yorozuya.AnimationUtils
+import com.hippo.yorozuya.SimpleAnimatorListener
+import com.hippo.yorozuya.StringUtils
+import com.hippo.yorozuya.ViewUtils
+import com.hippo.yorozuya.collect.IntList
+import rikka.core.res.resolveColor
+import kotlin.math.hypot
+
+class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefreshListener {
+    private val mCallback = EditPanelOnBackPressedCallback()
+    private var mGalleryDetail: GalleryDetail? = null
+    private var mRecyclerView: EasyRecyclerView? = null
+    private var mFabLayout: FabLayout? = null
+    private var mFab: FloatingActionButton? = null
+    private var mEditPanel: View? = null
+    private var mSendImage: ImageView? = null
+    private var mEditText: EditText? = null
+    private var mAdapter: CommentAdapter? = null
+    private var mViewTransition: ViewTransition? = null
+    private var mRefreshLayout: SwipeRefreshLayout? = null
+    private var mSendDrawable: Drawable? = null
+    private var mPencilDrawable: Drawable? = null
+    private var mCommentId: Long = 0
+    private var mInAnimation = false
+    private var mShowAllComments = false
+    private var mRefreshingComments = false
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        requireActivity().onBackPressedDispatcher.addCallback(mCallback)
+        if (savedInstanceState == null) {
+            onInit()
+        } else {
+            onRestore(savedInstanceState)
+        }
+    }
+
+    private fun handleArgs(args: Bundle?) {
+        if (args == null) {
+            return
+        }
+        mGalleryDetail = args.getParcelable(KEY_GALLERY_DETAIL)
+        mShowAllComments =
+            mGalleryDetail != null && mGalleryDetail!!.comments != null && !mGalleryDetail!!.comments!!.hasMore
+    }
+
+    private fun onInit() {
+        handleArgs(arguments)
+    }
+
+    private fun onRestore(savedInstanceState: Bundle) {
+        mGalleryDetail = savedInstanceState.getParcelable(KEY_GALLERY_DETAIL)
+        mShowAllComments =
+            mGalleryDetail != null && mGalleryDetail!!.comments != null && !mGalleryDetail!!.comments!!.hasMore
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putParcelable(KEY_GALLERY_DETAIL, mGalleryDetail)
+    }
+
+    override fun onCreateViewWithToolbar(
+        inflater: LayoutInflater,
+        container: ViewGroup?, savedInstanceState: Bundle?
+    ): View {
+        val view = inflater.inflate(R.layout.scene_gallery_comments, container, false) as ViewGroup
+        mRecyclerView = ViewUtils.`$$`(view, R.id.recycler_view) as EasyRecyclerView
+        setLiftOnScrollTargetView(mRecyclerView)
+        val tip = ViewUtils.`$$`(view, R.id.tip) as TextView
+        mEditPanel = ViewUtils.`$$`(view, R.id.edit_panel)
+        mSendImage = ViewUtils.`$$`(mEditPanel, R.id.send) as ImageView
+        mEditText = ViewUtils.`$$`(mEditPanel, R.id.edit_text) as EditText
+        mFabLayout = ViewUtils.`$$`(view, R.id.fab_layout) as FabLayout
+        mFab = ViewUtils.`$$`(view, R.id.fab) as FloatingActionButton
+        mRefreshLayout = ViewUtils.`$$`(view, R.id.refresh_layout) as SwipeRefreshLayout
+
+
+        // Workaround for fab and edittext render out of screen
+        view.removeView(mFabLayout)
+        view.removeView(mEditPanel!!.parent as View)
+        assert(container != null)
+        container!!.addView(mFabLayout)
+        container.addView(mEditPanel!!.parent as View)
+        ViewCompat.setWindowInsetsAnimationCallback(
+            view, WindowInsetsAnimationHelper(
+                WindowInsetsAnimationCompat.Callback.DISPATCH_MODE_STOP,
+                mEditPanel,
+                mFabLayout
+            )
+        )
+        mRefreshLayout!!.setOnRefreshListener(this)
+        val context = requireContext()
+        val drawable = ContextCompat.getDrawable(context, R.drawable.big_sad_pandroid)
+        drawable!!.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
+        tip.setCompoundDrawables(null, drawable, null, null)
+        mSendDrawable = ContextCompat.getDrawable(context, R.drawable.v_send_dark_x24)
+        mPencilDrawable = ContextCompat.getDrawable(context, R.drawable.v_pencil_dark_x24)
+        mAdapter = CommentAdapter()
+        mRecyclerView!!.adapter = mAdapter
+        mRecyclerView!!.layoutManager = LinearLayoutManager(
+            context,
+            RecyclerView.VERTICAL, false
+        )
+        mRecyclerView!!.setHasFixedSize(true)
+        // Cancel change animator
+        val itemAnimator = mRecyclerView!!.itemAnimator
+        if (itemAnimator is DefaultItemAnimator) {
+            itemAnimator.supportsChangeAnimations = false
+        }
+        mSendImage!!.setOnClickListener(this)
+        mFab!!.setOnClickListener(this)
+        addAboveSnackView(mEditPanel)
+        addAboveSnackView(mFabLayout)
+        mViewTransition = ViewTransition(mRecyclerView, tip)
+        updateView(false)
+        return view
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        mCallback.remove()
+        if (null != mRecyclerView) {
+            mRecyclerView!!.stopScroll()
+            mRecyclerView = null
+        }
+        if (null != mEditPanel) {
+            removeAboveSnackView(mEditPanel)
+            mEditPanel = null
+        }
+        if (null != mFabLayout) {
+            removeAboveSnackView(mFabLayout)
+            mFabLayout = null
+        }
+        mFab = null
+        mSendImage = null
+        mEditText = null
+        mAdapter = null
+        mViewTransition = null
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setTitle(R.string.gallery_comments)
+        setNavigationIcon(R.drawable.v_arrow_left_dark_x24)
+    }
+
+    private fun showFilterCommenterDialog(commenter: String?, position: Int) {
+        val context = context
+        if (context == null || commenter == null) {
+            return
+        }
+        BaseDialogBuilder(context)
+            .setMessage(getString(R.string.filter_the_commenter, commenter))
+            .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
+                val filter = Filter()
+                filter.mode = EhFilter.MODE_COMMENTER
+                filter.text = commenter
+                EhFilter.addFilter(filter)
+                hideComment(position)
+                showTip(R.string.filter_added, LENGTH_SHORT)
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .show()
+    }
+
+    private fun hideComment(position: Int) {
+        if (mGalleryDetail == null || mGalleryDetail!!.comments == null || mGalleryDetail!!.comments!!.comments == null) {
+            return
+        }
+        val oldCommentsList = mGalleryDetail!!.comments!!.comments
+        val newCommentsList = arrayOfNulls<GalleryComment>(
+            oldCommentsList!!.size - 1
+        )
+        var i = 0
+        var j = 0
+        while (i < oldCommentsList.size) {
+            if (i != position) {
+                newCommentsList[j] = oldCommentsList[i]
+                j++
+            }
+            i++
+        }
+        mGalleryDetail!!.comments!!.comments = newCommentsList.requireNoNulls()
+        mAdapter!!.notifyDataSetChanged()
+        updateView(true)
+    }
+
+    private fun voteComment(id: Long, vote: Int) {
+        val context = context
+        val activity = mainActivity
+        if (null == context || null == activity) {
+            return
+        }
+        val request = EhRequest()
+            .setMethod(EhClient.METHOD_VOTE_COMMENT)
+            .setArgs(
+                mGalleryDetail!!.apiUid,
+                mGalleryDetail!!.apiKey,
+                mGalleryDetail!!.gid,
+                mGalleryDetail!!.token,
+                id,
+                vote
+            )
+            .setCallback(VoteCommentListener(context))
+        request.enqueue(this)
+    }
+
+    @SuppressLint("InflateParams")
+    fun showVoteStatusDialog(context: Context?, voteStatus: String?) {
+        var context = context
+        val temp = StringUtils.split(voteStatus, ',')
+        val length = temp.size
+        val userArray = arrayOfNulls<String>(length)
+        val voteArray = arrayOfNulls<String>(length)
+        for (i in 0 until length) {
+            val str = StringUtils.trim(temp[i])
+            val index = str.lastIndexOf(' ')
+            if (index < 0) {
+                Log.d(TAG, "Something wrong happened about vote state")
+                userArray[i] = str
+                voteArray[i] = ""
+            } else {
+                userArray[i] = StringUtils.trim(str.substring(0, index))
+                voteArray[i] = StringUtils.trim(str.substring(index + 1))
+            }
+        }
+        val builder = BaseDialogBuilder(context!!)
+        context = builder.context
+        val inflater = LayoutInflater.from(context)
+        val rv = inflater.inflate(R.layout.dialog_recycler_view, null) as EasyRecyclerView
+        rv.adapter = object : RecyclerView.Adapter<InfoHolder>() {
+            override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InfoHolder {
+                return InfoHolder(inflater.inflate(R.layout.item_drawer_favorites, parent, false))
+            }
+
+            override fun onBindViewHolder(holder: InfoHolder, position: Int) {
+                holder.key.text = userArray[position]
+                holder.value.text = voteArray[position]
+            }
+
+            override fun getItemCount(): Int {
+                return length
+            }
+        }
+        rv.layoutManager = LinearLayoutManager(context)
+        rv.clipToPadding = false
+        builder.setView(rv).show()
+    }
+
+    private fun showCommentDialog(position: Int) {
+        val context = context
+        if (context == null || mGalleryDetail == null || mGalleryDetail!!.comments == null || mGalleryDetail!!.comments!!.comments == null || position >= mGalleryDetail!!.comments!!.comments!!.size || position < 0) {
+            return
+        }
+        val comment = mGalleryDetail!!.comments!!.comments!![position]
+        val menu: MutableList<String> = ArrayList()
+        val menuId = IntList()
+        val resources = context.resources
+        menu.add(resources.getString(R.string.copy_comment_text))
+        menuId.add(R.id.copy)
+        if (!comment.uploader && !comment.editable) {
+            menu.add(resources.getString(R.string.block_commenter))
+            menuId.add(R.id.block_commenter)
+        }
+        if (comment.editable) {
+            menu.add(resources.getString(R.string.edit_comment))
+            menuId.add(R.id.edit_comment)
+        }
+        if (comment.voteUpAble) {
+            menu.add(resources.getString(if (comment.voteUpEd) R.string.cancel_vote_up else R.string.vote_up))
+            menuId.add(R.id.vote_up)
+        }
+        if (comment.voteDownAble) {
+            menu.add(resources.getString(if (comment.voteDownEd) R.string.cancel_vote_down else R.string.vote_down))
+            menuId.add(R.id.vote_down)
+        }
+        if (!TextUtils.isEmpty(comment.voteState)) {
+            menu.add(resources.getString(R.string.check_vote_status))
+            menuId.add(R.id.check_vote_status)
+        }
+        BaseDialogBuilder(context)
+            .setItems(menu.toTypedArray()) { _: DialogInterface?, which: Int ->
+                if (which < 0 || which >= menuId.size()) {
+                    return@setItems
+                }
+                val id = menuId[which]
+                if (id == R.id.copy) {
+                    requireActivity().addTextToClipboard(comment.comment, false)
+                } else if (id == R.id.block_commenter) {
+                    showFilterCommenterDialog(comment.user, position)
+                } else if (id == R.id.vote_up) {
+                    voteComment(comment.id, 1)
+                } else if (id == R.id.vote_down) {
+                    voteComment(comment.id, -1)
+                } else if (id == R.id.check_vote_status) {
+                    showVoteStatusDialog(context, comment.voteState)
+                } else if (id == R.id.edit_comment) {
+                    prepareEditComment(comment.id)
+                    if (!mInAnimation && mEditPanel != null && mEditPanel!!.visibility != View.VISIBLE) {
+                        showEditPanel(true)
+                    }
+                }
+            }.show()
+    }
+
+    fun onItemClick(parent: EasyRecyclerView?, view2: View?, position: Int): Boolean {
+        val activity = mainActivity ?: return false
+        val holder = parent!!.getChildViewHolder(view2!!)
+        if (holder is ActualCommentHolder) {
+            val span = holder.comment.currentSpan
+            holder.comment.clearCurrentSpan()
+            if (span is URLSpan) {
+                UrlOpener.openUrl(activity, span.url, true, mGalleryDetail)
+            } else {
+                showCommentDialog(position)
+            }
+        } else if (holder is MoreCommentHolder && !mRefreshingComments && mAdapter != null) {
+            mRefreshingComments = true
+            mShowAllComments = true
+            mAdapter!!.notifyItemChanged(position)
+            val url = galleryDetailUrl
+            if (url != null) {
+                // Request
+                val request = EhRequest()
+                    .setMethod(EhClient.METHOD_GET_GALLERY_DETAIL)
+                    .setArgs(url)
+                    .setCallback(RefreshCommentListener(activity))
+                request.enqueue(this)
+            }
+        }
+        return true
+    }
+
+    private fun updateView(animation: Boolean) {
+        if (null == mViewTransition) {
+            return
+        }
+        if (mGalleryDetail == null || mGalleryDetail!!.comments == null || mGalleryDetail!!.comments!!.comments == null || mGalleryDetail!!.comments!!.comments!!.isEmpty()) {
+            mViewTransition!!.showView(1, animation)
+        } else {
+            mViewTransition!!.showView(0, animation)
+        }
+    }
+
+    private fun prepareNewComment() {
+        mCommentId = 0
+        if (mSendImage != null) {
+            mSendImage!!.setImageDrawable(mSendDrawable)
+        }
+    }
+
+    private fun prepareEditComment(commentId: Long) {
+        mCommentId = commentId
+        if (mSendImage != null) {
+            mSendImage!!.setImageDrawable(mPencilDrawable)
+        }
+    }
+
+    private fun showEditPanelWithAnimation() {
+        if (null == mFab || null == mEditPanel) {
+            return
+        }
+        mInAnimation = true
+        mFab!!.translationX = 0.0f
+        mFab!!.translationY = 0.0f
+        mFab!!.scaleX = 1.0f
+        mFab!!.scaleY = 1.0f
+        val fabEndX = mEditPanel!!.left + mEditPanel!!.width / 2 - mFab!!.width / 2
+        val fabEndY = mEditPanel!!.top + mEditPanel!!.height / 2 - mFab!!.height / 2
+        mFab!!.animate().x(fabEndX.toFloat()).y(fabEndY.toFloat()).scaleX(0.0f).scaleY(0.0f)
+            .setInterpolator(AnimationUtils.SLOW_FAST_SLOW_INTERPOLATOR)
+            .setDuration(300L).setListener(object : SimpleAnimatorListener() {
+                override fun onAnimationEnd(animation: Animator) {
+                    if (null == mFab || null == mEditPanel) {
+                        return
+                    }
+                    (mFab as View).visibility = View.INVISIBLE
+                    mEditPanel!!.visibility = View.VISIBLE
+                    val halfW = mEditPanel!!.width / 2
+                    val halfH = mEditPanel!!.height / 2
+                    val animator = ViewAnimationUtils.createCircularReveal(
+                        mEditPanel,
+                        halfW,
+                        halfH,
+                        0f,
+                        hypot(halfW.toDouble(), halfH.toDouble()).toFloat()
+                    ).setDuration(300L)
+                    animator.addListener(object : SimpleAnimatorListener() {
+                        override fun onAnimationEnd(a: Animator) {
+                            mInAnimation = false
+                        }
+                    })
+                    animator.start()
+                }
+            }).start()
+    }
+
+    private fun showEditPanel(animation: Boolean) {
+        mCallback.isEnabled = true
+        if (animation) {
+            showEditPanelWithAnimation()
+        } else {
+            if (null == mFab || null == mEditPanel) {
+                return
+            }
+            (mFab as View).visibility = View.INVISIBLE
+            mEditPanel!!.visibility = View.VISIBLE
+        }
+    }
+
+    private fun hideEditPanelWithAnimation() {
+        if (null == mFab || null == mEditPanel) {
+            return
+        }
+        mInAnimation = true
+        val halfW = mEditPanel!!.width / 2
+        val halfH = mEditPanel!!.height / 2
+        val animator = ViewAnimationUtils.createCircularReveal(
+            mEditPanel,
+            halfW,
+            halfH,
+            hypot(halfW.toDouble(), halfH.toDouble()).toFloat(),
+            0.0f
+        ).setDuration(300L)
+        animator.addListener(object : SimpleAnimatorListener() {
+            override fun onAnimationEnd(a: Animator) {
+                if (null == mFab || null == mEditPanel) {
+                    return
+                }
+                if (Looper.myLooper() != Looper.getMainLooper()) {
+                    // Some devices may run this block in non-UI thread.
+                    // It might be a bug of Android OS.
+                    // Check it here to avoid crash.
+                    return
+                }
+                mEditPanel!!.visibility = View.GONE
+                (mFab as View).visibility = View.VISIBLE
+                val fabStartX = mEditPanel!!.left + mEditPanel!!.width / 2 - mFab!!.width / 2
+                val fabStartY = mEditPanel!!.top + mEditPanel!!.height / 2 - mFab!!.height / 2
+                mFab!!.x = fabStartX.toFloat()
+                mFab!!.y = fabStartY.toFloat()
+                mFab!!.scaleX = 0.0f
+                mFab!!.scaleY = 0.0f
+                mFab!!.rotation = -45.0f
+                mFab!!.animate().translationX(0.0f).translationY(0.0f).scaleX(1.0f).scaleY(1.0f)
+                    .rotation(0.0f)
+                    .setInterpolator(AnimationUtils.SLOW_FAST_SLOW_INTERPOLATOR)
+                    .setDuration(300L).setListener(object : SimpleAnimatorListener() {
+                        override fun onAnimationEnd(animation: Animator) {
+                            mInAnimation = false
+                        }
+                    }).start()
+            }
+        })
+        animator.start()
+    }
+
+    private fun hideEditPanel(animation: Boolean) {
+        mCallback.isEnabled = false
+        hideSoftInput()
+        if (animation) {
+            hideEditPanelWithAnimation()
+        } else {
+            if (null == mFab || null == mEditPanel) {
+                return
+            }
+            (mFab as View).visibility = View.VISIBLE
+            mEditPanel!!.visibility = View.INVISIBLE
+        }
+    }
+
+    private val galleryDetailUrl: String?
+        get() = if (mGalleryDetail != null && mGalleryDetail!!.gid != -1L && mGalleryDetail!!.token != null) {
+            EhUrl.getGalleryDetailUrl(
+                mGalleryDetail!!.gid,
+                mGalleryDetail!!.token,
+                0,
+                mShowAllComments
+            )
+        } else {
+            null
+        }
+
+    override fun onClick(v: View) {
+        val context = context
+        val activity = mainActivity
+        if (null == context || null == activity || null == mEditText) {
+            return
+        }
+        if (mFab === v) {
+            if (!mInAnimation) {
+                prepareNewComment()
+                showEditPanel(true)
+            }
+        } else if (mSendImage === v) {
+            if (!mInAnimation) {
+                val comment = mEditText!!.text.toString()
+                if (TextUtils.isEmpty(comment)) {
+                    // Comment is empty
+                    return
+                }
+                val url = galleryDetailUrl ?: return
+                // Request
+                val request = EhRequest()
+                    .setMethod(EhClient.METHOD_GET_COMMENT_GALLERY)
+                    .setArgs(
+                        url,
+                        comment,
+                        if (mCommentId != 0L) mCommentId.toString() else null
+                    )
+                    .setCallback(CommentGalleryListener(context, mCommentId))
+                request.enqueue(this)
+                hideSoftInput()
+                hideEditPanel(true)
+            }
+        }
+    }
+
+    private fun onRefreshGallerySuccess(result: GalleryCommentList?) {
+        if (mGalleryDetail == null || mAdapter == null) {
+            return
+        }
+        mRefreshLayout!!.isRefreshing = false
+        mRefreshingComments = false
+        mGalleryDetail!!.comments = result
+        mAdapter!!.notifyDataSetChanged()
+        updateView(true)
+    }
+
+    private fun onRefreshGalleryFailure() {
+        if (mAdapter == null) {
+            return
+        }
+        mRefreshLayout!!.isRefreshing = false
+        mRefreshingComments = false
+        val position = mAdapter!!.itemCount - 1
+        if (position >= 0) {
+            mAdapter!!.notifyItemChanged(position)
+        }
+    }
+
+    private fun onCommentGallerySuccess(result: GalleryCommentList) {
+        if (mGalleryDetail == null || mAdapter == null) {
+            return
+        }
+        mGalleryDetail!!.comments = result
+        mAdapter!!.notifyDataSetChanged()
+
+        // Remove text
+        if (mEditText != null) {
+            mEditText!!.setText("")
+        }
+        updateView(true)
+    }
+
+    private fun onVoteCommentSuccess(result: VoteCommentParser.Result) {
+        if (mAdapter == null || mGalleryDetail!!.comments == null || mGalleryDetail!!.comments!!.comments == null) {
+            return
+        }
+        var position = -1
+        var i = 0
+        val n = mGalleryDetail!!.comments!!.comments!!.size
+        while (i < n) {
+            val comment = mGalleryDetail!!.comments!!.comments!![i]
+            if (comment.id == result.id) {
+                position = i
+                break
+            }
+            i++
+        }
+        if (-1 == position) {
+            Log.d(TAG, "Can't find comment with id " + result.id)
+            return
+        }
+
+        // Update comment
+        val comment = mGalleryDetail!!.comments!!.comments!![position]
+        comment.score = result.score
+        if (result.expectVote > 0) {
+            comment.voteUpEd = 0 != result.vote
+            comment.voteDownEd = false
+        } else {
+            comment.voteDownEd = 0 != result.vote
+            comment.voteUpEd = false
+        }
+        mAdapter!!.notifyItemChanged(position)
+    }
+
+    override fun onRefresh() {
+        if (!mRefreshingComments && mAdapter != null) {
+            val activity = requireActivity() as MainActivity
+            mRefreshingComments = true
+            val url = galleryDetailUrl
+            if (url != null) {
+                // Request
+                val request = EhRequest()
+                    .setMethod(EhClient.METHOD_GET_GALLERY_DETAIL)
+                    .setArgs(url)
+                    .setCallback(RefreshCommentListener(activity))
+                request.enqueue(this)
+            }
+        }
+    }
+
+    private class InfoHolder(itemView: View?) : RecyclerView.ViewHolder(
+        itemView!!
+    ) {
+        val key: TextView
+        val value: TextView
+
+        init {
+            key = ViewUtils.`$$`(itemView, R.id.key) as TextView
+            value = ViewUtils.`$$`(itemView, R.id.value) as TextView
+        }
+    }
+
+    private abstract class CommentHolder(inflater: LayoutInflater, resId: Int, parent: ViewGroup?) :
+        RecyclerView.ViewHolder(inflater.inflate(resId, parent, false))
+
+    private class MoreCommentHolder(inflater: LayoutInflater, parent: ViewGroup?) :
+        CommentHolder(inflater, R.layout.item_gallery_comment_more, parent)
+
+    private class ProgressCommentHolder(inflater: LayoutInflater, parent: ViewGroup?) :
+        CommentHolder(inflater, R.layout.item_gallery_comment_progress, parent)
+
+    private inner class RefreshCommentListener(context: Context) :
+        EhCallback<GalleryCommentsScene?, GalleryDetail>(context) {
+        override fun onSuccess(result: GalleryDetail) {
+            val scene = this@GalleryCommentsScene
+            scene.onRefreshGallerySuccess(result.comments)
+        }
+
+        override fun onFailure(e: Exception) {
+            val scene = this@GalleryCommentsScene
+            scene.onRefreshGalleryFailure()
+        }
+
+        override fun onCancel() {}
+    }
+
+    private inner class CommentGalleryListener(context: Context, private val mCommentId: Long) :
+        EhCallback<GalleryCommentsScene?, GalleryCommentList>(context) {
+        override fun onSuccess(result: GalleryCommentList) {
+            showTip(
+                if (mCommentId != 0L) R.string.edit_comment_successfully else R.string.comment_successfully,
+                LENGTH_SHORT
+            )
+            val scene = this@GalleryCommentsScene
+            scene.onCommentGallerySuccess(result)
+        }
+
+        override fun onFailure(e: Exception) {
+            showTip(
+                """
+    ${content.getString(if (mCommentId != 0L) R.string.edit_comment_failed else R.string.comment_failed)}
+    ${ExceptionUtils.getReadableString(e)}
+    """.trimIndent(), LENGTH_LONG
+            )
+        }
+
+        override fun onCancel() {}
+    }
+
+    private inner class VoteCommentListener(context: Context) :
+        EhCallback<GalleryCommentsScene?, VoteCommentParser.Result>(context) {
+        override fun onSuccess(result: VoteCommentParser.Result) {
+            showTip(
+                if (result.expectVote > 0) (if (0 != result.vote) R.string.vote_up_successfully else R.string.cancel_vote_up_successfully) else if (0 != result.vote) R.string.vote_down_successfully else R.string.cancel_vote_down_successfully,
+                LENGTH_SHORT
+            )
+            val scene = this@GalleryCommentsScene
+            scene.onVoteCommentSuccess(result)
+        }
+
+        override fun onFailure(e: Exception) {
+            showTip(R.string.vote_failed, LENGTH_LONG)
+        }
+
+        override fun onCancel() {}
+    }
+
+    private inner class ActualCommentHolder(inflater: LayoutInflater, parent: ViewGroup?) :
+        CommentHolder(inflater, R.layout.item_gallery_comment, parent) {
+        private val user: TextView = itemView.findViewById(R.id.user)
+        private val time: TextView = itemView.findViewById(R.id.time)
+        val comment: LinkifyTextView = itemView.findViewById(R.id.comment)
+
+        private fun generateComment(
+            context: Context,
+            textView: ObservedTextView,
+            comment: GalleryComment
+        ): CharSequence {
+            val sp = Html.fromHtml(
+                comment.comment,
+                Html.FROM_HTML_MODE_LEGACY,
+                URLImageGetter(textView),
+                null
+            )
+            val ssb = SpannableStringBuilder(sp)
+            if (0L != comment.id && 0 != comment.score) {
+                val score = comment.score
+                val scoreString = if (score > 0) "+$score" else score.toString()
+                val ss = SpannableString(scoreString)
+                ss.setSpan(
+                    RelativeSizeSpan(0.8f),
+                    0,
+                    scoreString.length,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                ss.setSpan(
+                    StyleSpan(Typeface.BOLD),
+                    0,
+                    scoreString.length,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                ss.setSpan(
+                    ForegroundColorSpan(theme.resolveColor(android.R.attr.textColorSecondary)),
+                    0,
+                    scoreString.length,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                ssb.append("  ").append(ss)
+            }
+            if (comment.lastEdited != 0L) {
+                val str = context.getString(
+                    R.string.last_edited,
+                    ReadableTime.getTimeAgo(comment.lastEdited)
+                )
+                val ss = SpannableString(str)
+                ss.setSpan(
+                    RelativeSizeSpan(0.8f),
+                    0,
+                    str.length,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                ss.setSpan(
+                    StyleSpan(Typeface.BOLD),
+                    0,
+                    str.length,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                ss.setSpan(
+                    ForegroundColorSpan(theme.resolveColor(android.R.attr.textColorSecondary)),
+                    0, str.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                ssb.append("\n\n").append(ss)
+            }
+            return TextUrl.handleTextUrl(ssb)
+        }
+
+        fun bind(value: GalleryComment) {
+            user.text = if (value.uploader) getString(
+                R.string.comment_user_uploader,
+                value.user
+            ) else value.user
+            user.setOnClickListener {
+                val lub = ListUrlBuilder()
+                lub.mode = ListUrlBuilder.MODE_UPLOADER
+                lub.keyword = value.user
+                navigate(R.id.galleryListScene, lub.toStartArgs(), true)
+            }
+            time.text = ReadableTime.getTimeAgo(value.time)
+            comment.text = generateComment(comment.context, comment, value)
+        }
+    }
+
+    private inner class CommentAdapter : RecyclerView.Adapter<CommentHolder>() {
+        private val mInflater: LayoutInflater = layoutInflater
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CommentHolder {
+            return when (viewType) {
+                TYPE_COMMENT -> ActualCommentHolder(mInflater, parent)
+                TYPE_MORE -> MoreCommentHolder(mInflater, parent)
+                TYPE_PROGRESS -> ProgressCommentHolder(mInflater, parent)
+                else -> throw IllegalStateException("Invalid view type: $viewType")
+            }
+        }
+
+        override fun onBindViewHolder(holder: CommentHolder, position: Int) {
+            val context = context
+            if (context == null || mGalleryDetail == null || mGalleryDetail!!.comments == null) {
+                return
+            }
+            holder.itemView.setOnClickListener {
+                onItemClick(
+                    mRecyclerView,
+                    holder.itemView,
+                    position
+                )
+            }
+            holder.itemView.isClickable = true
+            holder.itemView.isFocusable = true
+            if (holder is ActualCommentHolder) {
+                holder.bind(mGalleryDetail!!.comments!!.comments!![position])
+            }
+        }
+
+        override fun getItemCount(): Int {
+            return if (mGalleryDetail == null || mGalleryDetail!!.comments == null || mGalleryDetail!!.comments!!.comments == null) {
+                0
+            } else if (mGalleryDetail!!.comments!!.hasMore) {
+                mGalleryDetail!!.comments!!.comments!!.size + 1
+            } else {
+                mGalleryDetail!!.comments!!.comments!!.size
+            }
+        }
+
+        override fun getItemViewType(position: Int): Int {
+            return if (position >= mGalleryDetail!!.comments!!.comments!!.size) {
+                if (mRefreshingComments) TYPE_PROGRESS else TYPE_MORE
+            } else {
+                TYPE_COMMENT
+            }
+        }
+    }
+
+    internal inner class EditPanelOnBackPressedCallback : OnBackPressedCallback(false) {
+        override fun handleOnBackPressed() {
+            if (!mInAnimation && null != mEditPanel && mEditPanel!!.visibility == View.VISIBLE) {
+                hideEditPanel(true)
+            }
+        }
+    }
+
+    companion object {
+        val TAG: String = GalleryCommentsScene::class.java.simpleName
+        const val KEY_API_UID = "api_uid"
+        const val KEY_API_KEY = "api_key"
+        const val KEY_GID = "gid"
+        const val KEY_TOKEN = "token"
+        const val KEY_COMMENT_LIST = "comment_list"
+        const val KEY_GALLERY_DETAIL = "gallery_detail"
+        private const val TYPE_COMMENT = 0
+        private const val TYPE_MORE = 1
+        private const val TYPE_PROGRESS = 2
+    }
+}

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.java

@@ -1,59 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.ui.scene;
-
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.card.MaterialCardView;
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.widget.SimpleRatingView;
-import com.hippo.widget.LoadImageView;
-
-class GalleryHolder extends RecyclerView.ViewHolder {
-
-    public final LoadImageView thumb;
-    public final TextView title;
-    public final TextView uploader;
-    public final SimpleRatingView rating;
-    public final TextView category;
-    public final TextView posted;
-    public final TextView pages;
-    public final TextView simpleLanguage;
-    public final ImageView favourited;
-    public final ImageView downloaded;
-    public final MaterialCardView card;
-
-    public GalleryHolder(View itemView) {
-        super(itemView);
-
-        thumb = itemView.findViewById(R.id.thumb);
-        title = itemView.findViewById(R.id.title);
-        uploader = itemView.findViewById(R.id.uploader);
-        rating = itemView.findViewById(R.id.rating);
-        category = itemView.findViewById(R.id.category);
-        posted = itemView.findViewById(R.id.posted);
-        pages = itemView.findViewById(R.id.pages);
-        simpleLanguage = itemView.findViewById(R.id.simple_language);
-        favourited = itemView.findViewById(R.id.favourited);
-        downloaded = itemView.findViewById(R.id.downloaded);
-        card = itemView.findViewById(R.id.card);
-    }
-}

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * 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 com.hippo.ehviewer.ui.scene
+
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.card.MaterialCardView
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.widget.SimpleRatingView
+import com.hippo.widget.LoadImageView
+
+internal class GalleryHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    @JvmField
+    val thumb: LoadImageView = itemView.findViewById(R.id.thumb)
+
+    @JvmField
+    val title: TextView? = itemView.findViewById(R.id.title)
+
+    @JvmField
+    val uploader: TextView? = itemView.findViewById(R.id.uploader)
+
+    @JvmField
+    val rating: SimpleRatingView? = itemView.findViewById(R.id.rating)
+
+    @JvmField
+    val category: TextView = itemView.findViewById(R.id.category)
+
+    @JvmField
+    val posted: TextView? = itemView.findViewById(R.id.posted)
+
+    @JvmField
+    val pages: TextView? = itemView.findViewById(R.id.pages)
+
+    @JvmField
+    val simpleLanguage: TextView = itemView.findViewById(R.id.simple_language)
+
+    @JvmField
+    val favourited: ImageView? = itemView.findViewById(R.id.favourited)
+
+    @JvmField
+    val downloaded: ImageView? = itemView.findViewById(R.id.downloaded)
+
+    @JvmField
+    val card: MaterialCardView = itemView.findViewById(R.id.card)
+}

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt

@@ -401,12 +401,7 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
         val colorID = theme.resolveColor(com.google.android.material.R.attr.colorOnSurface)
         mActionFabDrawable = AddDeleteDrawable(context, colorID)
         binding.fabLayout.primaryFab!!.setImageDrawable(mActionFabDrawable)
-        mSearchFab!!.setOnClickListener {
-            if (STATE_NORMAL != mState) {
-                onApplySearch()
-                hideSoftInput()
-            }
-        }
+        mSearchFab!!.setOnClickListener { onApplySearch() }
 
         // Update list url builder
         onUpdateUrlBuilder()
@@ -701,7 +696,7 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
 
     override fun onSearchViewExpanded() {
         super.onSearchViewExpanded()
-        selectSearchFab(true)
+        if (mState == STATE_NORMAL) selectSearchFab(true)
     }
 
     override fun onSearchViewHidden() {
@@ -1279,11 +1274,11 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
             return if (null != mHelper) mHelper!!.size() else 0
         }
 
-        public override fun onItemClick(view: View, position: Int) {
+        override fun onItemClick(view: View, position: Int) {
             this@GalleryListScene.onItemClick(position)
         }
 
-        public override fun onItemLongClick(view: View, position: Int): Boolean {
+        override fun onItemLongClick(view: View, position: Int): Boolean {
             return this@GalleryListScene.onItemLongClick(position)
         }
 
@@ -1420,7 +1415,9 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
                             mAdapter.notifyItemRemoved(position)
                         }
                     }
-                }.setNegativeButton(android.R.string.cancel) { _, _ ->
+                }.setNegativeButton(android.R.string.cancel) { dialog, _ ->
+                    dialog.cancel()
+                }.setOnCancelListener {
                     mAdapter.notifyItemChanged(position)
                 }.show()
         }
@@ -1473,11 +1470,10 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
             }
         }
 
-        @JvmStatic
-        fun getStartArgs(lub: ListUrlBuilder): Bundle {
+        fun ListUrlBuilder.toStartArgs(): Bundle {
             val args = Bundle()
             args.putString(KEY_ACTION, ACTION_LIST_URL_BUILDER)
-            args.putParcelable(KEY_LIST_URL_BUILDER, lub)
+            args.putParcelable(KEY_LIST_URL_BUILDER, this)
             return args
         }
     }

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java

@@ -1,425 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.ui.scene;
-
-import android.annotation.SuppressLint;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Pair;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.slider.Slider;
-import com.hippo.app.BaseDialogBuilder;
-import com.hippo.easyrecyclerview.EasyRecyclerView;
-import com.hippo.easyrecyclerview.MarginItemDecoration;
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.Settings;
-import com.hippo.ehviewer.client.EhClient;
-import com.hippo.ehviewer.client.EhRequest;
-import com.hippo.ehviewer.client.EhUrl;
-import com.hippo.ehviewer.client.data.GalleryDetail;
-import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.ehviewer.client.data.GalleryPreview;
-import com.hippo.ehviewer.client.data.PreviewSet;
-import com.hippo.ehviewer.client.exception.EhException;
-import com.hippo.ehviewer.ui.MainActivity;
-import com.hippo.widget.ContentLayout;
-import com.hippo.widget.LoadImageView;
-import com.hippo.widget.recyclerview.AutoGridLayoutManager;
-import com.hippo.yorozuya.AssertUtils;
-import com.hippo.yorozuya.LayoutUtils;
-import com.hippo.yorozuya.ViewUtils;
-
-import java.util.ArrayList;
-import java.util.Locale;
-
-import eu.kanade.tachiyomi.ui.reader.ReaderActivity;
-
-public class GalleryPreviewsScene extends BaseToolbarScene {
-
-    public static final String KEY_GALLERY_INFO = "gallery_info";
-    private final static String KEY_HAS_FIRST_REFRESH = "has_first_refresh";
-
-    /*---------------
-     Whole life cycle
-     ---------------*/
-    @Nullable
-    private EhClient mClient;
-    @Nullable
-    private GalleryInfo mGalleryInfo;
-
-    @Nullable
-    private EasyRecyclerView mRecyclerView;
-    @Nullable
-    private GalleryPreviewAdapter mAdapter;
-    @Nullable
-    private GalleryPreviewHelper mHelper;
-
-    private boolean mHasFirstRefresh = false;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Context context = getContext();
-        AssertUtils.assertNotNull(context);
-        mClient = EhClient.INSTANCE;
-        if (savedInstanceState == null) {
-            onInit();
-        } else {
-            onRestore(savedInstanceState);
-        }
-    }
-
-    private void onInit() {
-        Bundle args = getArguments();
-        if (args == null) {
-            return;
-        }
-
-        mGalleryInfo = args.getParcelable(KEY_GALLERY_INFO);
-    }
-
-    private void onRestore(@NonNull Bundle savedInstanceState) {
-        mGalleryInfo = savedInstanceState.getParcelable(KEY_GALLERY_INFO);
-        mHasFirstRefresh = savedInstanceState.getBoolean(KEY_HAS_FIRST_REFRESH);
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-
-        boolean hasFirstRefresh;
-        if (mHelper != null && 1 == mHelper.getShownViewIndex()) {
-            hasFirstRefresh = false;
-        } else {
-            hasFirstRefresh = mHasFirstRefresh;
-        }
-        outState.putBoolean(KEY_HAS_FIRST_REFRESH, hasFirstRefresh);
-        outState.putParcelable(KEY_GALLERY_INFO, mGalleryInfo);
-    }
-
-    @NonNull
-    @Override
-    public View onCreateViewWithToolbar(LayoutInflater inflater,
-                                        @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        ContentLayout mContentLayout = (ContentLayout) inflater.inflate(
-                R.layout.scene_gallery_previews, container, false);
-        mContentLayout.hideFastScroll();
-        mRecyclerView = mContentLayout.getRecyclerView();
-        setLiftOnScrollTargetView(mRecyclerView);
-
-        Context context = getContext();
-        AssertUtils.assertNotNull(context);
-
-        mAdapter = new GalleryPreviewAdapter();
-        mRecyclerView.setAdapter(mAdapter);
-        int columnWidth = Settings.getThumbSize();
-        AutoGridLayoutManager layoutManager = new AutoGridLayoutManager(context, columnWidth, LayoutUtils.dp2pix(context, 16));
-        layoutManager.setStrategy(AutoGridLayoutManager.STRATEGY_SUITABLE_SIZE);
-        mRecyclerView.setLayoutManager(layoutManager);
-        mRecyclerView.setClipToPadding(false);
-        int padding = LayoutUtils.dp2pix(context, 4);
-        MarginItemDecoration decoration = new MarginItemDecoration(padding, padding, padding, padding, padding);
-        mRecyclerView.addItemDecoration(decoration);
-
-        mHelper = new GalleryPreviewHelper();
-        mContentLayout.setHelper(mHelper);
-
-        // Only refresh for the first time
-        if (!mHasFirstRefresh) {
-            mHasFirstRefresh = true;
-            mHelper.firstRefresh();
-        }
-
-        return mContentLayout;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        if (null != mHelper) {
-            if (1 == mHelper.getShownViewIndex()) {
-                mHasFirstRefresh = false;
-            }
-        }
-        if (null != mRecyclerView) {
-            mRecyclerView.stopScroll();
-            mRecyclerView = null;
-        }
-
-        mAdapter = null;
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        setTitle(R.string.gallery_previews);
-        setNavigationIcon(R.drawable.v_arrow_left_dark_x24);
-        if (mGalleryInfo != null) {
-            if (((GalleryDetail) mGalleryInfo).previewPages > 2)
-                showMenu(R.menu.scene_gallery_previews);
-        }
-    }
-
-    @Override
-    public boolean onMenuItemClick(@NonNull MenuItem item) {
-        Context context = getContext();
-        if (null == context) {
-            return false;
-        }
-
-        int id = item.getItemId();
-        if (id == R.id.action_go_to) {
-            if (mHelper == null) {
-                return true;
-            }
-            int pages = mHelper.getPages();
-            if (pages > 1 && mHelper.canGoTo()) {
-                GoToDialogHelper helper = new GoToDialogHelper(pages, mHelper.getPageForTop());
-                AlertDialog dialog = new BaseDialogBuilder(context).setTitle(R.string.go_to)
-                        .setView(R.layout.dialog_go_to)
-                        .setPositiveButton(android.R.string.ok, null)
-                        .create();
-                dialog.show();
-                helper.setDialog(dialog);
-            }
-            return true;
-        }
-        return false;
-    }
-
-    public boolean onItemClick(int position) {
-        Context context = getContext();
-        if (null != context && null != mHelper && null != mGalleryInfo) {
-            GalleryPreview p = mHelper.getDataAtEx(position);
-            if (p != null) {
-                Intent intent = new Intent(context, ReaderActivity.class);
-                intent.setAction(ReaderActivity.ACTION_EH);
-                intent.putExtra(ReaderActivity.KEY_GALLERY_INFO, mGalleryInfo);
-                intent.putExtra(ReaderActivity.KEY_PAGE, p.position);
-                startActivity(intent);
-            }
-        }
-        return true;
-    }
-
-    private void onGetPreviewSetSuccess(Pair<PreviewSet, Integer> result, int taskId) {
-        if (null != mHelper && mHelper.isCurrentTask(taskId) && null != mGalleryInfo) {
-            PreviewSet previewSet = result.first;
-            int size = previewSet.size();
-            ArrayList<GalleryPreview> list = new ArrayList<>(size);
-            for (int i = 0; i < size; i++) {
-                list.add(previewSet.getGalleryPreview(mGalleryInfo.getGid(), i));
-            }
-
-            mHelper.onGetPageData(taskId, result.second, 0, null, null, list);
-        }
-    }
-
-    private void onGetPreviewSetFailure(Exception e, int taskId) {
-        if (mHelper != null && mHelper.isCurrentTask(taskId)) {
-            mHelper.onGetException(taskId, e);
-        }
-    }
-
-    private static class GalleryPreviewHolder extends RecyclerView.ViewHolder {
-
-        public LoadImageView image;
-        public TextView text;
-
-        public GalleryPreviewHolder(View itemView) {
-            super(itemView);
-
-            image = itemView.findViewById(R.id.image);
-            text = itemView.findViewById(R.id.text);
-        }
-    }
-
-    private class GetPreviewSetListener extends EhCallback<GalleryPreviewsScene, Pair<PreviewSet, Integer>> {
-
-        private final int mTaskId;
-
-        public GetPreviewSetListener(Context context, int stageId, String sceneTag, int taskId) {
-            super(context);
-            mTaskId = taskId;
-        }
-
-        @Override
-        public void onSuccess(Pair<PreviewSet, Integer> result) {
-            GalleryPreviewsScene scene = GalleryPreviewsScene.this;
-            scene.onGetPreviewSetSuccess(result, mTaskId);
-        }
-
-        @Override
-        public void onFailure(Exception e) {
-            GalleryPreviewsScene scene = GalleryPreviewsScene.this;
-            scene.onGetPreviewSetFailure(e, mTaskId);
-        }
-
-        @Override
-        public void onCancel() {
-
-        }
-    }
-
-    private class GalleryPreviewAdapter extends RecyclerView.Adapter<GalleryPreviewHolder> {
-
-        private final LayoutInflater mInflater;
-
-        public GalleryPreviewAdapter() {
-            mInflater = getLayoutInflater();
-            AssertUtils.assertNotNull(mInflater);
-        }
-
-        @NonNull
-        @Override
-        public GalleryPreviewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-            return new GalleryPreviewHolder(mInflater.inflate(R.layout.item_gallery_preview, parent, false));
-        }
-
-        @Override
-        @SuppressLint("SetTextI18n")
-        public void onBindViewHolder(@NonNull GalleryPreviewHolder holder, int position) {
-            if (null != mHelper) {
-                GalleryPreview preview = mHelper.getDataAtEx(position);
-                if (preview != null) {
-                    preview.load(holder.image);
-                    holder.text.setText(Integer.toString(preview.position + 1));
-                }
-            }
-            holder.itemView.setOnClickListener(v -> onItemClick(position));
-        }
-
-        @Override
-        public int getItemCount() {
-            return mHelper != null ? mHelper.size() : 0;
-        }
-    }
-
-    private class GalleryPreviewHelper extends ContentLayout.ContentHelper<GalleryPreview> {
-
-        @Override
-        protected void getPageData(final int taskId, int type, int page, String index, boolean isNext) {
-            MainActivity activity = getMainActivity();
-            if (null == activity || null == mClient || null == mGalleryInfo) {
-                onGetException(taskId, new EhException(getString(R.string.error_cannot_find_gallery)));
-                return;
-            }
-
-            String url = EhUrl.getGalleryDetailUrl(mGalleryInfo.getGid(), mGalleryInfo.getToken(), page, false);
-            EhRequest request = new EhRequest();
-            request.setMethod(EhClient.METHOD_GET_PREVIEW_SET);
-            request.setCallback(new GetPreviewSetListener(getContext(),
-                    1, getTag(), taskId));
-            request.setArgs(url);
-            request.enqueue(GalleryPreviewsScene.this);
-        }
-
-        @Override
-        protected Context getContext() {
-            return GalleryPreviewsScene.this.getContext();
-        }
-
-        @SuppressLint("NotifyDataSetChanged")
-        @Override
-        protected void notifyDataSetChanged() {
-            if (mAdapter != null) {
-                mAdapter.notifyDataSetChanged();
-            }
-        }
-
-        @Override
-        protected void notifyItemRangeInserted(int positionStart, int itemCount) {
-            if (mAdapter != null) {
-                mAdapter.notifyItemRangeInserted(positionStart, itemCount);
-            }
-        }
-
-        @Override
-        protected boolean isDuplicate(GalleryPreview d1, GalleryPreview d2) {
-            return false;
-        }
-    }
-
-    private class GoToDialogHelper implements View.OnClickListener,
-            DialogInterface.OnDismissListener {
-
-        private final int mPages;
-        private final int mCurrentPage;
-
-        @Nullable
-        private Slider mSlider;
-        @Nullable
-        private Dialog mDialog;
-
-        private GoToDialogHelper(int pages, int currentPage) {
-            mPages = pages;
-            mCurrentPage = currentPage;
-        }
-
-        public void setDialog(@NonNull AlertDialog dialog) {
-            mDialog = dialog;
-
-            ((TextView) ViewUtils.$$(dialog, R.id.start)).setText(String.format(Locale.US, "%d", 1));
-            ((TextView) ViewUtils.$$(dialog, R.id.end)).setText(String.format(Locale.US, "%d", mPages));
-            mSlider = (Slider) ViewUtils.$$(dialog, R.id.slider);
-            mSlider.setValueTo(mPages);
-            mSlider.setValue(mCurrentPage + 1);
-
-            dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(this);
-            dialog.setOnDismissListener(this);
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (null == mSlider) {
-                return;
-            }
-
-            int page = (int) (mSlider.getValue() - 1);
-            if (page >= 0 && page < mPages && mHelper != null) {
-                mHelper.goTo(page);
-                if (mDialog != null) {
-                    mDialog.dismiss();
-                    mDialog = null;
-                }
-            } else {
-                showTip(R.string.error_out_of_range, LENGTH_LONG);
-            }
-        }
-
-        @Override
-        public void onDismiss(DialogInterface dialog) {
-            mDialog = null;
-            mSlider = null;
-        }
-    }
-}

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.kt

@@ -0,0 +1,358 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * 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 com.hippo.ehviewer.ui.scene
+
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
+import android.os.Bundle
+import android.util.Pair
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.slider.Slider
+import com.hippo.app.BaseDialogBuilder
+import com.hippo.easyrecyclerview.MarginItemDecoration
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.client.EhClient
+import com.hippo.ehviewer.client.EhRequest
+import com.hippo.ehviewer.client.EhUrl
+import com.hippo.ehviewer.client.data.GalleryDetail
+import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.client.data.GalleryPreview
+import com.hippo.ehviewer.client.data.PreviewSet
+import com.hippo.ehviewer.client.exception.EhException
+import com.hippo.ehviewer.databinding.SceneGalleryPreviewsBinding
+import com.hippo.widget.ContentLayout.ContentHelper
+import com.hippo.widget.LoadImageView
+import com.hippo.widget.recyclerview.AutoGridLayoutManager
+import com.hippo.yorozuya.LayoutUtils
+import com.hippo.yorozuya.ViewUtils
+import eu.kanade.tachiyomi.ui.reader.ReaderActivity
+import java.util.Locale
+
+class GalleryPreviewsScene : BaseToolbarScene() {
+    private var _binding: SceneGalleryPreviewsBinding? = null
+    private val binding
+        get() = _binding!!
+    private var mGalleryInfo: GalleryInfo? = null
+    private var mAdapter: GalleryPreviewAdapter? = null
+    private var mHelper: GalleryPreviewHelper? = null
+    private var mHasFirstRefresh = false
+    private var mNextPage: Boolean = false
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (savedInstanceState == null) {
+            onInit()
+        } else {
+            onRestore(savedInstanceState)
+        }
+    }
+
+    private fun onInit() {
+        val args = arguments ?: return
+        mGalleryInfo = args.getParcelable(KEY_GALLERY_INFO)
+        mNextPage = args.getBoolean(KEY_NEXT_PAGE)
+    }
+
+    private fun onRestore(savedInstanceState: Bundle) {
+        mGalleryInfo = savedInstanceState.getParcelable(KEY_GALLERY_INFO)
+        mHasFirstRefresh = savedInstanceState.getBoolean(KEY_HAS_FIRST_REFRESH)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        val hasFirstRefresh: Boolean = if (mHelper != null && 1 == mHelper!!.shownViewIndex) {
+            false
+        } else {
+            mHasFirstRefresh
+        }
+        outState.putBoolean(KEY_HAS_FIRST_REFRESH, hasFirstRefresh)
+        outState.putParcelable(KEY_GALLERY_INFO, mGalleryInfo)
+    }
+
+    override fun onCreateViewWithToolbar(
+        inflater: LayoutInflater,
+        container: ViewGroup?, savedInstanceState: Bundle?
+    ): View {
+        _binding = SceneGalleryPreviewsBinding.inflate(inflater, container, false)
+        binding.contentLayout.hideFastScroll()
+        setLiftOnScrollTargetView(binding.contentLayout)
+        mAdapter = GalleryPreviewAdapter()
+        binding.contentLayout.recyclerView.adapter = mAdapter
+        val columnWidth = Settings.getThumbSize()
+        val layoutManager =
+            AutoGridLayoutManager(context, columnWidth, LayoutUtils.dp2pix(context, 16f))
+        layoutManager.setStrategy(AutoGridLayoutManager.STRATEGY_SUITABLE_SIZE)
+        binding.contentLayout.recyclerView.layoutManager = layoutManager
+        binding.contentLayout.recyclerView.clipToPadding = false
+        val padding = LayoutUtils.dp2pix(context, 4f)
+        val decoration = MarginItemDecoration(padding, padding, padding, padding, padding)
+        binding.contentLayout.recyclerView.addItemDecoration(decoration)
+        mHelper = GalleryPreviewHelper()
+        binding.contentLayout.setHelper(mHelper)
+
+        // Only refresh for the first time
+        if (!mHasFirstRefresh) {
+            mHasFirstRefresh = true
+            mHelper?.firstRefresh()
+        }
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        if (null != mHelper) {
+            if (1 == mHelper!!.shownViewIndex) {
+                mHasFirstRefresh = false
+            }
+        }
+        binding.contentLayout.recyclerView.stopScroll()
+        _binding = null
+        mAdapter = null
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setTitle(R.string.gallery_previews)
+        setNavigationIcon(R.drawable.v_arrow_left_dark_x24)
+        if (mGalleryInfo != null) {
+            if ((mGalleryInfo as GalleryDetail).previewPages > 2) showMenu(R.menu.scene_gallery_previews)
+        }
+        runCatching {
+            mHelper!!.mPages = (mGalleryInfo as GalleryDetail).previewPages
+            if (mNextPage && mHelper!!.pages > 1) mHelper!!.goTo(1)
+        }.onFailure {
+            it.printStackTrace()
+        }
+    }
+
+    override fun onMenuItemClick(item: MenuItem): Boolean {
+        val context = context ?: return false
+        val id = item.itemId
+        if (id == R.id.action_go_to) {
+            if (mHelper == null) {
+                return true
+            }
+            val pages = mHelper!!.pages
+            if (pages > 1 && mHelper!!.canGoTo()) {
+                val helper = GoToDialogHelper(pages, mHelper!!.pageForTop)
+                val dialog = BaseDialogBuilder(context).setTitle(R.string.go_to)
+                    .setView(R.layout.dialog_go_to)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .create()
+                dialog.show()
+                helper.setDialog(dialog)
+            }
+            return true
+        }
+        return false
+    }
+
+    fun onItemClick(position: Int): Boolean {
+        val context = context
+        if (null != context && null != mHelper && null != mGalleryInfo) {
+            val p = mHelper!!.getDataAtEx(position)
+            if (p != null) {
+                val intent = Intent(context, ReaderActivity::class.java)
+                intent.action = ReaderActivity.ACTION_EH
+                intent.putExtra(ReaderActivity.KEY_GALLERY_INFO, mGalleryInfo)
+                intent.putExtra(ReaderActivity.KEY_PAGE, p.position)
+                startActivity(intent)
+            }
+        }
+        return true
+    }
+
+    private fun onGetPreviewSetSuccess(result: Pair<PreviewSet, Int>, taskId: Int) {
+        if (null != mHelper && mHelper!!.isCurrentTask(taskId) && null != mGalleryInfo) {
+            val previewSet = result.first
+            val size = previewSet.size()
+            val list = ArrayList<GalleryPreview>(size)
+            for (i in 0 until size) {
+                list.add(previewSet.getGalleryPreview(mGalleryInfo!!.gid, i))
+            }
+            mHelper!!.onGetPageData(
+                taskId, result.second, 0, null, null,
+                list as List<GalleryPreview?>?
+            )
+        }
+    }
+
+    private fun onGetPreviewSetFailure(e: Exception, taskId: Int) {
+        if (mHelper != null && mHelper!!.isCurrentTask(taskId)) {
+            mHelper!!.onGetException(taskId, e)
+        }
+    }
+
+    private class GalleryPreviewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        var image: LoadImageView
+        var text: TextView
+
+        init {
+            image = itemView.findViewById(R.id.image)
+            text = itemView.findViewById(R.id.text)
+        }
+    }
+
+    private inner class GetPreviewSetListener(
+        context: Context,
+        private val mTaskId: Int
+    ) : EhCallback<GalleryPreviewsScene, Pair<PreviewSet, Int>>(context) {
+        override fun onSuccess(result: Pair<PreviewSet, Int>) {
+            val scene = this@GalleryPreviewsScene
+            scene.onGetPreviewSetSuccess(result, mTaskId)
+        }
+
+        override fun onFailure(e: Exception) {
+            val scene = this@GalleryPreviewsScene
+            scene.onGetPreviewSetFailure(e, mTaskId)
+        }
+
+        override fun onCancel() {}
+    }
+
+    private inner class GalleryPreviewAdapter : RecyclerView.Adapter<GalleryPreviewHolder>() {
+        private val mInflater: LayoutInflater = layoutInflater
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GalleryPreviewHolder {
+            return GalleryPreviewHolder(
+                mInflater.inflate(
+                    R.layout.item_gallery_preview,
+                    parent,
+                    false
+                )
+            )
+        }
+
+        @SuppressLint("SetTextI18n")
+        override fun onBindViewHolder(holder: GalleryPreviewHolder, position: Int) {
+            if (null != mHelper) {
+                val preview = mHelper!!.getDataAtEx(position)
+                if (preview != null) {
+                    preview.load(holder.image)
+                    holder.text.text = (preview.position + 1).toString()
+                }
+            }
+            holder.itemView.setOnClickListener { onItemClick(position) }
+        }
+
+        override fun getItemCount(): Int {
+            return if (mHelper != null) mHelper!!.size() else 0
+        }
+    }
+
+    private inner class GalleryPreviewHelper : ContentHelper<GalleryPreview>() {
+        override fun getPageData(
+            taskId: Int,
+            type: Int,
+            page: Int,
+            index: String?,
+            isNext: Boolean
+        ) {
+            val activity = mainActivity
+            if (null == activity || null == mGalleryInfo) {
+                onGetException(taskId, EhException(getString(R.string.error_cannot_find_gallery)))
+                return
+            }
+            val url =
+                EhUrl.getGalleryDetailUrl(mGalleryInfo!!.gid, mGalleryInfo!!.token, page, false)
+            val request = EhRequest()
+            request.setMethod(EhClient.METHOD_GET_PREVIEW_SET)
+            request.setCallback(
+                GetPreviewSetListener(
+                    context,
+                    taskId
+                )
+            )
+            request.setArgs(url)
+            request.enqueue(this@GalleryPreviewsScene)
+        }
+
+        override fun getContext(): Context {
+            return this@GalleryPreviewsScene.requireContext()
+        }
+
+        @SuppressLint("NotifyDataSetChanged")
+        override fun notifyDataSetChanged() {
+            if (mAdapter != null) {
+                mAdapter!!.notifyDataSetChanged()
+            }
+        }
+
+        override fun notifyItemRangeInserted(positionStart: Int, itemCount: Int) {
+            if (mAdapter != null) {
+                mAdapter!!.notifyItemRangeInserted(positionStart, itemCount)
+            }
+        }
+
+        override fun isDuplicate(d1: GalleryPreview, d2: GalleryPreview): Boolean {
+            return false
+        }
+    }
+
+    private inner class GoToDialogHelper(private val mPages: Int, private val mCurrentPage: Int) :
+        View.OnClickListener, DialogInterface.OnDismissListener {
+        private var mSlider: Slider? = null
+        private var mDialog: Dialog? = null
+        fun setDialog(dialog: AlertDialog) {
+            mDialog = dialog
+            (ViewUtils.`$$`(dialog, R.id.start) as TextView).text =
+                String.format(Locale.US, "%d", 1)
+            (ViewUtils.`$$`(dialog, R.id.end) as TextView).text =
+                String.format(Locale.US, "%d", mPages)
+            mSlider = ViewUtils.`$$`(dialog, R.id.slider) as Slider
+            mSlider!!.valueTo = mPages.toFloat()
+            mSlider!!.value = (mCurrentPage + 1).toFloat()
+            dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(this)
+            dialog.setOnDismissListener(this)
+        }
+
+        override fun onClick(v: View) {
+            if (null == mSlider) {
+                return
+            }
+            val page = (mSlider!!.value - 1).toInt()
+            if (page in 0 until mPages && mHelper != null) {
+                mHelper!!.goTo(page)
+                if (mDialog != null) {
+                    mDialog!!.dismiss()
+                    mDialog = null
+                }
+            } else {
+                showTip(R.string.error_out_of_range, LENGTH_LONG)
+            }
+        }
+
+        override fun onDismiss(dialog: DialogInterface) {
+            mDialog = null
+            mSlider = null
+        }
+    }
+
+    companion object {
+        const val KEY_GALLERY_INFO = "gallery_info"
+        const val KEY_NEXT_PAGE = "next_page"
+        private const val KEY_HAS_FIRST_REFRESH = "has_first_refresh"
+    }
+}

app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt

@@ -318,7 +318,7 @@ class HistoryScene : BaseToolbarScene() {
         return true
     }
 
-    private class AddToFavoriteListener(context: Context?) :
+    private class AddToFavoriteListener(context: Context) :
         EhCallback<GalleryListScene?, Void?>(context) {
         override fun onSuccess(result: Void?) {
             showTip(R.string.add_to_favorite_success, LENGTH_SHORT)
@@ -331,7 +331,7 @@ class HistoryScene : BaseToolbarScene() {
         override fun onCancel() {}
     }
 
-    private class RemoveFromFavoriteListener(context: Context?) :
+    private class RemoveFromFavoriteListener(context: Context) :
         EhCallback<GalleryListScene?, Void?>(context) {
         override fun onSuccess(result: Void?) {
             showTip(R.string.remove_from_favorite_success, LENGTH_SHORT)
@@ -396,7 +396,9 @@ class HistoryScene : BaseToolbarScene() {
         override fun onBindViewHolder(holder: HistoryHolder, position: Int) {
             val gi: GalleryInfo? = getItem(position)
             gi ?: return
-            gi.thumb?.let { holder.thumb.load(EhCacheKeyFactory.getThumbKey(gi.gid), it) }
+            gi.thumb?.let {
+                holder.thumb.load(EhCacheKeyFactory.getThumbKey(gi.gid), EhUtils.fixThumbUrl(it))
+            }
             holder.title.text = EhUtils.getSuitableTitle(gi)
             holder.uploader.text = gi.uploader
             holder.rating.rating = gi.rating

app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java

@@ -1,248 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.ui.scene;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.client.EhClient;
-import com.hippo.ehviewer.client.EhRequest;
-import com.hippo.ehviewer.ui.MainActivity;
-import com.hippo.util.ExceptionUtils;
-import com.hippo.view.ViewTransition;
-import com.hippo.yorozuya.AssertUtils;
-import com.hippo.yorozuya.ViewUtils;
-
-/**
- * Only show a progress with jobs in background
- */
-public final class ProgressScene extends BaseScene implements View.OnClickListener {
-
-    public static final String KEY_ACTION = "action";
-    public static final String ACTION_GALLERY_TOKEN = "gallery_token";
-    public static final String KEY_GID = "gid";
-    public static final String KEY_PTOKEN = "ptoken";
-    public static final String KEY_PAGE = "page";
-    private static final String KEY_VALID = "valid";
-    private static final String KEY_ERROR = "error";
-    private boolean mValid;
-    private String mError;
-
-    private String mAction;
-
-    private long mGid;
-    private String mPToken;
-    private int mPage;
-
-    @Nullable
-    private TextView mTip;
-    @Nullable
-    private ViewTransition mViewTransition;
-
-    @Override
-    public boolean needShowLeftDrawer() {
-        return false;
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (savedInstanceState == null) {
-            onInit();
-        } else {
-            onRestore(savedInstanceState);
-        }
-    }
-
-    private boolean doJobs() {
-        Context context = getContext();
-        MainActivity activity = getMainActivity();
-        if (null == context || null == activity) {
-            return false;
-        }
-
-        if (ACTION_GALLERY_TOKEN.equals(mAction)) {
-            if (mGid == -1 || mPToken == null || mPage == -1) {
-                return false;
-            }
-
-            EhRequest request = new EhRequest()
-                    .setMethod(EhClient.METHOD_GET_GALLERY_TOKEN)
-                    .setArgs(mGid, mPToken, mPage)
-                    .setCallback(new GetGalleryTokenListener(context,
-                            1, getTag()));
-            request.enqueue(this);
-            return true;
-        }
-        return false;
-    }
-
-    private boolean handleArgs(Bundle args) {
-        if (args == null) {
-            return false;
-        }
-
-        mAction = args.getString(KEY_ACTION);
-        if (ACTION_GALLERY_TOKEN.equals(mAction)) {
-            mGid = args.getLong(KEY_GID, -1);
-            mPToken = args.getString(KEY_PTOKEN, null);
-            mPage = args.getInt(KEY_PAGE, -1);
-            return mGid != -1 && mPToken != null && mPage != -1;
-        }
-
-        return false;
-    }
-
-    private void onInit() {
-        mValid = handleArgs(getArguments());
-        if (mValid) {
-            mValid = doJobs();
-        }
-        if (!mValid) {
-            mError = getString(R.string.error_something_wrong_happened);
-        }
-    }
-
-    private void onRestore(@NonNull Bundle savedInstanceState) {
-        mValid = savedInstanceState.getBoolean(KEY_VALID);
-        mError = savedInstanceState.getString(KEY_ERROR);
-
-        mAction = savedInstanceState.getString(KEY_ACTION);
-
-        mGid = savedInstanceState.getLong(KEY_GID, -1);
-        mPToken = savedInstanceState.getString(KEY_PTOKEN, null);
-        mPage = savedInstanceState.getInt(KEY_PAGE, -1);
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putBoolean(KEY_VALID, mValid);
-        outState.putString(KEY_ERROR, mError);
-
-        outState.putString(KEY_ACTION, mAction);
-
-        outState.putLong(KEY_GID, mGid);
-        outState.putString(KEY_PTOKEN, mPToken);
-        outState.putInt(KEY_PAGE, mPage);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.scene_progress, container, false);
-        View progress = ViewUtils.$$(view, R.id.progress);
-        mTip = (TextView) ViewUtils.$$(view, R.id.tip);
-
-        Context context = getContext();
-        AssertUtils.assertNotNull(context);
-
-        Drawable drawable = ContextCompat.getDrawable(context, R.drawable.big_sad_pandroid);
-        drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
-        mTip.setCompoundDrawables(null, drawable, null, null);
-        mTip.setOnClickListener(this);
-        mTip.setText(mError);
-
-        mViewTransition = new ViewTransition(progress, mTip);
-
-        if (mValid) {
-            mViewTransition.showView(0, false);
-        } else {
-            mViewTransition.showView(1, false);
-        }
-
-        return view;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        mTip = null;
-        mViewTransition = null;
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (mTip == v) {
-            if (doJobs()) {
-                mValid = true;
-                // Show progress
-                if (null != mViewTransition) {
-                    mViewTransition.showView(0, true);
-                }
-            }
-        }
-    }
-
-    private void onGetGalleryTokenSuccess(String result) {
-        Bundle arg = new Bundle();
-        arg.putString(GalleryDetailScene.KEY_ACTION, GalleryDetailScene.ACTION_GID_TOKEN);
-        arg.putLong(GalleryDetailScene.KEY_GID, mGid);
-        arg.putString(GalleryDetailScene.KEY_TOKEN, result);
-        arg.putInt(GalleryDetailScene.KEY_PAGE, mPage);
-        navigate(R.id.galleryDetailScene, arg);
-    }
-
-    private void onGetGalleryTokenFailure(Exception e) {
-        mValid = false;
-
-        Context context = getContext();
-
-        if (null != context && null != mViewTransition && null != mTip) {
-            // Show tip
-            mError = ExceptionUtils.getReadableString(e);
-            mViewTransition.showView(1);
-            mTip.setText(mError);
-        }
-    }
-
-    private class GetGalleryTokenListener extends EhCallback<ProgressScene, String> {
-
-        public GetGalleryTokenListener(Context context, int stageId, String sceneTag) {
-            super(context);
-        }
-
-        @Override
-        public void onSuccess(String result) {
-            ProgressScene scene = ProgressScene.this;
-            scene.onGetGalleryTokenSuccess(result);
-        }
-
-        @Override
-        public void onFailure(Exception e) {
-            ProgressScene scene = ProgressScene.this;
-            scene.onGetGalleryTokenFailure(e);
-        }
-
-        @Override
-        public void onCancel() {
-        }
-    }
-}

app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt

@@ -0,0 +1,211 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * 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 com.hippo.ehviewer.ui.scene
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.client.EhClient
+import com.hippo.ehviewer.client.EhRequest
+import com.hippo.util.ExceptionUtils
+import com.hippo.view.ViewTransition
+import com.hippo.yorozuya.AssertUtils
+import com.hippo.yorozuya.ViewUtils
+
+/**
+ * Only show a progress with jobs in background
+ */
+class ProgressScene : BaseScene(), View.OnClickListener {
+    private var mValid = false
+    private var mError: String? = null
+    private var mAction: String? = null
+    private var mGid: Long = 0
+    private var mPToken: String? = null
+    private var mPage = 0
+    private var mTip: TextView? = null
+    private var mViewTransition: ViewTransition? = null
+    override fun needShowLeftDrawer(): Boolean {
+        return false
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (savedInstanceState == null) {
+            onInit()
+        } else {
+            onRestore(savedInstanceState)
+        }
+    }
+
+    private fun doJobs(): Boolean {
+        val context = context
+        val activity = mainActivity
+        if (null == context || null == activity) {
+            return false
+        }
+        if (ACTION_GALLERY_TOKEN == mAction) {
+            if (mGid == -1L || mPToken == null || mPage == -1) {
+                return false
+            }
+            val request = EhRequest()
+                .setMethod(EhClient.METHOD_GET_GALLERY_TOKEN)
+                .setArgs(mGid, mPToken!!, mPage)
+                .setCallback(
+                    GetGalleryTokenListener(
+                        context
+                    )
+                )
+            request.enqueue()
+            return true
+        }
+        return false
+    }
+
+    private fun handleArgs(args: Bundle?): Boolean {
+        if (args == null) {
+            return false
+        }
+        mAction = args.getString(KEY_ACTION)
+        if (ACTION_GALLERY_TOKEN == mAction) {
+            mGid = args.getLong(KEY_GID, -1)
+            mPToken = args.getString(KEY_PTOKEN, null)
+            mPage = args.getInt(KEY_PAGE, -1)
+            return mGid != -1L && mPToken != null && mPage != -1
+        }
+        return false
+    }
+
+    private fun onInit() {
+        mValid = handleArgs(arguments)
+        if (mValid) {
+            mValid = doJobs()
+        }
+        if (!mValid) {
+            mError = getString(R.string.error_something_wrong_happened)
+        }
+    }
+
+    private fun onRestore(savedInstanceState: Bundle) {
+        mValid = savedInstanceState.getBoolean(KEY_VALID)
+        mError = savedInstanceState.getString(KEY_ERROR)
+        mAction = savedInstanceState.getString(KEY_ACTION)
+        mGid = savedInstanceState.getLong(KEY_GID, -1)
+        mPToken = savedInstanceState.getString(KEY_PTOKEN, null)
+        mPage = savedInstanceState.getInt(KEY_PAGE, -1)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putBoolean(KEY_VALID, mValid)
+        outState.putString(KEY_ERROR, mError)
+        outState.putString(KEY_ACTION, mAction)
+        outState.putLong(KEY_GID, mGid)
+        outState.putString(KEY_PTOKEN, mPToken)
+        outState.putInt(KEY_PAGE, mPage)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?, savedInstanceState: Bundle?
+    ): View? {
+        val view = inflater.inflate(R.layout.scene_progress, container, false)
+        val progress = ViewUtils.`$$`(view, R.id.progress)
+        mTip = ViewUtils.`$$`(view, R.id.tip) as TextView
+        val context = context
+        AssertUtils.assertNotNull(context)
+        val drawable = ContextCompat.getDrawable(context!!, R.drawable.big_sad_pandroid)
+        drawable!!.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
+        mTip!!.setCompoundDrawables(null, drawable, null, null)
+        mTip!!.setOnClickListener(this)
+        mTip!!.text = mError
+        mViewTransition = ViewTransition(progress, mTip)
+        if (mValid) {
+            mViewTransition!!.showView(0, false)
+        } else {
+            mViewTransition!!.showView(1, false)
+        }
+        return view
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        mTip = null
+        mViewTransition = null
+    }
+
+    override fun onClick(v: View) {
+        if (mTip === v) {
+            if (doJobs()) {
+                mValid = true
+                // Show progress
+                if (null != mViewTransition) {
+                    mViewTransition!!.showView(0, true)
+                }
+            }
+        }
+    }
+
+    private fun onGetGalleryTokenSuccess(result: String) {
+        val arg = Bundle()
+        arg.putString(GalleryDetailScene.KEY_ACTION, GalleryDetailScene.ACTION_GID_TOKEN)
+        arg.putLong(GalleryDetailScene.KEY_GID, mGid)
+        arg.putString(GalleryDetailScene.KEY_TOKEN, result)
+        arg.putInt(GalleryDetailScene.KEY_PAGE, mPage)
+        navigate(R.id.galleryDetailScene, arg)
+    }
+
+    private fun onGetGalleryTokenFailure(e: Exception) {
+        mValid = false
+        val context = context
+        if (null != context && null != mViewTransition && null != mTip) {
+            // Show tip
+            mError = ExceptionUtils.getReadableString(e)
+            mViewTransition!!.showView(1)
+            mTip!!.text = mError
+        }
+    }
+
+    private inner class GetGalleryTokenListener(
+        context: Context
+    ) : EhCallback<ProgressScene, String>(context) {
+        override fun onSuccess(result: String) {
+            val scene = this@ProgressScene
+            scene.onGetGalleryTokenSuccess(result)
+        }
+
+        override fun onFailure(e: Exception) {
+            val scene = this@ProgressScene
+            scene.onGetGalleryTokenFailure(e)
+        }
+
+        override fun onCancel() {}
+    }
+
+    companion object {
+        const val KEY_ACTION = "action"
+        const val ACTION_GALLERY_TOKEN = "gallery_token"
+        const val KEY_GID = "gid"
+        const val KEY_PTOKEN = "ptoken"
+        const val KEY_PAGE = "page"
+        private const val KEY_VALID = "valid"
+        private const val KEY_ERROR = "error"
+    }
+}

app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt

@@ -53,8 +53,6 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
             updateSuggestions()
         }
         binding.searchview.editText.setOnEditorActionListener { _, _, _ ->
-            binding.toolbar.text = binding.searchview.text
-            binding.searchview.hide()
             onApplySearch()
             true
         }
@@ -157,6 +155,8 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
     }
 
     fun onApplySearch() {
+        binding.toolbar.text = binding.searchview.text
+        binding.searchview.hide()
         val query = binding.toolbar.text.toString().trim()
         if (!mAllowEmptySearch && query.isEmpty()) {
             return

app/src/main/java/com/hippo/ehviewer/ui/scene/TransitionNameFactory.java

@@ -1,36 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * 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 com.hippo.ehviewer.ui.scene;
-
-public final class TransitionNameFactory {
-
-    public static String getThumbTransitionName(long gid) {
-        return "thumb:" + gid;
-    }
-
-    public static String getTitleTransitionName(long gid) {
-        return "title:" + gid;
-    }
-
-    public static String getUploaderTransitionName(long gid) {
-        return "uploader:" + gid;
-    }
-
-    public static String getCategoryTransitionName(long gid) {
-        return "category:" + gid;
-    }
-}

app/src/main/java/com/hippo/ehviewer/widget/AdvanceSearchTable.kt

@@ -35,7 +35,6 @@ class AdvanceSearchTable @JvmOverloads constructor(
 ) : LinearLayout(context, attrs) {
     private var mSh: CheckBox
     private var mSto: CheckBox
-    private var mSr: CheckBox
     private var mMinRating: TextInputLayout
     private var mSp: CheckBox
     private var mSpf: EditText
@@ -53,8 +52,7 @@ class AdvanceSearchTable @JvmOverloads constructor(
         mSh = row0.getChildAt(0) as CheckBox
         mSto = row0.getChildAt(1) as CheckBox
         val row1 = getChildAt(1) as ViewGroup
-        mSr = row1.getChildAt(0) as CheckBox
-        mMinRating = row1.getChildAt(1) as TextInputLayout
+        mMinRating = row1.getChildAt(0) as TextInputLayout
         val row2 = getChildAt(2) as ViewGroup
         mSp = row2.getChildAt(0) as CheckBox
         mSpf = row2.getChildAt(1) as EditText
@@ -72,11 +70,6 @@ class AdvanceSearchTable @JvmOverloads constructor(
             true
         }
 
-        mMinRating.isEnabled = mSr.isChecked
-        mSr.setOnCheckedChangeListener { _: CompoundButton, isChecked: Boolean ->
-            mMinRating.isEnabled = isChecked
-        }
-
         mSpt.isEnabled = mSp.isChecked
         mSpf.isEnabled = mSp.isChecked
         mSp.setOnCheckedChangeListener { _: CompoundButton, isChecked: Boolean ->
@@ -105,22 +98,17 @@ class AdvanceSearchTable @JvmOverloads constructor(
     var minRating: Int
         get() {
             val position = mArray.indexOf(mMinRating.editText!!.text.toString())
-            return if (mSr.isChecked && position >= 0) {
-                position + 2
+            return if (position > 0) {
+                position + 1
             } else {
                 -1
             }
         }
         set(minRating) {
-            if (minRating in 2..5) {
-                mSr.isChecked = true
-                (mMinRating.editText!! as AutoCompleteTextView).setText(
-                    mArray[minRating - 2],
-                    false
-                )
-            } else {
-                mSr.isChecked = false
-            }
+            (mMinRating.editText!! as AutoCompleteTextView).setText(
+                mArray[if (minRating in 2..5) minRating - 1 else 0],
+                false
+            )
         }
     var pageFrom: Int
         get() = if (mSp.isChecked) {

app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt

@@ -103,8 +103,8 @@ class SearchLayout @JvmOverloads constructor(
             mChip.isChecked = NumberUtils.int2boolean(mPair.first and mCategoryStored)
             mChip.setOnLongClickListener {
                 if (mChip.isChecked) {
-                    for (i in 1 until mCategoryGroup.childCount + 1) {
-                        mCategoryGroup.check(i)
+                    for (i in 0 until mCategoryGroup.childCount) {
+                        (mCategoryGroup.getChildAt(i) as Chip).isChecked = true
                     }
                     mChip.isChecked = false
                 } else {

app/src/main/java/com/hippo/image/Image.kt

@@ -19,51 +19,44 @@ package com.hippo.image
 
 import android.graphics.ColorSpace
 import android.graphics.ImageDecoder
-import android.graphics.ImageDecoder.DecodeException
 import android.graphics.ImageDecoder.ImageInfo
 import android.graphics.ImageDecoder.Source
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
-import com.hippo.UriArchiveAccessor
 import com.hippo.ehviewer.EhApplication
-import java.io.FileInputStream
 import java.nio.ByteBuffer
-import java.nio.channels.FileChannel
 import kotlin.math.min
 
-class Image private constructor(source: Source, private val byteBuffer: ByteBuffer? = null) {
-    var mObtainedDrawable: Drawable?
-
-    init {
-        mObtainedDrawable =
-            ImageDecoder.decodeDrawable(source) { decoder: ImageDecoder, info: ImageInfo, _: Source ->
-                decoder.setTargetColorSpace(colorSpace)
-                decoder.setTargetSampleSize(
-                    min(
-                        info.size.width / (2 * screenWidth),
-                        info.size.height / (2 * screenHeight)
-                    ).coerceAtLeast(1)
-                )
+class Image private constructor(source: Source, private var src: ByteBufferSource?) {
+    var mObtainedDrawable: Drawable? =
+        ImageDecoder.decodeDrawable(source) { decoder: ImageDecoder, info: ImageInfo, _: Source ->
+            decoder.setTargetColorSpace(colorSpace)
+            decoder.setTargetSampleSize(
+                min(
+                    info.size.width / (2 * screenWidth),
+                    info.size.height / (2 * screenHeight)
+                ).coerceAtLeast(1)
+            )
+        }.also {
+            (it as? BitmapDrawable)?.run {
+                src?.close()
+                src = null
             }
-        if (mObtainedDrawable is BitmapDrawable)
-            byteBuffer?.let { UriArchiveAccessor.releaseByteBuffer(it) }
-    }
+        }
+        private set
 
-    val width: Int
-        get() = mObtainedDrawable?.intrinsicWidth ?: 0
-    val height: Int
-        get() = mObtainedDrawable?.intrinsicHeight ?: 0
+    val size: Int
+        get() = mObtainedDrawable!!.run { intrinsicHeight * intrinsicWidth * 4 * if (this is Animatable) 4 else 1 }
 
     @Synchronized
     fun recycle() {
-        (mObtainedDrawable as? Animatable)?.run {
-            stop()
-            byteBuffer?.let { UriArchiveAccessor.releaseByteBuffer(it) }
-        }
-        (mObtainedDrawable as? BitmapDrawable)?.run { bitmap.recycle() }
+        (mObtainedDrawable as? Animatable)?.stop()
+        (mObtainedDrawable as? BitmapDrawable)?.bitmap?.recycle()
         mObtainedDrawable?.callback = null
         mObtainedDrawable = null
+        src?.close()
+        src = null
     }
 
     companion object {
@@ -77,23 +70,25 @@ class Image private constructor(source: Source, private val byteBuffer: ByteBuff
             ) ColorSpace.Named.DISPLAY_P3 else ColorSpace.Named.SRGB
         )
 
-        @Throws(DecodeException::class)
         @JvmStatic
-        fun decode(stream: FileInputStream): Image {
-            val src = ImageDecoder.createSource(
-                stream.channel.map(
-                    FileChannel.MapMode.READ_ONLY, 0,
-                    stream.available().toLong()
-                )
-            )
-            return Image(src)
+        fun decode(src: ByteBufferSource): Image? {
+            val directBuffer = src.getByteBuffer()
+            check(directBuffer.isDirect)
+            rewriteGifSource(directBuffer)
+            return runCatching {
+                Image(ImageDecoder.createSource(directBuffer), src)
+            }.onFailure {
+                src.close()
+                it.printStackTrace()
+            }.getOrNull()
         }
 
-        @Throws(DecodeException::class)
         @JvmStatic
-        fun decode(buffer: ByteBuffer): Image {
-            val src = ImageDecoder.createSource(buffer)
-            return Image(src, buffer)
-        }
+        private external fun rewriteGifSource(buffer: ByteBuffer)
+    }
+
+    interface ByteBufferSource : AutoCloseable {
+        // A read-write direct bytebuffer, it may in native heap or file mapping
+        fun getByteBuffer(): ByteBuffer
     }
 }

app/src/main/java/com/hippo/io/UniFileInputStreamPipe.java

@@ -34,11 +34,6 @@ public class UniFileInputStreamPipe implements InputStreamPipe {
         mFile = file;
     }
 
-    @Override
-    public void obtain() {
-        // Empty
-    }
-
     @Override
     public void release() {
         // Empty

app/src/main/java/com/hippo/io/UniFileOutputStreamPipe.java

@@ -34,11 +34,6 @@ public class UniFileOutputStreamPipe implements OutputStreamPipe {
         mUniFile = uniFile;
     }
 
-    @Override
-    public void obtain() {
-        // Empty
-    }
-
     @Override
     public void release() {
         // Empty

app/src/main/java/com/hippo/network/CookieRepository.kt

@@ -1,181 +0,0 @@
-/*
- * Copyright 2017 Hippo Seven
- *
- * 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 com.hippo.network
-
-import android.content.Context
-import com.hippo.yorozuya.ObjectUtils
-import okhttp3.Cookie
-import okhttp3.CookieJar
-import okhttp3.HttpUrl
-import java.util.regex.Pattern
-
-open class CookieRepository(context: Context, name: String) : CookieJar {
-    private val db: CookieDatabase
-    private val map: MutableMap<String, CookieSet>
-
-    @Synchronized
-    fun addCookie(cookie: Cookie) {
-        // For cookie database
-        var toAdd: Cookie? = null
-        var toUpdate: Cookie? = null
-        var toRemove: Cookie? = null
-        var set = map[cookie.domain]
-        if (set == null) {
-            set = CookieSet()
-            map[cookie.domain] = set
-        }
-        if (cookie.expiresAt <= System.currentTimeMillis()) {
-            toRemove = set.remove(cookie)
-            // If the cookie is not persistent, it's not in database
-            if (toRemove != null && !toRemove.persistent) {
-                toRemove = null
-            }
-        } else {
-            toAdd = cookie
-            toUpdate = set.add(cookie)
-            // If the cookie is not persistent, it's not in database
-            if (!toAdd.persistent) toAdd = null
-            if (toUpdate != null && !toUpdate.persistent) toUpdate = null
-            // Remove the cookie if it updates to null
-            if (toAdd == null && toUpdate != null) {
-                toRemove = toUpdate
-                toUpdate = null
-            }
-        }
-        if (toRemove != null) {
-            db.remove(toRemove)
-        }
-        if (toAdd != null) {
-            if (toUpdate != null) {
-                db.update(toUpdate, toAdd)
-            } else {
-                db.add(toAdd)
-            }
-        }
-    }
-
-    fun getCookieHeader(url: HttpUrl): String {
-        val cookies = getCookies(url)
-        val cookieHeader = StringBuilder()
-        var i = 0
-        val size = cookies.size
-        while (i < size) {
-            if (i > 0) {
-                cookieHeader.append("; ")
-            }
-            val cookie = cookies[i]
-            cookieHeader.append(cookie.name).append('=').append(cookie.value)
-            i++
-        }
-        return cookieHeader.toString()
-    }
-
-    @Synchronized
-    fun getCookies(url: HttpUrl): List<Cookie> {
-        val accepted: MutableList<Cookie> = ArrayList()
-        val expired: MutableList<Cookie> = ArrayList()
-        for ((domain, cookieSet) in map) {
-            if (domainMatch(url, domain)) {
-                cookieSet[url, accepted, expired]
-            }
-        }
-        for (cookie in expired) {
-            if (cookie.persistent) {
-                db.remove(cookie)
-            }
-        }
-
-        // RFC 6265 Section-5.4 step 2, sort the cookie-list
-        // Cookies with longer paths are listed before cookies with shorter paths.
-        // Ignore creation-time, we don't store them.
-        accepted.sortWith { o1: Cookie, o2: Cookie -> o2.path.length - o1.path.length }
-        return accepted
-    }
-
-    fun contains(url: HttpUrl, name: String?): Boolean {
-        for (cookie in getCookies(url)) {
-            if (ObjectUtils.equal(cookie.name, name)) {
-                return true
-            }
-        }
-        return false
-    }
-
-    /**
-     * Remove all cookies in this `CookieRepository`.
-     */
-    @Synchronized
-    fun clear() {
-        map.clear()
-        db.clear()
-    }
-
-    @Synchronized
-    fun close() {
-        db.close()
-    }
-
-    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
-        for (cookie in cookies) {
-            addCookie(cookie)
-        }
-    }
-
-    override fun loadForRequest(url: HttpUrl): List<Cookie> {
-        return getCookies(url)
-    }
-
-    companion object {
-        /**
-         * Quick and dirty pattern to differentiate IP addresses from hostnames. This is an approximation
-         * of Android's private InetAddress#isNumeric API.
-         *
-         *
-         * This matches IPv6 addresses as a hex string containing at least one colon, and possibly
-         * including dots after the first colon. It matches IPv4 addresses as strings containing only
-         * decimal digits and dots. This pattern matches strings like "a:.23" and "54" that are neither IP
-         * addresses nor hostnames; they will be verified as IP addresses (which is a more strict
-         * verification).
-         */
-        private val VERIFY_AS_IP_ADDRESS =
-            Pattern.compile("([0-9a-fA-F]*:[0-9a-fA-F:.]*)|([\\d.]+)")
-
-        /**
-         * Returns true if `host` is not a host name and might be an IP address.
-         */
-        private fun verifyAsIpAddress(host: String): Boolean {
-            return VERIFY_AS_IP_ADDRESS.matcher(host).matches()
-        }
-
-        // okhttp3.Cookie.domainMatch(HttpUrl, String)
-        @JvmStatic
-        protected fun domainMatch(url: HttpUrl, domain: String?): Boolean {
-            val urlHost = url.host
-            return if (urlHost == domain) {
-                true // As in 'example.com' matching 'example.com'.
-            } else urlHost.endsWith(domain!!)
-                    && urlHost[urlHost.length - domain.length - 1] == '.' && !verifyAsIpAddress(
-                urlHost
-            )
-            // As in 'example.com' matching 'www.example.com'.
-        }
-    }
-
-    init {
-        db = CookieDatabase(context, name)
-        map = db.allCookies
-    }
-}

app/src/main/java/com/hippo/streampipe/InputStreamPipe.java

@@ -21,32 +21,12 @@ import androidx.annotation.NonNull;
 import java.io.IOException;
 import java.io.InputStream;
 
-/**
- * A pipe to open {@code InputStream}
- */
 public interface InputStreamPipe {
 
-    /**
-     * Obtain the {@code InputStreamPipe}.
-     * Call it before opening {@code InputStream}.
-     */
-    void obtain();
-
-    /**
-     * Release the {@code InputStreamPipe}.
-     */
     void release();
 
-    /**
-     * Open {@code InputStream}
-     *
-     * @return the {@code InputStream}
-     */
     @NonNull
     InputStream open() throws IOException;
 
-    /**
-     * Close the {@code InputStream} opened before.
-     */
     void close();
 }

app/src/main/java/com/hippo/streampipe/OutputStreamPipe.java

@@ -21,32 +21,12 @@ import androidx.annotation.NonNull;
 import java.io.IOException;
 import java.io.OutputStream;
 
-/**
- * A pipe to open {@code OutputStream}
- */
 public interface OutputStreamPipe {
 
-    /**
-     * Obtain the {@code OutputStreamPipe}.
-     * Call it before opening {@code OutputStream}.
-     */
-    void obtain();
-
-    /**
-     * Release the {@code OutputStreamPipe}.
-     */
     void release();
 
-    /**
-     * Open {@code OutputStream}
-     *
-     * @return the {@code OutputStream}
-     */
     @NonNull
     OutputStream open() throws IOException;
 
-    /**
-     * Close the {@code OutputStream} opened before.
-     */
     void close();
 }

app/src/main/java/com/hippo/unifile/RawFile.java

@@ -32,11 +32,11 @@ import java.io.OutputStream;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;
 
-class RawFile extends UniFile {
+public class RawFile extends UniFile {
 
     private static final String TAG = RawFile.class.getSimpleName();
 
-    private File mFile;
+    public File mFile;
 
     RawFile(UniFile parent, File file) {
         super(parent);

app/src/main/java/com/hippo/util/BitmapUtils.java

@@ -50,8 +50,6 @@ public final class BitmapUtils {
     public static Bitmap decodeStream(@NonNull InputStreamPipe isp, int maxWidth, int maxHeight,
                                       int pixels, boolean checkMemory, boolean justCalc, int[] sampleSize) {
         try {
-            isp.obtain();
-
             BitmapFactory.Options options = new BitmapFactory.Options();
             options.inJustDecodeBounds = true;
             BitmapFactory.decodeStream(isp.open(), null, options);

app/src/main/java/com/hippo/widget/ContentLayout.java

@@ -227,7 +227,7 @@ public class ContentLayout extends FrameLayout {
         /**
          * The available page count.
          */
-        private int mPages;
+        public int mPages;
         private int mNextPage;
         private int mCurrentTaskId;
         private int mCurrentTaskType;

app/src/main/java/com/hippo/widget/LoadImageView.kt

@@ -28,6 +28,7 @@ import androidx.core.content.ContextCompat
 import coil.imageLoader
 import coil.request.Disposable
 import coil.request.ImageRequest
+import coil.size.Size
 import com.hippo.drawable.PreciselyClipDrawable
 import com.hippo.ehviewer.R
 
@@ -134,7 +135,8 @@ open class LoadImageView @JvmOverloads constructor(
         clearRetry()
         task?.dispose()
         mRequest =
-            ImageRequest.Builder(context).data(url).memoryCacheKey(key).diskCacheKey(key).target(
+            ImageRequest.Builder(context).data(url).memoryCacheKey(key).diskCacheKey(key)
+                .size(Size.ORIGINAL).target(
                 { onWait() },
                 { onFailure() },
                 { onGetValue(it, isLoaded) }

app/src/main/java/com/hippo/yorozuya/Utilities.java

@@ -16,22 +16,10 @@
 
 package com.hippo.yorozuya;
 
-import android.text.TextUtils;
-import android.webkit.MimeTypeMap;
-
 import androidx.annotation.Nullable;
 
-import java.util.regex.Pattern;
-
 public final class Utilities {
 
-    private static final String[] MIME_TYPE_ARRAY = {
-            "image/jpg"
-    };
-    private static final String[] EXTENSION_ARRAY = {
-            "jpg"
-    };
-
     /**
      * Whether the array contain the element
      *
@@ -71,48 +59,4 @@ public final class Utilities {
         }
         return false;
     }
-
-    public static String getNameFromUrl(String url) {
-        if (!TextUtils.isEmpty(url)) {
-            int fragment = url.lastIndexOf('#');
-            if (fragment > 0) {
-                url = url.substring(0, fragment);
-            }
-
-            int query = url.lastIndexOf('?');
-            if (query > 0) {
-                url = url.substring(0, query);
-            }
-
-            int filenamePos = url.lastIndexOf('/');
-            String filename =
-                    0 <= filenamePos ? url.substring(filenamePos + 1) : url;
-
-            // if the filename contains special characters, we don't
-            // consider it valid for our matching purposes:
-            if (filename.length() != 0 &&
-                    Pattern.matches("[a-zA-Z_0-9\\.\\-\\(\\)%]+", filename)) {
-                int dotPos = filename.lastIndexOf('.');
-                if (0 < dotPos) {
-                    return filename.substring(0, dotPos);
-                }
-            }
-        }
-
-        return null;
-    }
-
-    public static String getExtensionFromMimeType(String mimeType) {
-        if (TextUtils.isEmpty(mimeType)) {
-            return null;
-        }
-
-        for (int i = 0, n = MIME_TYPE_ARRAY.length; i < n; i++) {
-            if (MIME_TYPE_ARRAY[i].equals(mimeType)) {
-                return EXTENSION_ARRAY[i];
-            }
-        }
-
-        return MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType);
-    }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

@@ -988,6 +988,10 @@ class ReaderActivity : EhActivity() {
                 .onEach { setPageNumberVisibility(it) }
                 .launchIn(lifecycleScope)
 
+            readerPreferences.showReaderSeekbar().changes()
+                .onEach { setReaderSeekbarVisibility(it) }
+                .launchIn(lifecycleScope)
+
             readerPreferences.trueColor().changes()
                 .onEach { setTrueColor(it) }
                 .launchIn(lifecycleScope)
@@ -1050,6 +1054,10 @@ class ReaderActivity : EhActivity() {
             binding.pageNumber.isVisible = visible
         }
 
+        fun setReaderSeekbarVisibility(visible: Boolean) {
+            binding.readerSeekbar.isVisible = visible
+        }
+
         /**
          * Sets the 32-bit color mode according to [enabled].
          */

app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt

@@ -99,7 +99,7 @@ abstract class PageLoader {
         }
 
         override fun sizeOf(key: Int, value: Image): Int {
-            return value.height * value.width * 4
+            return value.size
         }
 
         override fun entryRemoved(evicted: Boolean, key: Int, oldValue: Image, newValue: Image?) {

app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt

@@ -35,6 +35,7 @@ class ReaderGeneralSettings @JvmOverloads constructor(context: Context, attrs: A
     private fun initGeneralPreferences() {
         binding.backgroundColor.bindToIntPreference(readerPreferences.readerTheme(), R.array.reader_themes_values)
         binding.showPageNumber.bindToPreference(readerPreferences.showPageNumber())
+        binding.showReaderSeekbar.bindToPreference(readerPreferences.showReaderSeekbar())
         binding.fullscreen.bindToPreference(readerPreferences.fullscreen())
         readerPreferences.fullscreen()
             .asHotFlow {

app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt

@@ -14,7 +14,7 @@ class ReaderPreferences(private val preferenceStore: PreferenceStore) {
 
     fun showPageNumber() = preferenceStore.getBoolean("pref_show_page_number_key", true)
 
-    fun showReadingMode() = preferenceStore.getBoolean("pref_show_reading_mode", true)
+    fun showReaderSeekbar() = preferenceStore.getBoolean("pref_show_reader_seekbar", true)
 
     fun trueColor() = preferenceStore.getBoolean("pref_true_color_key", false)
 

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

@@ -39,8 +39,7 @@
                 android:name="androidx.navigation.fragment.NavHostFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:defaultNavHost="true"
-                app:navGraph="@navigation/nav_graph" />
+                app:defaultNavHost="true" />
         </com.hippo.ehviewer.widget.AboveSnackerLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 

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

@@ -19,7 +19,9 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <include layout="@layout/gallery_detail_header" />
+    <include
+        android:id="@+id/header"
+        layout="@layout/gallery_detail_header" />
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -31,13 +33,21 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <include layout="@layout/gallery_detail_actions" />
+            <include
+                android:id="@+id/actions"
+                layout="@layout/gallery_detail_actions" />
 
-            <include layout="@layout/gallery_detail_tags" />
+            <include
+                android:id="@+id/tags"
+                layout="@layout/gallery_detail_tags" />
 
-            <include layout="@layout/gallery_detail_comments" />
+            <include
+                android:id="@+id/comments"
+                layout="@layout/gallery_detail_comments" />
 
-            <include layout="@layout/gallery_detail_previews" />
+            <include
+                android:id="@+id/previews"
+                layout="@layout/gallery_detail_previews" />
 
         </LinearLayout>
 

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

@@ -35,9 +35,10 @@
         app:columnCount="3"
         app:itemMargin="8dp" />
 
-    <TextView
+    <Button
+        style="@style/Widget.Material3.Button.TextButton"
         android:id="@+id/preview_text"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal" />
 

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

@@ -16,14 +16,14 @@
 
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/Widget.Material3.CardView.Filled"
+    style="@style/Widget.Material3.CardView.Outlined"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="6dp"
     android:checkable="true"
     android:clickable="true"
     android:focusable="true"
-    app:cardBackgroundColor="@android:color/transparent">
+    app:strokeColor="@android:color/transparent">
 
     <RelativeLayout
         android:layout_width="match_parent"

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

@@ -26,6 +26,15 @@
             android:text="@string/pref_show_page_number"
             android:textColor="?android:attr/textColorSecondary" />
 
+        <com.google.android.material.materialswitch.MaterialSwitch
+            android:id="@+id/show_reader_seekbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="16dp"
+            android:paddingVertical="16dp"
+            android:text="@string/pref_show_reader_seekbar"
+            android:textColor="?android:attr/textColorSecondary" />
+
         <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/fullscreen"
             android:layout_width="match_parent"

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

@@ -26,7 +26,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include layout="@layout/gallery_detail_content" />
+        <include
+            android:id="@+id/content"
+            layout="@layout/gallery_detail_content" />
 
     </androidx.core.widget.NestedScrollView>
 

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

@@ -50,7 +50,8 @@
     <com.hippo.widget.FabLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingRight="@dimen/corner_fab_margin"
+        android:elevation="6dp"
+        android:paddingEnd="@dimen/corner_fab_margin"
         android:paddingBottom="@dimen/corner_fab_margin"
         app:fitsSystemWindowsInsets="top|bottom">
 

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

@@ -24,7 +24,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginRight="@dimen/advance_search_table_item_margin"
+            android:layout_marginEnd="@dimen/advance_search_table_item_margin"
             android:layout_weight="1"
             android:minWidth="0dp"
             android:minHeight="0dp"
@@ -34,7 +34,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/advance_search_table_item_margin"
+            android:layout_marginStart="@dimen/advance_search_table_item_margin"
             android:layout_weight="1"
             android:minWidth="0dp"
             android:minHeight="0dp"
@@ -45,17 +45,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/advance_search_table_item_margin"
-        android:layout_marginBottom="@dimen/advance_search_table_item_margin">
-
-        <com.google.android.material.checkbox.MaterialCheckBox
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginRight="@dimen/advance_search_table_item_margin"
-            android:layout_weight="1"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="@string/search_sr" />
+        android:layout_marginBottom="@dimen/advance_search_table_item_margin"
+        android:baselineAligned="false">
 
         <com.google.android.material.textfield.TextInputLayout
             style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@@ -63,6 +54,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/advance_search_table_item_margin"
+            android:layout_marginEnd="@dimen/advance_search_table_item_margin"
             android:layout_weight="1"
             android:hint="@string/search_sr">
 
@@ -70,6 +62,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="none"
+                android:text="@string/unlimited"
                 app:simpleItems="@array/search_min_rating" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -85,7 +78,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginRight="@dimen/advance_search_table_item_margin"
+            android:layout_marginEnd="@dimen/advance_search_table_item_margin"
             android:minWidth="0dp"
             android:minHeight="0dp"
             android:text="@string/search_sp" />
@@ -98,6 +91,7 @@
             android:layout_marginLeft="@dimen/advance_search_table_item_margin"
             android:layout_marginRight="@dimen/advance_search_table_item_margin"
             android:imeOptions="actionNext"
+            android:importantForAutofill="no"
             android:inputType="number"
             android:maxLines="1" />
 
@@ -118,6 +112,7 @@
             android:layout_marginLeft="@dimen/advance_search_table_item_margin"
             android:layout_marginRight="@dimen/advance_search_table_item_margin"
             android:imeOptions="actionNone"
+            android:importantForAutofill="no"
             android:inputType="number"
             android:maxLines="1" />
 
@@ -125,7 +120,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/advance_search_table_item_margin"
+            android:layout_marginStart="@dimen/advance_search_table_item_margin"
             android:text="@string/search_sp_suffix"
             android:textColor="?android:attr/textColorPrimary" />
     </LinearLayout>
@@ -153,7 +148,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginRight="@dimen/advance_search_table_item_margin"
+            android:layout_marginEnd="@dimen/advance_search_table_item_margin"
             android:layout_weight="1"
             android:minWidth="0dp"
             android:minHeight="0dp"
@@ -174,7 +169,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/advance_search_table_item_margin"
+            android:layout_marginStart="@dimen/advance_search_table_item_margin"
             android:layout_weight="1"
             android:minWidth="0dp"
             android:minHeight="0dp"