Make release

* Implement #128

* Add LICENSE Header

* Fix zh_CN zh_TW

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -57,7 +57,7 @@ body:
     id: ci
     attributes:
       label: EhViewer CI 版本 / EhViewer CI Version
-      description: 直接将对应 CI 下载页面网址填入即可 / Simply drop CI download page url here
+      description: 直接将对应 GitHub Action CI 下载页面网址填入即可 / Simply drop GitHub Action CI download page url here
       placeholder: https://github.com/Ehviewer-Overhauled/Ehviewer/actions/runs/XXXXXXXXXX
     validations:
       required: true

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -56,7 +56,7 @@ body:
     id: ci
     attributes:
       label: EhViewer CI 版本 / EhViewer CI Version
-      description: 直接将对应 CI 下载页面网址填入即可 / Simply drop CI download page url here
+      description: 直接将对应 GitHub Action CI 下载页面网址填入即可 / Simply drop GitHub Action CI download page url here
       placeholder: https://github.com/Ehviewer-Overhauled/Ehviewer/actions/runs/XXXXXXXXXX
     validations:
       required: true

.github/workflows/releases.yml

@@ -30,17 +30,25 @@ jobs:
         with:
           arguments: assembleRelease
 
+      - name: Rename Apks
+        run: |
+          cp app/build/outputs/apk/release/app-universal-release.apk app/build/outputs/apk/release/EhViewer-universal-A12+.apk
+          cp app/build/outputs/apk/release/app-arm64-v8a-release.apk app/build/outputs/apk/release/EhViewer-arm64-v8a-A12+.apk
+          cp app/build/outputs/apk/release/app-x86_64-release.apk app/build/outputs/apk/release/EhViewer-x86_64-A12+.apk
+          cp app/build/outputs/apk/release/app-x86-release.apk app/build/outputs/apk/release/EhViewer-x86-A12+.apk
+          cp app/build/outputs/apk/release/app-armeabi-v7a-release.apk app/build/outputs/apk/release/EhViewer-armeabi-v7a-A12+.apk
+
       - name: Releases
         uses: softprops/action-gh-release@v1
         with:
           body: Bump Version
           discussion_category_name: Announcements
           files: |
-            app/build/outputs/apk/release/app-universal-release.apk
-            app/build/outputs/apk/release/app-arm64-v8a-release.apk
-            app/build/outputs/apk/release/app-x86_64-release.apk
-            app/build/outputs/apk/release/app-x86-release.apk
-            app/build/outputs/apk/release/app-armeabi-v7a-release.apk
+            app/build/outputs/apk/release/EhViewer-universal-A12+.apk
+            app/build/outputs/apk/release/EhViewer-arm64-v8a-A12+.apk
+            app/build/outputs/apk/release/EhViewer-x86_64-A12+.apk
+            app/build/outputs/apk/release/EhViewer-x86-A12+.apk
+            app/build/outputs/apk/release/EhViewer-armeabi-v7a-A12+.apk
 
       - name: Collect Apks
         run: |

app/build.gradle

@@ -36,8 +36,8 @@ android {
         applicationId "moe.tarsin.ehviewer"
         minSdkVersion 31
         targetSdkVersion 33
-        versionCode 180007
-        versionName "1.8.1.0"
+        versionCode 180009
+        versionName "1.8.2.0"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
     }
 

app/src/main/AndroidManifest.xml

@@ -23,6 +23,7 @@
         android:name="android.hardware.touchscreen"
         android:required="false" />
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -46,6 +47,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
+        android:localeConfig="@xml/locales_config"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme">

app/src/main/cpp/archive.c

@@ -17,10 +17,12 @@
  * EhViewer. If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <pthread.h>
 #include <sys/mman.h>
 
 #include <jni.h>
@@ -37,9 +39,17 @@
 #define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG ,__VA_ARGS__)
 #define LOGF(...) __android_log_print(ANDROID_LOG_FATAL, LOG_TAG ,__VA_ARGS__)
 
-static JNIEnv *env;
-static int cur_index = 0; // Current entry we haven't read any data from it yet
-static struct archive *arc = NULL;
+typedef struct {
+    int using;
+    int next_index;
+    struct archive *arc;
+    struct archive_entry *entry;
+} archive_ctx;
+
+pthread_mutex_t ctx_lock;
+static archive_ctx **ctx_pool;
+#define CTX_POOL_SIZE 20
+
 static bool need_encrypt = false;
 static char *passwd = NULL;
 static void *archiveAddr = NULL;
@@ -57,7 +67,7 @@ const char supportExt[9][6] = {
         "heif"
 };
 
-static int filename_is_playable_file(const char *name) {
+static inline int filename_is_playable_file(const char *name) {
     const char *dotptr = strrchr(name, '.');
     if (!dotptr++)
         return false;
@@ -68,56 +78,150 @@ static int filename_is_playable_file(const char *name) {
     return false;
 }
 
-static long archive_list_all_entries() {
-    struct archive_entry *entry;
+static long archive_list_all_entries(archive_ctx *ctx) {
     long count = 0;
-    while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
-        if (filename_is_playable_file(archive_entry_pathname(entry)))
+    while (archive_read_next_header(ctx->arc, &ctx->entry) == ARCHIVE_OK)
+        if (filename_is_playable_file(archive_entry_pathname(ctx->entry)))
             count++;
-    }
     if (!count)
-        LOGE("%s", archive_error_string(arc));
+        LOGE("%s", archive_error_string(ctx->arc));
     return count;
 }
 
-static void archive_release() {
-    if (arc) {
-        archive_read_close(arc);
-        archive_read_free(arc);
-        arc = NULL;
+static void archive_release_ctx(archive_ctx *ctx) {
+    if (ctx) {
+        archive_read_close(ctx->arc);
+        archive_read_free(ctx->arc);
+        free(ctx);
     }
 }
 
-static int archive_alloc() {
-    archive_release();
-    arc = archive_read_new();
-    archive_read_support_format_all(arc);
-    archive_read_support_filter_all(arc);
-    archive_read_set_option(arc, "zip", "ignorecrc32", "1");
+static int archive_alloc_ctx(archive_ctx **ctxptr) {
+    archive_ctx *ctx;
+    int err;
+    ctx = calloc(1, sizeof(archive_ctx));
+    if (!ctx)
+        return -ENOMEM;
+    ctx->arc = archive_read_new();
+    ctx->using = 1;
+    if (!ctx->arc) {
+        free(ctx);
+        return -ENOMEM;
+    }
+    archive_read_support_format_all(ctx->arc);
+    archive_read_support_filter_all(ctx->arc);
+    archive_read_set_option(ctx->arc, "zip", "ignorecrc32", "1");
     if (passwd)
-        archive_read_add_passphrase(arc, passwd);
-    return archive_read_open_memory(arc, archiveAddr, archiveSize);
+        archive_read_add_passphrase(ctx->arc, passwd);
+    err = archive_read_open_memory(ctx->arc, archiveAddr, archiveSize);
+    if (err) {
+        archive_read_free(ctx->arc);
+        free(ctx);
+        return err;
+    }
+    *ctxptr = ctx;
+    return 0;
+}
+
+static int archive_skip_to_index(archive_ctx *ctx, int index) {
+    assert(!(ctx->next_index > index));
+    while (archive_read_next_header(ctx->arc, &ctx->entry) == ARCHIVE_OK) {
+        if (!filename_is_playable_file(archive_entry_pathname(ctx->entry)))
+            continue;
+        if (ctx->next_index++ == index) {
+            return ctx->next_index - 1;
+        }
+    }
+    return ARCHIVE_FATAL;
+}
+
+static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
+    int ret;
+    archive_ctx *ctx = NULL;
+    pthread_mutex_lock(&ctx_lock);
+    for (int i = 0; i < CTX_POOL_SIZE; i++) {
+        if (!ctx_pool[i])
+            continue;
+        if (ctx_pool[i]->using)
+            continue;
+        if (ctx_pool[i]->next_index > idx)
+            continue;
+        if (!ctx || ctx_pool[i]->next_index > ctx->next_index)
+            ctx = ctx_pool[i];
+        if (ctx->next_index == idx)
+            break;
+    }
+    if (ctx)
+        ctx->using = 1;
+    pthread_mutex_unlock(&ctx_lock);
+
+    if (!ctx) {
+        archive_ctx *victimCtx = NULL;
+        int victimIdx = 0;
+        int replace = 1;
+        ret = archive_alloc_ctx(&ctx);
+        if (ret)
+            return ret;
+        pthread_mutex_lock(&ctx_lock);
+        for (int i = 0; i < CTX_POOL_SIZE; i++) {
+            if (!ctx_pool[i]) {
+                ctx_pool[i] = ctx;
+                replace = 0;
+                break;
+            }
+            if (ctx_pool[i]->using)
+                continue;
+            if (!victimCtx || ctx_pool[i]->next_index > victimCtx->next_index) {
+                victimCtx = ctx_pool[i];
+                victimIdx = i;
+            }
+        }
+        if (replace) {
+            archive_release_ctx(victimCtx);
+            ctx_pool[victimIdx] = ctx;
+        }
+        pthread_mutex_unlock(&ctx_lock);
+    }
+    ret = archive_skip_to_index(ctx, idx);
+    if (ret != idx) {
+        ret = archive_errno(ctx->arc);
+        LOGE("Skip to index failed:%s", archive_error_string(ctx->arc));
+        archive_release_ctx(ctx);
+        return ret;
+    }
+    *ctxptr = ctx;
+    return 0;
 }
 
 JNIEXPORT jint JNICALL
-Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *_, jobject thiz, jint fd, jlong size) {
+Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *env, jobject thiz, jint fd, jlong size) {
+    (void)env; /* UNUSED */
+    (void)thiz; /* UNUSED */
+    archive_ctx *ctx = NULL;
     archiveAddr = mmap64(0, size, PROT_READ, MAP_PRIVATE, fd, 0);
     if (archiveAddr == MAP_FAILED) {
         LOGE("%s%d", "mmap64 failed with errno ", errno);
         return 0;
     }
     archiveSize = size;
-    env = _;
-    long r = archive_alloc();
+    pthread_mutex_init(&ctx_lock, 0);
+    ctx_pool = calloc(CTX_POOL_SIZE, sizeof(archive_ctx **));
+    if (!ctx_pool) {
+        LOGE("Allocate archive ctx pool failed:ENOMEM");
+        return 0;
+    }
+    long r = archive_alloc_ctx(&ctx);
     if (r) {
+        if (r == -ENOMEM)
+            LOGE("%s", "Mem alloc failed");
         r = 0;
-        LOGE("%s%s", "Archive open failed:", archive_error_string(arc));
+        LOGE("%s%s", "Archive open failed:", archive_error_string(ctx->arc));
     } else {
-        r = archive_list_all_entries();
+        r = archive_list_all_entries(ctx);
         LOGI("%s%ld%s", "Found ", r, " image entries in archive");
 
         // We must read through the file|vm then we can know whether it is encrypted
-        int encryptRet = archive_read_has_encrypted_entries(arc);
+        int encryptRet = archive_read_has_encrypted_entries(ctx->arc);
         switch (encryptRet) {
             case 1: // At lease 1 encrypted entry
                 need_encrypt = true;
@@ -128,18 +232,17 @@ Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *_, jobject thiz, jint fd,
         }
 
         // madvise for readahead optimization
-        int format = archive_format(arc);
+        int format = archive_format(ctx->arc);
         switch (format) {
             case ARCHIVE_FORMAT_ZIP:
             case ARCHIVE_FORMAT_RAR:
             case ARCHIVE_FORMAT_RAR_V5:
                 madvise(archiveAddr, archiveSize, MADV_SEQUENTIAL | MADV_WILLNEED);
                 break;
-            default:
-                ;
+            default:;
         }
     }
-    archive_release();
+    archive_release_ctx(ctx);
     return r;
 }
 
@@ -149,65 +252,88 @@ typedef struct Memarea {
 } Memarea;
 
 JNIEXPORT jlong JNICALL
-Java_com_hippo_UriArchiveAccessor_extracttoOutputStream(JNIEnv *_, jobject thiz, jint index) {
-    struct archive_entry *entry;
+Java_com_hippo_UriArchiveAccessor_extracttoOutputStream(JNIEnv *env, jobject thiz, jint index) {
+    (void)env; /* UNUSED */
+    (void)thiz; /* UNUSED */
+    archive_ctx *ctx = NULL;
     int ret;
-    if (!arc || index < cur_index) {
-        archive_alloc();
-        cur_index = 0;
-    }
+    ret = archive_get_ctx(&ctx, index);
+    if (ret)
+        return 0;
     Memarea *memarea = malloc(sizeof(Memarea));
-    while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
-        if (!filename_is_playable_file(archive_entry_pathname(entry)))
-            continue;
-        if (cur_index++ == index) {
-            memarea->size = (long) archive_entry_size(entry);
-            memarea->buffer = malloc(memarea->size);
-            ret = archive_read_data(arc, memarea->buffer, memarea->size);
-            if (ret != memarea->size)
-                LOGE("%s", "No enough data read, WTF?");
-            if (ret < 0)
-                LOGE("%s%s", "Archive read failed:", archive_error_string(arc));
-            break;
-        }
+    if (!memarea) {
+        ctx->using = 0;
+        LOGE("Allocate buffer for decompression failed:ENOMEM");
+        return 0;
     }
-    return (jlong) memarea;
+    memarea->size = (long) archive_entry_size(ctx->entry);
+    memarea->buffer = malloc(memarea->size);
+    if (!memarea->buffer) {
+        ctx->using = 0;
+        LOGE("Allocate buffer for decompression failed:ENOMEM");
+        free(memarea);
+        return 0;
+    }
+    ret = archive_read_data(ctx->arc, memarea->buffer, memarea->size);
+    ctx->using = 0;
+    if (ret == memarea->size)
+        return (jlong) memarea;
+    if (ret != memarea->size)
+        LOGE("%s", "No enough data read, WTF?");
+    if (ret < 0)
+        LOGE("%s%s", "Archive read failed:", archive_error_string(ctx->arc));
+    free(memarea->buffer);
+    free(memarea);
+    return 0;
 }
 
 JNIEXPORT void JNICALL
-Java_com_hippo_UriArchiveAccessor_closeArchive(JNIEnv *jniEnv, jobject thiz) {
-    archive_release();
+Java_com_hippo_UriArchiveAccessor_closeArchive(JNIEnv *env, jobject thiz) {
+    (void)env; /* UNUSED */
+    (void)thiz; /* UNUSED */
+    for (int i = 0; i < CTX_POOL_SIZE; i++)
+        archive_release_ctx(ctx_pool[i]);
     free(passwd);
+    free(ctx_pool);
+    pthread_mutex_destroy(&ctx_lock);
+    passwd = NULL;
+    need_encrypt = false;
     munmap(archiveAddr, archiveSize);
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_hippo_UriArchiveAccessor_needPassword(JNIEnv *_, jobject thiz) {
+Java_com_hippo_UriArchiveAccessor_needPassword(JNIEnv *env, jobject thiz) {
+    (void)env; /* UNUSED */
+    (void)thiz; /* UNUSED */
     return need_encrypt;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_hippo_UriArchiveAccessor_providePassword(JNIEnv *_, jobject thiz, jstring str) {
+Java_com_hippo_UriArchiveAccessor_providePassword(JNIEnv *env, jobject thiz, jstring str) {
+    (void)thiz; /* UNUSED */
     struct archive_entry *entry;
+    archive_ctx *ctx;
     jboolean ret = true;
     int len = (*env)->GetStringUTFLength(env, str);
-    if (passwd)
-        free(passwd);
-    passwd = calloc(len, sizeof(char));
+    passwd = realloc(passwd, len * sizeof(char));
+    if (!passwd) {
+        LOGE("Allocate passwd buffer failed");
+        return false;
+    }
     strcpy(passwd, (*env)->GetStringUTFChars(env, str, NULL));
-    archive_alloc();
+    archive_alloc_ctx(&ctx);
     void *tmpBuf = alloca(4096);
-    while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
+    while (archive_read_next_header(ctx->arc, &entry) == ARCHIVE_OK) {
         if (!filename_is_playable_file(archive_entry_pathname(entry)))
             continue;
         if (!archive_entry_is_encrypted(entry))
             continue;
-        if (archive_read_data(arc, tmpBuf, 4096) < ARCHIVE_OK) {
-            LOGE("%s%s", "Archive read failed:", archive_error_string(arc));
+        if (archive_read_data(ctx->arc, tmpBuf, 4096) < ARCHIVE_OK) {
+            LOGE("%s%s", "Archive read failed:", archive_error_string(ctx->arc));
             ret = false;
         }
         break;
     }
-    archive_release();
+    archive_release_ctx(ctx);
     return ret;
 }

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

@@ -21,10 +21,6 @@ package com.hippo;
 import android.content.Context;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
-import android.system.Os;
-import android.system.OsConstants;
-
-import java.io.FileDescriptor;
 
 public class UriArchiveAccessor {
     ParcelFileDescriptor pfd;

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

@@ -231,6 +231,12 @@ public final class DiskLruCache implements Closeable {
         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 final Callable<Void> cleanupCallable = new Callable<>() {
         public Void call() throws Exception {
             synchronized (DiskLruCache.this) {
@@ -247,12 +253,6 @@ public final class DiskLruCache implements Closeable {
         }
     };
 
-    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);

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

@@ -26,6 +26,7 @@ import android.content.ServiceConnection;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Debug;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
@@ -60,6 +61,7 @@ import com.hippo.ehviewer.client.parser.EventPaneParser;
 import com.hippo.ehviewer.download.DownloadManager;
 import com.hippo.ehviewer.spider.SpiderDen;
 import com.hippo.ehviewer.ui.CommonOperations;
+import com.hippo.ehviewer.ui.EhActivity;
 import com.hippo.image.Image;
 import com.hippo.image.ImageBitmap;
 import com.hippo.network.StatusCodeException;
@@ -337,7 +339,10 @@ public class EhApplication extends SceneApplication {
         EhEngine.initialize();
         BitmapUtils.initialize(this);
 
-        AppCompatDelegate.setApplicationLocales(LocaleListCompat.create(Settings.getLocale()));
+        // Locales can be managed by system automatically above Snow Cone v2
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
+            AppCompatDelegate.setApplicationLocales(LocaleListCompat.create(Settings.getLocale()));
+
         AppCompatDelegate.setDefaultNightMode(Settings.getTheme());
 
         // Do io tasks in new thread
@@ -528,9 +533,9 @@ public class EhApplication extends SceneApplication {
     }
 
     @Nullable
-    public Activity getTopActivity() {
+    public EhActivity getTopActivity() {
         if (!mActivityList.isEmpty()) {
-            return mActivityList.get(mActivityList.size() - 1);
+            return (EhActivity) mActivityList.get(mActivityList.size() - 1);
         } else {
             return null;
         }

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

@@ -76,6 +76,8 @@ public class Settings {
     public static final String KEY_DOWNLOAD_SAVE_SCHEME = "image_scheme";
     public static final String KEY_DOWNLOAD_SAVE_AUTHORITY = "image_authority";
     public static final String KEY_DOWNLOAD_SAVE_PATH = "image_path";
+
+    public static final String KEY_NOTIFICATION_REQUIRED = "notification_required";
     public static final String KEY_DOWNLOAD_SAVE_QUERY = "image_query";
     public static final String KEY_DOWNLOAD_SAVE_FRAGMENT = "image_fragment";
     public static final String KEY_MEDIA_SCAN = "media_scan";
@@ -95,11 +97,13 @@ public class Settings {
     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_APP_LANGUAGE = "app_language";
+    public static final String KEY_LIST_THUMB_SIZE = "list_tile_size";
     private static final String TAG = Settings.class.getSimpleName();
     private static final String KEY_VERSION_CODE = "version_code";
     private static final int DEFAULT_VERSION_CODE = 0;
     private static final String KEY_DISPLAY_NAME = "display_name";
     private static final String DEFAULT_DISPLAY_NAME = null;
+    private static final int DEFAULT_LIST_THUMB_SIZE = 40;
     private static final String KEY_AVATAR = "avatar";
     private static final String DEFAULT_AVATAR = null;
     private static final String KEY_SHOW_WARNING = "show_warning";
@@ -272,11 +276,9 @@ public class Settings {
     private static final int DEFAULT_DOWNLOAD_DELAY = 0;
     private static final String KEY_REQUEST_NEWS = "request_news";
     private static final boolean DEFAULT_REQUEST_NEWS = true;
-
-
     private static final String KEY_ARCHIVE_PASSWDS = "archive_passwds";
-
-
+    public static boolean LIST_THUMB_SIZE_INITED = false;
+    private static int LIST_THUMB_SIZE = 40;
     private static Context sContext;
     private static SharedPreferences sSettingsPre;
     private static EhConfig sEhConfig;
@@ -1168,4 +1170,22 @@ public class Settings {
     public static void putPasswdToArchivePasswds(String value) {
         putStringToStringSet(KEY_ARCHIVE_PASSWDS, value);
     }
+
+    public static int getListThumbSize() {
+        if (LIST_THUMB_SIZE_INITED) {
+            return LIST_THUMB_SIZE;
+        }
+        int size = 3 * getInt(KEY_LIST_THUMB_SIZE, DEFAULT_LIST_THUMB_SIZE);
+        LIST_THUMB_SIZE = size;
+        LIST_THUMB_SIZE_INITED = true;
+        return size;
+    }
+
+    public static boolean getNotificationRequired() {
+        return getBoolean(KEY_NOTIFICATION_REQUIRED, false);
+    }
+
+    public static void putNotificationRequired() {
+        putBoolean(KEY_NOTIFICATION_REQUIRED, true);
+    }
 }

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

@@ -19,13 +19,12 @@ package com.hippo.ehviewer.client.data;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.network.UrlBuilder;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 public class FavListUrlBuilder implements Parcelable {
 
@@ -93,17 +92,13 @@ public class FavListUrlBuilder implements Parcelable {
             ub.addQuery("favcat", "all");
         }
         if (!TextUtils.isEmpty(mKeyword)) {
-            try {
-                ub.addQuery("f_search", URLEncoder.encode(mKeyword, "UTF-8"));
-                // Name
-                ub.addQuery("sn", "on");
-                // Tags
-                ub.addQuery("st", "on");
-                // Note
-                ub.addQuery("sf", "on");
-            } catch (UnsupportedEncodingException e) {
-                Log.e(TAG, "Can't URLEncoder.encode " + mKeyword);
-            }
+            ub.addQuery("f_search", URLEncoder.encode(mKeyword, StandardCharsets.UTF_8));
+            // Name
+            ub.addQuery("sn", "on");
+            // Tags
+            ub.addQuery("st", "on");
+            // Note
+            ub.addQuery("sf", "on");
         }
         if (mIndex > 0) {
             ub.addQuery("page", Integer.toString(mIndex));

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

@@ -32,11 +32,11 @@ import com.hippo.network.UrlBuilder;
 import com.hippo.yorozuya.NumberUtils;
 import com.hippo.yorozuya.StringUtils;
 
-import java.io.UnsupportedEncodingException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 public class ListUrlBuilder implements Cloneable, Parcelable {
 
@@ -383,8 +383,8 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
                     break;
                 case "f_search":
                     try {
-                        keyword = URLDecoder.decode(value, "utf-8");
-                    } catch (UnsupportedEncodingException | IllegalArgumentException e) {
+                        keyword = URLDecoder.decode(value, StandardCharsets.UTF_8);
+                    } catch (IllegalArgumentException e) {
                         // Ignore
                     }
                     break;
@@ -514,11 +514,7 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
                 if (mKeyword != null) {
                     String keyword = mKeyword.trim();
                     if (!keyword.isEmpty()) {
-                        try {
-                            ub.addQuery("f_search", URLEncoder.encode(mKeyword, "UTF-8"));
-                        } catch (UnsupportedEncodingException e) {
-                            // Empty
-                        }
+                        ub.addQuery("f_search", URLEncoder.encode(mKeyword, StandardCharsets.UTF_8));
                     }
                 }
                 if (mSHash != null) {
@@ -565,11 +561,7 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
             case MODE_UPLOADER: {
                 StringBuilder sb = new StringBuilder(EhUrl.getHost());
                 sb.append("uploader/");
-                try {
-                    sb.append(URLEncoder.encode(mKeyword, "UTF-8"));
-                } catch (UnsupportedEncodingException e) {
-                    // Empty
-                }
+                sb.append(URLEncoder.encode(mKeyword, StandardCharsets.UTF_8));
                 if (mPageIndex != 0) {
                     sb.append('/').append(mPageIndex);
                 }
@@ -578,11 +570,7 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
             case MODE_TAG: {
                 StringBuilder sb = new StringBuilder(EhUrl.getHost());
                 sb.append("tag/");
-                try {
-                    sb.append(URLEncoder.encode(mKeyword, "UTF-8"));
-                } catch (UnsupportedEncodingException e) {
-                    // Empty
-                }
+                sb.append(URLEncoder.encode(mKeyword, StandardCharsets.UTF_8));
                 if (mPageIndex != 0) {
                     sb.append('/').append(mPageIndex);
                 }
@@ -595,11 +583,7 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
             case MODE_TOPLIST:
                 StringBuilder sb = new StringBuilder(EhUrl.HOST_E);
                 sb.append("toplist.php?tl=");
-                try {
-                    sb.append(URLEncoder.encode(mKeyword, "UTF-8"));
-                } catch (UnsupportedEncodingException e) {
-                    // Empty
-                }
+                sb.append(URLEncoder.encode(mKeyword, StandardCharsets.UTF_8));
                 if (mPageIndex != 0) {
                     sb.append("&p=").append(mPageIndex);
                 }

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

@@ -23,10 +23,10 @@ import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.ehviewer.client.data.ListUrlBuilder;
 import com.hippo.yorozuya.Utilities;
 
-import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 
 public final class GalleryListUrlParser {
 
@@ -91,11 +91,7 @@ public final class GalleryListUrlParser {
             uploader = path.substring(prefixLength, index);
         }
 
-        try {
-            uploader = URLDecoder.decode(uploader, "utf-8");
-        } catch (UnsupportedEncodingException e) {
-            return null;
-        }
+        uploader = URLDecoder.decode(uploader, StandardCharsets.UTF_8);
 
         if (TextUtils.isEmpty(uploader)) {
             return null;
@@ -120,11 +116,7 @@ public final class GalleryListUrlParser {
             tag = path.substring(prefixLength, index);
         }
 
-        try {
-            tag = URLDecoder.decode(tag, "utf-8");
-        } catch (UnsupportedEncodingException e) {
-            return null;
-        }
+        tag = URLDecoder.decode(tag, StandardCharsets.UTF_8);
 
         if (TextUtils.isEmpty(tag)) {
             return null;

app/src/main/java/com/hippo/ehviewer/dao/BasicDao.java

@@ -4,5 +4,6 @@ import java.util.List;
 
 public interface BasicDao<T> {
     List<T> list();
+
     long insert(T t);
 }

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

@@ -1,581 +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.download;
-
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.SystemClock;
-import android.util.Log;
-
-import androidx.annotation.IntDef;
-import androidx.annotation.Nullable;
-import androidx.core.app.NotificationChannelCompat;
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
-
-import com.hippo.ehviewer.EhApplication;
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.client.EhUtils;
-import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.ehviewer.dao.DownloadInfo;
-import com.hippo.ehviewer.ui.MainActivity;
-import com.hippo.ehviewer.ui.scene.DownloadsScene;
-import com.hippo.scene.StageActivity;
-import com.hippo.util.ReadableTime;
-import com.hippo.yorozuya.FileUtils;
-import com.hippo.yorozuya.SimpleHandler;
-import com.hippo.yorozuya.collect.LongList;
-import com.hippo.yorozuya.collect.SparseJBArray;
-import com.hippo.yorozuya.collect.SparseJLArray;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-public class DownloadService extends Service implements DownloadManager.DownloadListener {
-
-    public static final String ACTION_START = "start";
-    public static final String ACTION_START_RANGE = "start_range";
-    public static final String ACTION_START_ALL = "start_all";
-    public static final String ACTION_STOP = "stop";
-    public static final String ACTION_STOP_RANGE = "stop_range";
-    public static final String ACTION_STOP_CURRENT = "stop_current";
-    public static final String ACTION_STOP_ALL = "stop_all";
-    public static final String ACTION_DELETE = "delete";
-    public static final String ACTION_DELETE_RANGE = "delete_range";
-
-    public static final String ACTION_CLEAR = "clear";
-
-    public static final String KEY_GALLERY_INFO = "gallery_info";
-    public static final String KEY_LABEL = "label";
-    public static final String KEY_GID = "gid";
-    public static final String KEY_GID_LIST = "gid_list";
-
-    private static final int ID_DOWNLOADING = 1;
-    private static final int ID_DOWNLOADED = 2;
-    private static final int ID_509 = 3;
-    private final static SparseJBArray sItemStateArray = new SparseJBArray();
-    private final static SparseJLArray<String> sItemTitleArray = new SparseJLArray<>();
-    private static int sFailedCount;
-    private static int sFinishedCount;
-    private static int sDownloadedCount;
-    @Nullable
-    private NotificationManagerCompat mNotifyManager;
-    @Nullable
-    private DownloadManager mDownloadManager;
-    private NotificationCompat.Builder mDownloadingBuilder;
-    private NotificationCompat.Builder mDownloadedBuilder;
-    private NotificationCompat.Builder m509dBuilder;
-    private NotificationDelay mDownloadingDelay;
-    private NotificationDelay mDownloadedDelay;
-    private NotificationDelay m509Delay;
-    private String CHANNEL_ID;
-
-    public static void clear() {
-        sFailedCount = 0;
-        sFinishedCount = 0;
-        sDownloadedCount = 0;
-        sItemStateArray.clear();
-        sItemTitleArray.clear();
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        CHANNEL_ID = getPackageName() + ".download";
-        mNotifyManager = NotificationManagerCompat.from(this);
-        mNotifyManager.createNotificationChannel(
-                new NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
-                        .setName(getString(R.string.download_service))
-                        .build());
-        mDownloadManager = EhApplication.getDownloadManager(getApplicationContext());
-        mDownloadManager.setDownloadListener(this);
-
-        ensureDownloadingBuilder();
-
-        mDownloadingBuilder.setContentTitle(getString(R.string.download_service))
-                .setContentText(null)
-                .setSubText(null)
-                .setProgress(0, 0, true);
-
-        startForeground(ID_DOWNLOADING, mDownloadingBuilder.build());
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        mNotifyManager = null;
-        if (mDownloadManager != null) {
-            mDownloadManager.setDownloadListener(null);
-            mDownloadManager = null;
-        }
-        mDownloadingBuilder = null;
-        mDownloadedBuilder = null;
-        m509dBuilder = null;
-        if (mDownloadingDelay != null) {
-            mDownloadingDelay.release();
-        }
-        if (mDownloadedDelay != null) {
-            mDownloadedDelay.release();
-        }
-        if (m509Delay != null) {
-            m509Delay.release();
-        }
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        handleIntent(intent);
-        return START_STICKY;
-    }
-
-    private void handleIntent(Intent intent) {
-        String action = null;
-        if (intent != null) {
-            action = intent.getAction();
-        }
-
-        if (ACTION_START.equals(action)) {
-            GalleryInfo gi = intent.getParcelableExtra(KEY_GALLERY_INFO);
-            String label = intent.getStringExtra(KEY_LABEL);
-            if (gi != null && mDownloadManager != null) {
-                mDownloadManager.startDownload(gi, label);
-            }
-        } else if (ACTION_START_RANGE.equals(action)) {
-            LongList gidList = intent.getParcelableExtra(KEY_GID_LIST);
-            if (gidList != null && mDownloadManager != null) {
-                mDownloadManager.startRangeDownload(gidList);
-            }
-        } else if (ACTION_START_ALL.equals(action)) {
-            if (mDownloadManager != null) {
-                mDownloadManager.startAllDownload();
-            }
-        } else if (ACTION_STOP.equals(action)) {
-            long gid = intent.getLongExtra(KEY_GID, -1);
-            if (gid != -1 && mDownloadManager != null) {
-                mDownloadManager.stopDownload(gid);
-            }
-        } else if (ACTION_STOP_CURRENT.equals(action)) {
-            if (mDownloadManager != null) {
-                mDownloadManager.stopCurrentDownload();
-            }
-        } else if (ACTION_STOP_RANGE.equals(action)) {
-            LongList gidList = intent.getParcelableExtra(KEY_GID_LIST);
-            if (gidList != null && mDownloadManager != null) {
-                mDownloadManager.stopRangeDownload(gidList);
-            }
-        } else if (ACTION_STOP_ALL.equals(action)) {
-            if (mDownloadManager != null) {
-                mDownloadManager.stopAllDownload();
-            }
-        } else if (ACTION_DELETE.equals(action)) {
-            long gid = intent.getLongExtra(KEY_GID, -1);
-            if (gid != -1 && mDownloadManager != null) {
-                mDownloadManager.deleteDownload(gid);
-            }
-        } else if (ACTION_DELETE_RANGE.equals(action)) {
-            LongList gidList = intent.getParcelableExtra(KEY_GID_LIST);
-            if (gidList != null && mDownloadManager != null) {
-                mDownloadManager.deleteRangeDownload(gidList);
-            }
-        } else if (ACTION_CLEAR.equals(action)) {
-            clear();
-        }
-
-        checkStopSelf();
-    }
-
-    @Nullable
-    @Override
-    public IBinder onBind(Intent intent) {
-        throw new IllegalStateException("No bindService");
-    }
-
-    private void ensureDownloadingBuilder() {
-        if (mDownloadingBuilder != null) {
-            return;
-        }
-
-        Intent stopAllIntent = new Intent(this, DownloadService.class);
-        stopAllIntent.setAction(ACTION_STOP_ALL);
-        PendingIntent piStopAll = PendingIntent.getService(this, 0, stopAllIntent, PendingIntent.FLAG_IMMUTABLE);
-
-        mDownloadingBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
-                .setSmallIcon(android.R.drawable.stat_sys_download)
-                .setOngoing(true)
-                .setAutoCancel(false)
-                .setCategory(NotificationCompat.CATEGORY_PROGRESS)
-                .addAction(R.drawable.v_pause_x24, getString(R.string.stat_download_action_stop_all), piStopAll)
-                .setShowWhen(false)
-                .setChannelId(CHANNEL_ID);
-
-        mDownloadingDelay = new NotificationDelay(this, mNotifyManager, mDownloadingBuilder, ID_DOWNLOADING);
-    }
-
-    private void ensureDownloadedBuilder() {
-        if (mDownloadedBuilder != null) {
-            return;
-        }
-
-        Intent clearIntent = new Intent(this, DownloadService.class);
-        clearIntent.setAction(ACTION_CLEAR);
-        PendingIntent piClear = PendingIntent.getService(this, 0, clearIntent, PendingIntent.FLAG_IMMUTABLE);
-
-        Bundle bundle = new Bundle();
-        bundle.putString(DownloadsScene.KEY_ACTION, DownloadsScene.ACTION_CLEAR_DOWNLOAD_SERVICE);
-        Intent activityIntent = new Intent(this, MainActivity.class);
-        activityIntent.setAction(StageActivity.ACTION_START_SCENE);
-        activityIntent.putExtra(StageActivity.KEY_SCENE_NAME, DownloadsScene.class.getName());
-        activityIntent.putExtra(StageActivity.KEY_SCENE_ARGS, bundle);
-        PendingIntent piActivity = PendingIntent.getActivity(DownloadService.this, 0,
-                activityIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-
-        mDownloadedBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
-                .setSmallIcon(android.R.drawable.stat_sys_download_done)
-                .setContentTitle(getString(R.string.stat_download_done_title))
-                .setDeleteIntent(piClear)
-                .setOngoing(false)
-                .setAutoCancel(true)
-                .setContentIntent(piActivity);
-
-        mDownloadedDelay = new NotificationDelay(this, mNotifyManager, mDownloadedBuilder, ID_DOWNLOADED);
-    }
-
-    private void ensure509Builder() {
-        if (m509dBuilder != null) {
-            return;
-        }
-
-        m509dBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
-                .setSmallIcon(R.drawable.ic_baseline_warning_24)
-                .setContentText(getString(R.string.stat_509_alert_title))
-                .setContentText(getString(R.string.stat_509_alert_text))
-                .setStyle(new NotificationCompat.BigTextStyle().bigText(getString(R.string.stat_509_alert_text)))
-                .setAutoCancel(true)
-                .setOngoing(false)
-                .setCategory(NotificationCompat.CATEGORY_ERROR);
-
-        m509Delay = new NotificationDelay(this, mNotifyManager, m509dBuilder, ID_509);
-    }
-
-    @Override
-    public void onGet509() {
-        if (mDownloadManager != null) {
-            mDownloadManager.stopAllDownload();
-        }
-        if (mNotifyManager == null) {
-            return;
-        }
-
-        ensure509Builder();
-        m509dBuilder.setWhen(System.currentTimeMillis());
-        m509Delay.show();
-    }
-
-    @Override
-    public void onStart(DownloadInfo info) {
-        if (mNotifyManager == null) {
-            return;
-        }
-
-        ensureDownloadingBuilder();
-
-        Bundle bundle = new Bundle();
-        bundle.putLong(DownloadsScene.KEY_GID, info.gid);
-        Intent activityIntent = new Intent(this, MainActivity.class);
-        activityIntent.setAction(StageActivity.ACTION_START_SCENE);
-        activityIntent.putExtra(StageActivity.KEY_SCENE_NAME, DownloadsScene.class.getName());
-        activityIntent.putExtra(StageActivity.KEY_SCENE_ARGS, bundle);
-        PendingIntent piActivity = PendingIntent.getActivity(DownloadService.this, 0,
-                activityIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-
-        mDownloadingBuilder.setContentTitle(EhUtils.getSuitableTitle(info))
-                .setContentText(null)
-                .setSubText(null)
-                .setProgress(0, 0, true)
-                .setContentIntent(piActivity);
-
-        mDownloadingDelay.startForeground();
-    }
-
-    private void onUpdate(DownloadInfo info) {
-        if (mNotifyManager == null) {
-            return;
-        }
-        ensureDownloadingBuilder();
-
-        long speed = info.speed;
-        if (speed < 0) {
-            speed = 0;
-        }
-        String text = FileUtils.humanReadableByteCount(speed, false) + "/s";
-        long remaining = info.remaining;
-        if (remaining >= 0) {
-            text = getString(R.string.download_speed_text_2, text, ReadableTime.getShortTimeInterval(remaining));
-        } else {
-            text = getString(R.string.download_speed_text, text);
-        }
-        mDownloadingBuilder.setContentTitle(EhUtils.getSuitableTitle(info))
-                .setContentText(text)
-                .setStyle(new NotificationCompat.BigTextStyle().bigText(text))
-                .setSubText(info.total == -1 || info.finished == -1 ? null : info.finished + "/" + info.total)
-                .setProgress(info.total, info.finished, false);
-
-        mDownloadingDelay.startForeground();
-    }
-
-    @Override
-    public void onDownload(DownloadInfo info) {
-        onUpdate(info);
-    }
-
-    @Override
-    public void onGetPage(DownloadInfo info) {
-        onUpdate(info);
-    }
-
-    @Override
-    public void onFinish(DownloadInfo info) {
-        if (mNotifyManager == null) {
-            return;
-        }
-
-        if (null != mDownloadingDelay) {
-            mDownloadingDelay.cancel();
-        }
-
-        ensureDownloadedBuilder();
-
-        boolean finish = info.state == DownloadInfo.STATE_FINISH;
-        long gid = info.gid;
-        int index = sItemStateArray.indexOfKey(gid);
-        if (index < 0) { // Not contain
-            sItemStateArray.put(gid, finish);
-            sItemTitleArray.put(gid, EhUtils.getSuitableTitle(info));
-            sDownloadedCount++;
-            if (finish) {
-                sFinishedCount++;
-            } else {
-                sFailedCount++;
-            }
-        } else { // Contain
-            boolean oldFinish = sItemStateArray.valueAt(index);
-            sItemStateArray.put(gid, finish);
-            sItemTitleArray.put(gid, EhUtils.getSuitableTitle(info));
-            if (oldFinish && !finish) {
-                sFinishedCount--;
-                sFailedCount++;
-            } else if (!oldFinish && finish) {
-                sFinishedCount++;
-                sFailedCount--;
-            }
-        }
-
-        String text;
-        boolean needStyle;
-        if (sFinishedCount != 0 && sFailedCount == 0) {
-            if (sFinishedCount == 1) {
-                if (sItemTitleArray.size() >= 1) {
-                    text = getString(R.string.stat_download_done_line_succeeded, sItemTitleArray.valueAt(0));
-                } else {
-                    Log.d("TAG", "WTF, sItemTitleArray is null");
-                    text = getString(R.string.error_unknown);
-                }
-                needStyle = false;
-            } else {
-                text = getString(R.string.stat_download_done_text_succeeded, sFinishedCount);
-                needStyle = true;
-            }
-        } else if (sFinishedCount == 0 && sFailedCount != 0) {
-            if (sFailedCount == 1) {
-                if (sItemTitleArray.size() >= 1) {
-                    text = getString(R.string.stat_download_done_line_failed, sItemTitleArray.valueAt(0));
-                } else {
-                    Log.d("TAG", "WTF, sItemTitleArray is null");
-                    text = getString(R.string.error_unknown);
-                }
-                needStyle = false;
-            } else {
-                text = getString(R.string.stat_download_done_text_failed, sFailedCount);
-                needStyle = true;
-            }
-        } else {
-            text = getString(R.string.stat_download_done_text_mix, sFinishedCount, sFailedCount);
-            needStyle = true;
-        }
-
-        NotificationCompat.InboxStyle style;
-        if (needStyle) {
-            style = new NotificationCompat.InboxStyle();
-            style.setBigContentTitle(getString(R.string.stat_download_done_title));
-            SparseJBArray stateArray = sItemStateArray;
-            for (int i = 0, n = stateArray.size(); i < n; i++) {
-                long id = stateArray.keyAt(i);
-                boolean fin = stateArray.valueAt(i);
-                String title = sItemTitleArray.get(id);
-                if (title == null) {
-                    continue;
-                }
-                style.addLine(getString(fin ? R.string.stat_download_done_line_succeeded :
-                        R.string.stat_download_done_line_failed, title));
-            }
-        } else {
-            style = null;
-        }
-
-        mDownloadedBuilder.setContentText(text)
-                .setStyle(style)
-                .setWhen(System.currentTimeMillis())
-                .setNumber(sDownloadedCount);
-
-        mDownloadedDelay.show();
-
-        checkStopSelf();
-    }
-
-    @Override
-    public void onCancel(DownloadInfo info) {
-        if (mNotifyManager == null) {
-            return;
-        }
-
-        if (null != mDownloadingDelay) {
-            mDownloadingDelay.cancel();
-        }
-
-        checkStopSelf();
-    }
-
-    private void checkStopSelf() {
-        if (mDownloadManager == null || mDownloadManager.isIdle()) {
-            stopForeground(true);
-            stopSelf();
-        }
-    }
-
-    // TODO Include all notification in one delay
-    // Avoid frequent notification
-    private static class NotificationDelay implements Runnable {
-
-        private static final int OPS_NOTIFY = 0;
-        private static final int OPS_CANCEL = 1;
-        private static final int OPS_START_FOREGROUND = 2;
-        private static final long DELAY = 1000; // 1s
-        private final NotificationManagerCompat mNotifyManager;
-        private final NotificationCompat.Builder mBuilder;
-        private final int mId;
-        private Service mService;
-        private long mLastTime;
-        private boolean mPosted;
-        // false for show, true for cancel
-        @Ops
-        private int mOps;
-
-        public NotificationDelay(Service service, NotificationManagerCompat notifyManager,
-                                 NotificationCompat.Builder builder, int id) {
-            mService = service;
-            mNotifyManager = notifyManager;
-            mBuilder = builder;
-            mId = id;
-        }
-
-        public void release() {
-            mService = null;
-        }
-
-        public void show() {
-            if (mPosted) {
-                mOps = OPS_NOTIFY;
-            } else {
-                long now = SystemClock.currentThreadTimeMillis();
-                if (now - mLastTime > DELAY) {
-                    // Wait long enough, do it now
-                    mNotifyManager.notify(mId, mBuilder.build());
-                } else {
-                    // Too quick, post delay
-                    mOps = OPS_NOTIFY;
-                    mPosted = true;
-                    SimpleHandler.getInstance().postDelayed(this, DELAY);
-                }
-                mLastTime = now;
-            }
-        }
-
-        public void cancel() {
-            if (mPosted) {
-                mOps = OPS_CANCEL;
-            } else {
-                long now = SystemClock.currentThreadTimeMillis();
-                if (now - mLastTime > DELAY) {
-                    // Wait long enough, do it now
-                    mNotifyManager.cancel(mId);
-                } else {
-                    // Too quick, post delay
-                    mOps = OPS_CANCEL;
-                    mPosted = true;
-                    SimpleHandler.getInstance().postDelayed(this, DELAY);
-                }
-            }
-        }
-
-        public void startForeground() {
-            if (mPosted) {
-                mOps = OPS_START_FOREGROUND;
-            } else {
-                long now = SystemClock.currentThreadTimeMillis();
-                if (now - mLastTime > DELAY) {
-                    // Wait long enough, do it now
-                    if (mService != null) {
-                        mService.startForeground(mId, mBuilder.build());
-                    }
-                } else {
-                    // Too quick, post delay
-                    mOps = OPS_START_FOREGROUND;
-                    mPosted = true;
-                    SimpleHandler.getInstance().postDelayed(this, DELAY);
-                }
-            }
-        }
-
-        @Override
-        public void run() {
-            mPosted = false;
-            switch (mOps) {
-                case OPS_NOTIFY:
-                    mNotifyManager.notify(mId, mBuilder.build());
-                    break;
-                case OPS_CANCEL:
-                    mNotifyManager.cancel(mId);
-                    break;
-                case OPS_START_FOREGROUND:
-                    if (mService != null) {
-                        mService.startForeground(mId, mBuilder.build());
-                    }
-                    break;
-            }
-        }
-
-        @IntDef({OPS_NOTIFY, OPS_CANCEL, OPS_START_FOREGROUND})
-        @Retention(RetentionPolicy.SOURCE)
-        private @interface Ops {
-        }
-    }
-}

app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt

@@ -0,0 +1,550 @@
+/*
+ * 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.download
+
+import android.Manifest
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.os.IBinder
+import android.os.SystemClock
+import android.util.Log
+import androidx.annotation.IntDef
+import androidx.core.app.ActivityCompat
+import androidx.core.app.NotificationChannelCompat
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import com.hippo.ehviewer.EhApplication
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.client.EhUtils
+import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.dao.DownloadInfo
+import com.hippo.ehviewer.ui.MainActivity
+import com.hippo.ehviewer.ui.scene.DownloadsScene
+import com.hippo.scene.StageActivity
+import com.hippo.util.ReadableTime
+import com.hippo.yorozuya.FileUtils
+import com.hippo.yorozuya.SimpleHandler
+import com.hippo.yorozuya.collect.LongList
+import com.hippo.yorozuya.collect.SparseJBArray
+import com.hippo.yorozuya.collect.SparseJLArray
+
+class DownloadService : Service(), DownloadManager.DownloadListener {
+    private var mNotifyManager: NotificationManagerCompat? = null
+    private var mDownloadManager: DownloadManager? = null
+    private var mDownloadingBuilder: NotificationCompat.Builder? = null
+    private var mDownloadedBuilder: NotificationCompat.Builder? = null
+    private var m509dBuilder: NotificationCompat.Builder? = null
+    private var mDownloadingDelay: NotificationDelay? = null
+    private var mDownloadedDelay: NotificationDelay? = null
+    private var m509Delay: NotificationDelay? = null
+    private var mChannelID: String? = null
+
+    override fun onCreate() {
+        super.onCreate()
+        mChannelID = "$packageName.download"
+        mNotifyManager = NotificationManagerCompat.from(this)
+        mNotifyManager!!.createNotificationChannel(
+            NotificationChannelCompat.Builder(
+                mChannelID!!,
+                NotificationManagerCompat.IMPORTANCE_LOW
+            )
+                .setName(getString(R.string.download_service))
+                .build()
+        )
+        mDownloadManager = EhApplication.getDownloadManager(applicationContext)
+        mDownloadManager!!.setDownloadListener(this)
+        ensureDownloadingBuilder()
+        mDownloadingBuilder!!.setContentTitle(getString(R.string.download_service))
+            .setContentText(null)
+            .setSubText(null)
+            .setProgress(0, 0, true)
+        startForeground(ID_DOWNLOADING, mDownloadingBuilder!!.build())
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        mNotifyManager = null
+        if (mDownloadManager != null) {
+            mDownloadManager!!.setDownloadListener(null)
+            mDownloadManager = null
+        }
+        mDownloadingBuilder = null
+        mDownloadedBuilder = null
+        m509dBuilder = null
+    }
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        handleIntent(intent)
+        return START_STICKY
+    }
+
+    private fun handleIntent(intent: Intent?) {
+        var action: String? = null
+        if (intent != null) {
+            action = intent.action
+        }
+        if (ACTION_START == action) {
+            val gi = intent!!.getParcelableExtra<GalleryInfo>(KEY_GALLERY_INFO)
+            val label = intent.getStringExtra(KEY_LABEL)
+            if (gi != null && mDownloadManager != null) {
+                mDownloadManager!!.startDownload(gi, label)
+            }
+        } else if (ACTION_START_RANGE == action) {
+            val gidList = intent!!.getParcelableExtra<LongList>(KEY_GID_LIST)
+            if (gidList != null && mDownloadManager != null) {
+                mDownloadManager!!.startRangeDownload(gidList)
+            }
+        } else if (ACTION_START_ALL == action) {
+            if (mDownloadManager != null) {
+                mDownloadManager!!.startAllDownload()
+            }
+        } else if (ACTION_STOP == action) {
+            val gid = intent!!.getLongExtra(KEY_GID, -1)
+            if (gid != -1L && mDownloadManager != null) {
+                mDownloadManager!!.stopDownload(gid)
+            }
+        } else if (ACTION_STOP_CURRENT == action) {
+            if (mDownloadManager != null) {
+                mDownloadManager!!.stopCurrentDownload()
+            }
+        } else if (ACTION_STOP_RANGE == action) {
+            val gidList = intent!!.getParcelableExtra<LongList>(KEY_GID_LIST)
+            if (gidList != null && mDownloadManager != null) {
+                mDownloadManager!!.stopRangeDownload(gidList)
+            }
+        } else if (ACTION_STOP_ALL == action) {
+            if (mDownloadManager != null) {
+                mDownloadManager!!.stopAllDownload()
+            }
+        } else if (ACTION_DELETE == action) {
+            val gid = intent!!.getLongExtra(KEY_GID, -1)
+            if (gid != -1L && mDownloadManager != null) {
+                mDownloadManager!!.deleteDownload(gid)
+            }
+        } else if (ACTION_DELETE_RANGE == action) {
+            val gidList = intent!!.getParcelableExtra<LongList>(KEY_GID_LIST)
+            if (gidList != null && mDownloadManager != null) {
+                mDownloadManager!!.deleteRangeDownload(gidList)
+            }
+        } else if (ACTION_CLEAR == action) {
+            clear()
+        }
+        checkStopSelf()
+    }
+
+    override fun onBind(intent: Intent): IBinder? {
+        throw IllegalStateException("No bindService")
+    }
+
+    private fun ensureDownloadingBuilder() {
+        if (mDownloadingBuilder != null) {
+            return
+        }
+        val stopAllIntent = Intent(this, DownloadService::class.java)
+        stopAllIntent.action = ACTION_STOP_ALL
+        val piStopAll =
+            PendingIntent.getService(this, 0, stopAllIntent, PendingIntent.FLAG_IMMUTABLE)
+        mDownloadingBuilder = NotificationCompat.Builder(applicationContext, mChannelID!!)
+            .setSmallIcon(android.R.drawable.stat_sys_download)
+            .setOngoing(true)
+            .setAutoCancel(false)
+            .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+            .addAction(
+                R.drawable.v_pause_x24,
+                getString(R.string.stat_download_action_stop_all),
+                piStopAll
+            )
+            .setShowWhen(false)
+            .setChannelId(mChannelID!!)
+        mDownloadingDelay =
+            NotificationDelay(this, mNotifyManager!!, mDownloadingBuilder!!, ID_DOWNLOADING)
+    }
+
+    private fun ensureDownloadedBuilder() {
+        if (mDownloadedBuilder != null) {
+            return
+        }
+        val clearIntent = Intent(this, DownloadService::class.java)
+        clearIntent.action = ACTION_CLEAR
+        val piClear = PendingIntent.getService(this, 0, clearIntent, PendingIntent.FLAG_IMMUTABLE)
+        val bundle = Bundle()
+        bundle.putString(DownloadsScene.KEY_ACTION, DownloadsScene.ACTION_CLEAR_DOWNLOAD_SERVICE)
+        val activityIntent = Intent(this, MainActivity::class.java)
+        activityIntent.action = StageActivity.ACTION_START_SCENE
+        activityIntent.putExtra(StageActivity.KEY_SCENE_NAME, DownloadsScene::class.java.name)
+        activityIntent.putExtra(StageActivity.KEY_SCENE_ARGS, bundle)
+        val piActivity = PendingIntent.getActivity(
+            this@DownloadService, 0,
+            activityIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+        mDownloadedBuilder = NotificationCompat.Builder(applicationContext, mChannelID!!)
+            .setSmallIcon(android.R.drawable.stat_sys_download_done)
+            .setContentTitle(getString(R.string.stat_download_done_title))
+            .setDeleteIntent(piClear)
+            .setOngoing(false)
+            .setAutoCancel(true)
+            .setContentIntent(piActivity)
+        mDownloadedDelay =
+            NotificationDelay(this, mNotifyManager!!, mDownloadedBuilder!!, ID_DOWNLOADED)
+    }
+
+    private fun ensure509Builder() {
+        if (m509dBuilder != null) {
+            return
+        }
+        m509dBuilder = NotificationCompat.Builder(applicationContext, mChannelID!!)
+            .setSmallIcon(R.drawable.ic_baseline_warning_24)
+            .setContentText(getString(R.string.stat_509_alert_title))
+            .setContentText(getString(R.string.stat_509_alert_text))
+            .setStyle(
+                NotificationCompat.BigTextStyle().bigText(getString(R.string.stat_509_alert_text))
+            )
+            .setAutoCancel(true)
+            .setOngoing(false)
+            .setCategory(NotificationCompat.CATEGORY_ERROR)
+        m509Delay = NotificationDelay(this, mNotifyManager!!, m509dBuilder!!, ID_509)
+    }
+
+    override fun onGet509() {
+        if (mDownloadManager != null) {
+            mDownloadManager!!.stopAllDownload()
+        }
+        if (mNotifyManager == null) {
+            return
+        }
+        ensure509Builder()
+        m509dBuilder!!.setWhen(System.currentTimeMillis())
+        m509Delay!!.show()
+    }
+
+    override fun onStart(info: DownloadInfo) {
+        if (mNotifyManager == null) {
+            return
+        }
+        ensureDownloadingBuilder()
+        val bundle = Bundle()
+        bundle.putLong(DownloadsScene.KEY_GID, info.gid)
+        val activityIntent = Intent(this, MainActivity::class.java)
+        activityIntent.action = StageActivity.ACTION_START_SCENE
+        activityIntent.putExtra(StageActivity.KEY_SCENE_NAME, DownloadsScene::class.java.name)
+        activityIntent.putExtra(StageActivity.KEY_SCENE_ARGS, bundle)
+        val piActivity = PendingIntent.getActivity(
+            this@DownloadService, 0,
+            activityIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+        mDownloadingBuilder!!.setContentTitle(EhUtils.getSuitableTitle(info))
+            .setContentText(null)
+            .setSubText(null)
+            .setProgress(0, 0, true)
+            .setContentIntent(piActivity)
+        mDownloadingDelay!!.startForeground()
+    }
+
+    private fun onUpdate(info: DownloadInfo) {
+        if (mNotifyManager == null) {
+            return
+        }
+        ensureDownloadingBuilder()
+        var speed = info.speed
+        if (speed < 0) {
+            speed = 0
+        }
+        var text = FileUtils.humanReadableByteCount(speed, false) + "/s"
+        val remaining = info.remaining
+        text = if (remaining >= 0) {
+            getString(
+                R.string.download_speed_text_2,
+                text,
+                ReadableTime.getShortTimeInterval(remaining)
+            )
+        } else {
+            getString(R.string.download_speed_text, text)
+        }
+        mDownloadingBuilder!!.setContentTitle(EhUtils.getSuitableTitle(info))
+            .setContentText(text)
+            .setStyle(NotificationCompat.BigTextStyle().bigText(text))
+            .setSubText(if (info.total == -1 || info.finished == -1) null else info.finished.toString() + "/" + info.total)
+            .setProgress(info.total, info.finished, false)
+        mDownloadingDelay!!.startForeground()
+    }
+
+    override fun onDownload(info: DownloadInfo) {
+        onUpdate(info)
+    }
+
+    override fun onGetPage(info: DownloadInfo) {
+        onUpdate(info)
+    }
+
+    override fun onFinish(info: DownloadInfo) {
+        if (mNotifyManager == null) {
+            return
+        }
+        if (null != mDownloadingDelay) {
+            mDownloadingDelay!!.cancel()
+        }
+        ensureDownloadedBuilder()
+        val finish = info.state == DownloadInfo.STATE_FINISH
+        val gid = info.gid
+        val index = sItemStateArray.indexOfKey(gid)
+        if (index < 0) { // Not contain
+            sItemStateArray.put(gid, finish)
+            sItemTitleArray.put(gid, EhUtils.getSuitableTitle(info))
+            sDownloadedCount++
+            if (finish) {
+                sFinishedCount++
+            } else {
+                sFailedCount++
+            }
+        } else { // Contain
+            val oldFinish = sItemStateArray.valueAt(index)
+            sItemStateArray.put(gid, finish)
+            sItemTitleArray.put(gid, EhUtils.getSuitableTitle(info))
+            if (oldFinish && !finish) {
+                sFinishedCount--
+                sFailedCount++
+            } else if (!oldFinish && finish) {
+                sFinishedCount++
+                sFailedCount--
+            }
+        }
+        val text: String
+        val needStyle: Boolean
+        if (sFinishedCount != 0 && sFailedCount == 0) {
+            if (sFinishedCount == 1) {
+                text = if (sItemTitleArray.size() >= 1) {
+                    getString(
+                        R.string.stat_download_done_line_succeeded,
+                        sItemTitleArray.valueAt(0)
+                    )
+                } else {
+                    Log.d("TAG", "WTF, sItemTitleArray is null")
+                    getString(R.string.error_unknown)
+                }
+                needStyle = false
+            } else {
+                text = getString(R.string.stat_download_done_text_succeeded, sFinishedCount)
+                needStyle = true
+            }
+        } else if (sFinishedCount == 0 && sFailedCount != 0) {
+            if (sFailedCount == 1) {
+                text = if (sItemTitleArray.size() >= 1) {
+                    getString(
+                        R.string.stat_download_done_line_failed,
+                        sItemTitleArray.valueAt(0)
+                    )
+                } else {
+                    Log.d("TAG", "WTF, sItemTitleArray is null")
+                    getString(R.string.error_unknown)
+                }
+                needStyle = false
+            } else {
+                text = getString(R.string.stat_download_done_text_failed, sFailedCount)
+                needStyle = true
+            }
+        } else {
+            text = getString(R.string.stat_download_done_text_mix, sFinishedCount, sFailedCount)
+            needStyle = true
+        }
+        val style: NotificationCompat.InboxStyle?
+        if (needStyle) {
+            style = NotificationCompat.InboxStyle()
+            style.setBigContentTitle(getString(R.string.stat_download_done_title))
+            val stateArray = sItemStateArray
+            var i = 0
+            val n = stateArray.size()
+            while (i < n) {
+                val id = stateArray.keyAt(i)
+                val fin = stateArray.valueAt(i)
+                val title = sItemTitleArray[id]
+                if (title == null) {
+                    i++
+                    continue
+                }
+                style.addLine(
+                    getString(
+                        if (fin) R.string.stat_download_done_line_succeeded else R.string.stat_download_done_line_failed,
+                        title
+                    )
+                )
+                i++
+            }
+        } else {
+            style = null
+        }
+        mDownloadedBuilder!!.setContentText(text)
+            .setStyle(style)
+            .setWhen(System.currentTimeMillis())
+            .setNumber(sDownloadedCount)
+        mDownloadedDelay!!.show()
+        checkStopSelf()
+    }
+
+    override fun onCancel(info: DownloadInfo) {
+        if (mNotifyManager == null) {
+            return
+        }
+        if (null != mDownloadingDelay) {
+            mDownloadingDelay!!.cancel()
+        }
+        checkStopSelf()
+    }
+
+    private fun checkStopSelf() {
+        if (mDownloadManager == null || mDownloadManager!!.isIdle) {
+            stopForeground(true)
+            stopSelf()
+        }
+    }
+
+    private class NotificationDelay(
+        private var mService: Service,
+        private val mNotifyManager: NotificationManagerCompat,
+        private val mBuilder: NotificationCompat.Builder,
+        private val mId: Int
+    ) : Runnable {
+        private var mLastTime: Long = 0
+        private var mPosted = false
+
+        // false for show, true for cancel
+        @Ops
+        private var mOps = 0
+
+        fun show() {
+            if (mPosted) {
+                mOps = OPS_NOTIFY
+            } else {
+                val now = SystemClock.currentThreadTimeMillis()
+                if (now - mLastTime > DELAY) {
+                    // Wait long enough, do it now
+                    if (ActivityCompat.checkSelfPermission(
+                            mService,
+                            Manifest.permission.POST_NOTIFICATIONS
+                        ) != PackageManager.PERMISSION_GRANTED
+                    ) {
+                        return
+                    }
+                    mNotifyManager.notify(mId, mBuilder.build())
+                } else {
+                    // Too quick, post delay
+                    mOps = OPS_NOTIFY
+                    mPosted = true
+                    SimpleHandler.getInstance().postDelayed(this, DELAY)
+                }
+                mLastTime = now
+            }
+        }
+
+        fun cancel() {
+            if (mPosted) {
+                mOps = OPS_CANCEL
+            } else {
+                val now = SystemClock.currentThreadTimeMillis()
+                if (now - mLastTime > DELAY) {
+                    // Wait long enough, do it now
+                    mNotifyManager.cancel(mId)
+                } else {
+                    // Too quick, post delay
+                    mOps = OPS_CANCEL
+                    mPosted = true
+                    SimpleHandler.getInstance().postDelayed(this, DELAY)
+                }
+            }
+        }
+
+        fun startForeground() {
+            if (mPosted) {
+                mOps = OPS_START_FOREGROUND
+            } else {
+                val now = SystemClock.currentThreadTimeMillis()
+                if (now - mLastTime > DELAY) {
+                    // Wait long enough, do it now
+                    mService.startForeground(mId, mBuilder.build())
+                } else {
+                    // Too quick, post delay
+                    mOps = OPS_START_FOREGROUND
+                    mPosted = true
+                    SimpleHandler.getInstance().postDelayed(this, DELAY)
+                }
+            }
+        }
+
+        override fun run() {
+            mPosted = false
+            when (mOps) {
+                OPS_NOTIFY -> {
+                    if (ActivityCompat.checkSelfPermission(
+                            mService,
+                            Manifest.permission.POST_NOTIFICATIONS
+                        ) != PackageManager.PERMISSION_GRANTED
+                    ) {
+                        return
+                    }
+                    mNotifyManager.notify(mId, mBuilder.build())
+                }
+                OPS_CANCEL -> mNotifyManager.cancel(mId)
+                OPS_START_FOREGROUND -> mService.startForeground(mId, mBuilder.build())
+            }
+        }
+
+        @IntDef(OPS_NOTIFY, OPS_CANCEL, OPS_START_FOREGROUND)
+        @Retention(AnnotationRetention.SOURCE)
+        private annotation class Ops
+        companion object {
+            private const val OPS_NOTIFY = 0
+            private const val OPS_CANCEL = 1
+            private const val OPS_START_FOREGROUND = 2
+            private const val DELAY: Long = 1000 // 1s
+        }
+    }
+
+    companion object {
+        const val ACTION_START = "start"
+        const val ACTION_START_RANGE = "start_range"
+        const val ACTION_START_ALL = "start_all"
+        const val ACTION_STOP = "stop"
+        const val ACTION_STOP_RANGE = "stop_range"
+        const val ACTION_STOP_CURRENT = "stop_current"
+        const val ACTION_STOP_ALL = "stop_all"
+        const val ACTION_DELETE = "delete"
+        const val ACTION_DELETE_RANGE = "delete_range"
+        const val ACTION_CLEAR = "clear"
+        const val KEY_GALLERY_INFO = "gallery_info"
+        const val KEY_LABEL = "label"
+        const val KEY_GID = "gid"
+        const val KEY_GID_LIST = "gid_list"
+        private const val ID_DOWNLOADING = 1
+        private const val ID_DOWNLOADED = 2
+        private const val ID_509 = 3
+        private val sItemStateArray = SparseJBArray()
+        private val sItemTitleArray = SparseJLArray<String>()
+        private var sFailedCount = 0
+        private var sFinishedCount = 0
+        private var sDownloadedCount = 0
+
+        @JvmStatic
+        fun clear() {
+            sFailedCount = 0
+            sFinishedCount = 0
+            sDownloadedCount = 0
+            sItemStateArray.clear()
+            sItemTitleArray.clear()
+        }
+    }
+}

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

@@ -28,7 +28,6 @@ import com.hippo.UriArchiveAccessor;
 import com.hippo.ehviewer.GetText;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.Settings;
-import com.hippo.glgallery.GalleryPageView;
 import com.hippo.image.Image;
 import com.hippo.unifile.UniFile;
 import com.hippo.yorozuya.thread.PVLock;
@@ -48,11 +47,14 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
     public static PVLock pv = new PVLock(0);
     private final UriArchiveAccessor archiveAccessor;
     private final Stack<Integer> requests = new Stack<>();
-    private final AtomicInteger extractingIndex = new AtomicInteger(GalleryPageView.INVALID_INDEX);
     private final LinkedHashMap<Integer, Long> streams = new LinkedHashMap<>();
-    private final AtomicInteger decodingIndex = new AtomicInteger(GalleryPageView.INVALID_INDEX);
+    private final Thread[] decodeThread = new Thread[]{
+            new Thread(new DecodeTask()),
+            new Thread(new DecodeTask()),
+            new Thread(new DecodeTask()),
+            new Thread(new DecodeTask())
+    };
     private Thread archiveThread;
-    private Thread decodeThread;
     private volatile int size = STATE_WAIT;
     private String error;
 
@@ -74,25 +76,22 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
         int id = sIdGenerator.incrementAndGet();
 
         archiveThread = new PriorityThread(
-                new ArchiveTask(), "ArchiveTask" + '-' + id, Process.THREAD_PRIORITY_BACKGROUND);
+                new ArchiveHostTask(), "ArchiveTask" + '-' + id, Process.THREAD_PRIORITY_BACKGROUND);
         archiveThread.start();
-
-        decodeThread = new PriorityThread(
-                new DecodeTask(), "DecodeTask" + '-' + id, Process.THREAD_PRIORITY_BACKGROUND);
-        decodeThread.start();
+        for (Thread i : decodeThread) {
+            i.start();
+        }
     }
 
     @Override
     public void stop() {
         super.stop();
-
         if (archiveThread != null) {
             archiveThread.interrupt();
             archiveThread = null;
         }
-        if (decodeThread != null) {
-            decodeThread.interrupt();
-            decodeThread = null;
+        for (Thread i : decodeThread) {
+            i.interrupt();
         }
         try {
             archiveAccessor.close();
@@ -110,11 +109,11 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
     protected void onRequest(int index) {
         boolean inDecodeTask;
         synchronized (streams) {
-            inDecodeTask = streams.containsKey(index) || index == decodingIndex.get();
+            inDecodeTask = streams.containsKey(index);
         }
 
         synchronized (requests) {
-            boolean inArchiveTask = requests.contains(index) || index == extractingIndex.get();
+            boolean inArchiveTask = requests.contains(index);
             if (!inArchiveTask && !inDecodeTask) {
                 requests.add(index);
                 requests.notify();
@@ -167,7 +166,14 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
         return Integer.toString(index);
     }
 
-    private class ArchiveTask implements Runnable {
+    private class ArchiveHostTask implements Runnable {
+        public final Thread[] archiveThreads = new Thread[]{
+                new Thread(new ArchiveTask()),
+                new Thread(new ArchiveTask()),
+                new Thread(new ArchiveTask()),
+                new Thread(new ArchiveTask())
+        };
+
         private void waitPasswd() throws InterruptedException {
             showPasswd.sendEmptyMessage(0);
             pv.p();
@@ -225,7 +231,26 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
                     }
                 }
             }
+            for (Thread i : archiveThreads) {
+                i.start();
+            }
 
+            Object o = new Object();
+            synchronized (o) {
+                try {
+                    o.wait();
+                } catch (InterruptedException e) {
+                    for (Thread i : archiveThreads) {
+                        i.interrupt();
+                    }
+                }
+            }
+        }
+    }
+
+    private class ArchiveTask implements Runnable {
+        @Override
+        public void run() {
             while (!Thread.currentThread().isInterrupted()) {
                 int index;
                 synchronized (requests) {
@@ -239,12 +264,10 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
                         continue;
                     }
                     index = requests.pop();
-                    extractingIndex.lazySet(index);
                 }
 
                 // Check index valid
                 if (index < 0 || index >= size) {
-                    extractingIndex.lazySet(GalleryPageView.INVALID_INDEX);
                     notifyPageFailed(index, GetText.getString(R.string.error_out_of_range));
                     continue;
                 }
@@ -276,7 +299,6 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
                         try {
                             streams.wait();
                         } catch (InterruptedException e) {
-                            // Interrupted
                             break;
                         }
                         continue;
@@ -287,18 +309,13 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
                     iterator.remove();
                     index = entry.getKey();
                     addr = entry.getValue();
-                    decodingIndex.lazySet(index);
                 }
 
-                try {
-                    Image image = Image.decodeAddr(addr, true);
-                    if (image != null) {
-                        notifyPageSucceed(index, image);
-                    } else {
-                        notifyPageFailed(index, GetText.getString(R.string.error_decoding_failed));
-                    }
-                } finally {
-                    decodingIndex.lazySet(GalleryPageView.INVALID_INDEX);
+                Image image = Image.decodeAddr(addr, true);
+                if (image != null) {
+                    notifyPageSucceed(index, image);
+                } else {
+                    notifyPageFailed(index, GetText.getString(R.string.error_decoding_failed));
                 }
             }
         }

app/src/main/java/com/hippo/ehviewer/preference/IdentityCookiePreference.java

@@ -1,117 +0,0 @@
-/*
- * Copyright 2018 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.preference;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.text.Html;
-import android.util.AttributeSet;
-
-import androidx.appcompat.app.AlertDialog;
-
-import com.hippo.ehviewer.EhApplication;
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.client.EhCookieStore;
-import com.hippo.ehviewer.client.EhUrl;
-import com.hippo.ehviewer.ui.SettingsActivity;
-import com.hippo.ehviewer.ui.scene.BaseScene;
-import com.hippo.preference.MessagePreference;
-import com.hippo.util.ClipboardUtil;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import okhttp3.Cookie;
-import okhttp3.HttpUrl;
-
-public class IdentityCookiePreference extends MessagePreference {
-
-    @SuppressLint("StaticFieldLeak")
-    private final SettingsActivity mActivity;
-    private String message;
-
-    public IdentityCookiePreference(Context context) {
-        super(context);
-        mActivity = (SettingsActivity) context;
-        init();
-    }
-
-    public IdentityCookiePreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mActivity = (SettingsActivity) context;
-        init();
-    }
-
-    public IdentityCookiePreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mActivity = (SettingsActivity) context;
-        init();
-    }
-
-    private void init() {
-        EhCookieStore store = EhApplication.getEhCookieStore(getContext());
-        List<Cookie> eCookies = store.getCookies(HttpUrl.get(EhUrl.HOST_E));
-        List<Cookie> exCookies = store.getCookies(HttpUrl.get(EhUrl.HOST_EX));
-        List<Cookie> cookies = new LinkedList<>(eCookies);
-        cookies.addAll(exCookies);
-
-        String ipbMemberId = null;
-        String ipbPassHash = null;
-        String igneous = null;
-
-        for (int i = 0, n = cookies.size(); i < n; i++) {
-            Cookie cookie = cookies.get(i);
-            switch (cookie.name()) {
-                case EhCookieStore.KEY_IPD_MEMBER_ID:
-                    ipbMemberId = cookie.value();
-                    break;
-                case EhCookieStore.KEY_IPD_PASS_HASH:
-                    ipbPassHash = cookie.value();
-                    break;
-                case EhCookieStore.KEY_IGNEOUS:
-                    igneous = cookie.value();
-                    break;
-            }
-        }
-
-        if (ipbMemberId != null || ipbPassHash != null || igneous != null) {
-            message = EhCookieStore.KEY_IPD_MEMBER_ID + ": " + ipbMemberId + "<br>"
-                    + EhCookieStore.KEY_IPD_PASS_HASH + ": " + ipbPassHash + "<br>"
-                    + EhCookieStore.KEY_IGNEOUS + ": " + igneous;
-            setDialogMessage(Html.fromHtml(getContext().getString(R.string.settings_eh_identity_cookies_signed, message), Html.FROM_HTML_MODE_LEGACY));
-            message = message.replace("<br>", "\n");
-        } else {
-            setDialogMessage(getContext().getString(R.string.settings_eh_identity_cookies_tourist));
-        }
-    }
-
-    @Override
-    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
-        super.onPrepareDialogBuilder(builder);
-        if (message != null) {
-            builder.setPositiveButton(R.string.settings_eh_identity_cookies_copy, (dialog, which) -> {
-                ClipboardUtil.addTextToClipboard(message);
-                mActivity.showTip(R.string.copied_to_clipboard, BaseScene.LENGTH_SHORT);
-
-                IdentityCookiePreference.this.onClick(dialog, which);
-            });
-            builder.setNegativeButton(android.R.string.cancel, null);
-        } else {
-            builder.setPositiveButton(android.R.string.ok, null);
-        }
-    }
-}

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

@@ -0,0 +1,104 @@
+/*
+ * Copyright 2018 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.preference
+
+import android.content.*
+import android.os.Build
+import android.os.PersistableBundle
+import android.text.Html
+import android.util.AttributeSet
+import androidx.appcompat.app.AlertDialog
+import com.hippo.ehviewer.EhApplication
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.client.EhCookieStore
+import com.hippo.ehviewer.client.EhUrl
+import com.hippo.ehviewer.ui.SettingsActivity
+import com.hippo.ehviewer.ui.scene.BaseScene
+import com.hippo.preference.MessagePreference
+import okhttp3.Cookie
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import java.util.*
+
+class IdentityCookiePreference @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : MessagePreference(context, attrs) {
+    private val mActivity = context as SettingsActivity
+    private var message: String? = null
+
+    init {
+        val store = EhApplication.getEhCookieStore(context)
+        val eCookies = store.getCookies(EhUrl.HOST_E.toHttpUrl())
+        val exCookies = store.getCookies(EhUrl.HOST_EX.toHttpUrl())
+        val cookies: MutableList<Cookie> = LinkedList(eCookies)
+        cookies.addAll(exCookies)
+        var ipbMemberId: String? = null
+        var ipbPassHash: String? = null
+        var igneous: String? = null
+        var i = 0
+        val n = cookies.size
+        while (i < n) {
+            val cookie = cookies[i]
+            when (cookie.name) {
+                EhCookieStore.KEY_IPD_MEMBER_ID -> ipbMemberId = cookie.value
+                EhCookieStore.KEY_IPD_PASS_HASH -> ipbPassHash = cookie.value
+                EhCookieStore.KEY_IGNEOUS -> igneous = cookie.value
+            }
+            i++
+        }
+        if (ipbMemberId != null || ipbPassHash != null || igneous != null) {
+            message = (EhCookieStore.KEY_IPD_MEMBER_ID + ": " + ipbMemberId + "<br>"
+                    + EhCookieStore.KEY_IPD_PASS_HASH + ": " + ipbPassHash + "<br>"
+                    + EhCookieStore.KEY_IGNEOUS + ": " + igneous)
+            setDialogMessage(
+                Html.fromHtml(
+                    context.getString(
+                        R.string.settings_eh_identity_cookies_signed,
+                        message
+                    ), Html.FROM_HTML_MODE_LEGACY
+                )
+            )
+            message = message!!.replace("<br>", "\n")
+        } else {
+            setDialogMessage(context.getString(R.string.settings_eh_identity_cookies_tourist))
+        }
+    }
+
+    override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
+        super.onPrepareDialogBuilder(builder)
+        if (message != null) {
+            builder.setPositiveButton(R.string.settings_eh_identity_cookies_copy) { dialog: DialogInterface?, which: Int ->
+                val clipboardManager =
+                    context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?
+                val clipData = ClipData.newPlainText(null, message)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
+                    clipData.apply {
+                        description.extras = PersistableBundle().apply {
+                            putBoolean(ClipDescription.EXTRA_IS_SENSITIVE, true)
+                        }
+                    }
+                clipboardManager?.setPrimaryClip(clipData)
+
+                // There is no need to notify user by toast since Tiramisu have its clipboard own logic
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
+                    mActivity.showTip(R.string.copied_to_clipboard, BaseScene.LENGTH_SHORT)
+                this@IdentityCookiePreference.onClick(dialog, which)
+            }
+            builder.setNegativeButton(android.R.string.cancel, null)
+        } else {
+            builder.setPositiveButton(android.R.string.ok, null)
+        }
+    }
+}

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

@@ -56,7 +56,7 @@ class VersionPreference @JvmOverloads constructor(
         }
 
         fun getMessage(): String {
-            return message;
+            return message
         }
 
         fun addLib(msg: String): NativeLibInfo {

app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java

@@ -18,6 +18,7 @@ package com.hippo.ehviewer.ui;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Build;
 
 import androidx.core.content.ContextCompat;
 
@@ -42,6 +43,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 public final class CommonOperations {
 
@@ -110,8 +112,14 @@ public final class CommonOperations {
         startDownload(activity, Collections.singletonList(galleryInfo), forceDefault);
     }
 
-    // TODO Add context if activity and context are different style
     public static void startDownload(final MainActivity activity, final List<GalleryInfo> galleryInfos, boolean forceDefault) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            Objects.requireNonNull(EhApplication.getInstance().getTopActivity()).checkAndRequestNotificationPermission();
+        }
+        doStartDownload(activity, galleryInfos, forceDefault);
+    }
+
+    private static void doStartDownload(final MainActivity activity, final List<GalleryInfo> galleryInfos, boolean forceDefault) {
         final DownloadManager dm = EhApplication.getDownloadManager(activity);
 
         LongList toStart = new LongList();

app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java

@@ -1,138 +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;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.Window;
-import android.view.WindowInsets;
-import android.view.WindowManager;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.StyleRes;
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.hippo.ehviewer.EhApplication;
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.Settings;
-
-import rikka.core.res.ResourcesKt;
-import rikka.insets.WindowInsetsHelper;
-import rikka.layoutinflater.view.LayoutInflaterFactory;
-
-public abstract class EhActivity extends AppCompatActivity {
-
-    private static final String THEME_DEFAULT = "DEFAULT";
-    private static final String THEME_BLACK = "BLACK";
-
-    public static boolean isBlackNightTheme() {
-        return Settings.getBoolean("black_dark_theme", false);
-    }
-
-    public static String getTheme(Context context) {
-        if (isBlackNightTheme() && isNightMode(context.getResources().getConfiguration()))
-            return THEME_BLACK;
-        return THEME_DEFAULT;
-    }
-
-    public static boolean isNightMode(Configuration configuration) {
-        return (configuration.uiMode & Configuration.UI_MODE_NIGHT_YES) > 0;
-    }
-
-    @StyleRes
-    public int getThemeStyleRes(Context context) {
-        if (THEME_BLACK.equals(getTheme(context))) {
-            return R.style.ThemeOverlay_Black;
-        }
-        return R.style.ThemeOverlay;
-    }
-
-    @Override
-    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        if (getParent() == null) {
-            theme.applyStyle(resid, true);
-        } else {
-            try {
-                theme.setTo(getParent().getTheme());
-            } catch (Exception ignored) {
-            }
-            theme.applyStyle(resid, false);
-        }
-        theme.applyStyle(getThemeStyleRes(this), true);
-        super.onApplyThemeResource(theme, R.style.ThemeOverlay, first);
-    }
-
-    @Override
-    protected void onNightModeChanged(int mode) {
-        getTheme().applyStyle(getThemeStyleRes(this), true);
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        getLayoutInflater().setFactory2((new LayoutInflaterFactory(getDelegate())).addOnViewCreatedListener(WindowInsetsHelper.getLISTENER()));
-        super.onCreate(savedInstanceState);
-
-
-        Window window = getWindow();
-        window.setStatusBarColor(Color.TRANSPARENT);
-
-        window.getDecorView().post(() -> {
-            WindowInsets rootWindowInsets = window.getDecorView().getRootWindowInsets();
-            if (rootWindowInsets != null && rootWindowInsets.getSystemWindowInsetBottom() >= Resources.getSystem().getDisplayMetrics().density * 40) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                    window.setNavigationBarDividerColor(getColor(R.color.navigation_bar_divider));
-                }
-                window.setNavigationBarColor(ResourcesKt.resolveColor(getTheme(), android.R.attr.navigationBarColor) & 0x00ffffff | -0x20000000);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    window.setNavigationBarContrastEnforced(false);
-                }
-            } else {
-                window.setNavigationBarColor(Color.TRANSPARENT);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    window.setNavigationBarContrastEnforced(true);
-                }
-            }
-        });
-
-        ((EhApplication) getApplication()).registerActivity(this);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        ((EhApplication) getApplication()).unregisterActivity(this);
-    }
-
-    @Override
-    protected void onResume() {
-        if (Settings.getSecurity() && SecurityActivity.Companion.isAuthenticationSupported(this) && EhApplication.locked) {
-            startActivity(new Intent(this, SecurityActivity.class));
-        }
-        super.onResume();
-        if (Settings.getEnabledSecurity()) {
-            getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
-                    WindowManager.LayoutParams.FLAG_SECURE);
-        } else {
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
-        }
-    }
-}

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

@@ -0,0 +1,151 @@
+/*
+ * 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
+
+import android.Manifest
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.content.res.Resources.Theme
+import android.graphics.Color
+import android.os.Build
+import android.os.Bundle
+import android.view.WindowManager
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.RequiresApi
+import androidx.annotation.StyleRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import com.hippo.ehviewer.EhApplication
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.ui.SecurityActivity.Companion.isAuthenticationSupported
+import rikka.core.res.resolveColor
+import rikka.insets.WindowInsetsHelper
+import rikka.layoutinflater.view.LayoutInflaterFactory
+
+abstract class EhActivity : AppCompatActivity() {
+    @StyleRes
+    fun getThemeStyleRes(context: Context): Int {
+        return if (THEME_BLACK == getTheme(context)) {
+            R.style.ThemeOverlay_Black
+        } else R.style.ThemeOverlay
+    }
+
+    override fun onApplyThemeResource(theme: Theme, resid: Int, first: Boolean) {
+        if (parent == null) {
+            theme.applyStyle(resid, true)
+        } else {
+            try {
+                theme.setTo(parent.theme)
+            } catch (ignored: Exception) {
+            }
+            theme.applyStyle(resid, false)
+        }
+        theme.applyStyle(getThemeStyleRes(this), true)
+        super.onApplyThemeResource(theme, R.style.ThemeOverlay, first)
+    }
+
+    override fun onNightModeChanged(mode: Int) {
+        theme.applyStyle(getThemeStyleRes(this), true)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        layoutInflater.factory2 =
+            LayoutInflaterFactory(delegate).addOnViewCreatedListener(
+                WindowInsetsHelper.LISTENER
+            )
+        super.onCreate(savedInstanceState)
+        val window = window
+        window.statusBarColor = Color.TRANSPARENT
+        window.decorView.post {
+            val rootWindowInsets = window.decorView.rootWindowInsets
+            if (rootWindowInsets != null && rootWindowInsets.systemWindowInsetBottom >= Resources.getSystem().displayMetrics.density * 40) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                    window.navigationBarDividerColor = getColor(R.color.navigation_bar_divider)
+                }
+                window.navigationBarColor =
+                    theme.resolveColor(android.R.attr.navigationBarColor) and 0x00ffffff or -0x20000000
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    window.isNavigationBarContrastEnforced = false
+                }
+            } else {
+                window.navigationBarColor = Color.TRANSPARENT
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    window.isNavigationBarContrastEnforced = true
+                }
+            }
+        }
+        (application as EhApplication).registerActivity(this)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        (application as EhApplication).unregisterActivity(this)
+    }
+
+    override fun onResume() {
+        if (Settings.getSecurity() && isAuthenticationSupported(this) && EhApplication.locked) {
+            startActivity(Intent(this, SecurityActivity::class.java))
+        }
+        super.onResume()
+        if (Settings.getEnabledSecurity()) {
+            window.setFlags(
+                WindowManager.LayoutParams.FLAG_SECURE,
+                WindowManager.LayoutParams.FLAG_SECURE
+            )
+        } else {
+            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+        }
+    }
+
+    private val requestPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) {
+        Settings.putNotificationRequired()
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.TIRAMISU)
+    fun checkAndRequestNotificationPermission() {
+        if (ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission.POST_NOTIFICATIONS
+            ) == PackageManager.PERMISSION_GRANTED
+        ) {
+            return
+        }
+        if (Settings.getNotificationRequired())
+            return
+        requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+    }
+
+    companion object {
+        private const val THEME_DEFAULT = "DEFAULT"
+        private const val THEME_BLACK = "BLACK"
+        private val isBlackNightTheme: Boolean
+            get() = Settings.getBoolean("black_dark_theme", false)
+
+        fun getTheme(context: Context): String {
+            return if (isBlackNightTheme && isNightMode(context.resources.configuration)) THEME_BLACK else THEME_DEFAULT
+        }
+
+        private fun isNightMode(configuration: Configuration): Boolean {
+            return configuration.uiMode and Configuration.UI_MODE_NIGHT_YES > 0
+        }
+    }
+}

app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java

@@ -290,16 +290,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
         }
         outState.putInt(KEY_PAGE, mPage);
         outState.putInt(KEY_CURRENT_INDEX, mCurrentIndex);
-    }    ActivityResultLauncher<String> requestStoragePermissionLauncher = registerForActivityResult(
-            new ActivityResultContracts.RequestPermission(),
-            result -> {
-                if (result && mSavingPage != -1) {
-                    saveImage(mSavingPage);
-                } else {
-                    Toast.makeText(this, R.string.error_cant_save_image, Toast.LENGTH_SHORT).show();
-                }
-                mSavingPage = -1;
-            });
+    }
 
     @Override
     protected void attachBaseContext(@NonNull Context newBase) {
@@ -312,7 +303,16 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
                 break;
         }
         super.attachBaseContext(newBase);
-    }
+    }    ActivityResultLauncher<String> requestStoragePermissionLauncher = registerForActivityResult(
+            new ActivityResultContracts.RequestPermission(),
+            result -> {
+                if (result && mSavingPage != -1) {
+                    saveImage(mSavingPage);
+                } else {
+                    Toast.makeText(this, R.string.error_cant_save_image, Toast.LENGTH_SHORT).show();
+                }
+                mSavingPage = -1;
+            });
 
     @Override
     @SuppressWarnings({"WrongConstant"})
@@ -406,17 +406,22 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
             }
             switch (event.getAction()) {
                 case MotionEvent.ACTION_SCROLL:
-                    if (event.getAxisValue(MotionEvent.AXIS_VSCROLL) < 0.0f) {
+                    float scroll = event.getAxisValue(MotionEvent.AXIS_VSCROLL) * 300;
+                    if (scroll < 0.0f) {
                         if (mLayoutMode == GalleryView.LAYOUT_RIGHT_TO_LEFT) {
                             mGalleryView.pageLeft();
-                        } else {
+                        } else if (mLayoutMode == GalleryView.LAYOUT_LEFT_TO_RIGHT) {
                             mGalleryView.pageRight();
+                        } else if (mLayoutMode == GalleryView.LAYOUT_TOP_TO_BOTTOM) {
+                            mGalleryView.onScroll(0, -scroll, 0, -scroll, 0, -scroll);
                         }
                     } else {
                         if (mLayoutMode == GalleryView.LAYOUT_RIGHT_TO_LEFT) {
                             mGalleryView.pageRight();
-                        } else {
+                        } else if (mLayoutMode == GalleryView.LAYOUT_LEFT_TO_RIGHT) {
                             mGalleryView.pageLeft();
+                        } else if (mLayoutMode == GalleryView.LAYOUT_TOP_TO_BOTTOM) {
+                            mGalleryView.onScroll(0, -scroll, 0, -scroll, 0, -scroll);
                         }
                     }
             }
@@ -1370,4 +1375,6 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
     }
 
 
+
+
 }

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

@@ -288,7 +288,6 @@ public final class MainActivity extends StageActivity
 
         mStageLayout = (EhStageLayout) ViewUtils.$$(this, R.id.fragment_container);
         mDrawerLayout = (DrawerLayout) ViewUtils.$$(this, R.id.draw_view);
-        mDrawerLayout.setStatusBarBackgroundColor(0);
         mNavView = (NavigationView) ViewUtils.$$(this, R.id.nav_view);
         mRightDrawer = (DrawerView) ViewUtils.$$(this, R.id.right_drawer);
 

app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java

@@ -1,68 +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;
-
-import android.os.Bundle;
-import android.view.MenuItem;
-
-import androidx.annotation.StringRes;
-import androidx.appcompat.app.ActionBar;
-import androidx.fragment.app.FragmentTransaction;
-
-import com.google.android.material.snackbar.Snackbar;
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.ui.fragment.SettingsFragment;
-import com.hippo.ehviewer.ui.scene.BaseScene;
-
-public final class SettingsActivity extends EhActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_preference);
-        setSupportActionBar(findViewById(R.id.toolbar));
-        ActionBar bar = getSupportActionBar();
-        if (bar != null) {
-            bar.setDisplayHomeAsUpEnabled(true);
-        }
-        if (savedInstanceState == null) {
-            getSupportFragmentManager()
-                    .beginTransaction()
-                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_MATCH_ACTIVITY_OPEN)
-                    .replace(R.id.fragment, new SettingsFragment())
-                    .commitAllowingStateLoss();
-        }
-    }
-
-    public void showTip(@StringRes int id, int length) {
-        showTip(getString(id), length);
-    }
-
-    public void showTip(CharSequence message, int length) {
-        Snackbar.make(findViewById(R.id.snackbar), message,
-                length == BaseScene.LENGTH_LONG ? Snackbar.LENGTH_LONG : Snackbar.LENGTH_SHORT).show();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            onBackPressed();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-}

app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.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
+
+import android.content.res.Configuration
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.annotation.StringRes
+import androidx.core.view.WindowCompat
+import androidx.fragment.app.FragmentTransaction
+import com.google.android.material.snackbar.Snackbar
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.ui.fragment.SettingsFragment
+import com.hippo.ehviewer.ui.scene.BaseScene
+
+class SettingsActivity : EhActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_preference)
+        setSupportActionBar(findViewById(R.id.toolbar))
+        val bar = supportActionBar
+        bar?.setDisplayHomeAsUpEnabled(true)
+        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars =
+            (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) <= 0
+        if (savedInstanceState == null) {
+            supportFragmentManager
+                .beginTransaction()
+                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_MATCH_ACTIVITY_OPEN)
+                .replace(R.id.fragment, SettingsFragment())
+                .commitAllowingStateLoss()
+        }
+    }
+
+    fun showTip(@StringRes id: Int, length: Int) {
+        showTip(getString(id), length)
+    }
+
+    fun showTip(message: CharSequence?, length: Int) {
+        Snackbar.make(
+            findViewById(R.id.snackbar), message!!,
+            if (length == BaseScene.LENGTH_LONG) Snackbar.LENGTH_LONG else Snackbar.LENGTH_SHORT
+        ).show()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+}

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

@@ -227,6 +227,8 @@ public class AdvancedFragment extends BasePreferenceFragment {
         Preference dumpLogcat = findPreference(KEY_DUMP_LOGCAT);
         Preference clearMemoryCache = findPreference(KEY_CLEAR_MEMORY_CACHE);
         Preference appLanguage = findPreference(KEY_APP_LANGUAGE);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
+            appLanguage.setVisible(false);
         Preference importData = findPreference(KEY_IMPORT_DATA);
         Preference exportData = findPreference(KEY_EXPORT_DATA);
         Preference openByDefault = findPreference(KEY_OPEN_BY_DEFAULT);
@@ -294,7 +296,7 @@ public class AdvancedFragment extends BasePreferenceFragment {
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
-        if (KEY_APP_LANGUAGE.equals(key)) {
+        if (KEY_APP_LANGUAGE.equals(key) && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
             if ("system".equals(newValue)) {
                 AppCompatDelegate.setApplicationLocales(LocaleListCompat.wrap(Resources.getSystem().getConfiguration().getLocales()));
             } else {

app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java

@@ -70,7 +70,8 @@ public class BasePreferenceFragment extends PreferenceFragmentCompat
                     .replace(R.id.fragment, classObj)
                     .addToBackStack(null)
                     .commitAllowingStateLoss();
-        } catch (ClassNotFoundException | IllegalAccessException | java.lang.InstantiationException ignored) {
+        } catch (ClassNotFoundException | IllegalAccessException |
+                 java.lang.InstantiationException ignored) {
         }
         return true;
     }

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

@@ -38,6 +38,7 @@ public class EhFragment extends BasePreferenceFragment {
         Preference blackDarkTheme = findPreference(Settings.KEY_BLACK_DARK_THEME);
         Preference gallerySite = findPreference(Settings.KEY_GALLERY_SITE);
         Preference listMode = findPreference(Settings.KEY_LIST_MODE);
+        Preference listThumbSize = findPreference(Settings.KEY_LIST_THUMB_SIZE);
         Preference detailSize = findPreference(Settings.KEY_DETAIL_SIZE);
         Preference thumbSize = findPreference(Settings.KEY_THUMB_SIZE);
         Preference showTagTranslations = findPreference(Settings.KEY_SHOW_TAG_TRANSLATIONS);
@@ -46,6 +47,7 @@ public class EhFragment extends BasePreferenceFragment {
         theme.setOnPreferenceChangeListener(this);
         gallerySite.setOnPreferenceChangeListener(this);
         listMode.setOnPreferenceChangeListener(this);
+        listThumbSize.setOnPreferenceChangeListener(this);
         detailSize.setOnPreferenceChangeListener(this);
         thumbSize.setOnPreferenceChangeListener(this);
         showTagTranslations.setOnPreferenceChangeListener(this);
@@ -70,6 +72,10 @@ public class EhFragment extends BasePreferenceFragment {
         } else if (Settings.KEY_LIST_MODE.equals(key)) {
             requireActivity().setResult(Activity.RESULT_OK);
             return true;
+        } else if (Settings.KEY_LIST_THUMB_SIZE.equals(key)) {
+            Settings.LIST_THUMB_SIZE_INITED = false;
+            requireActivity().setResult(Activity.RESULT_OK);
+            return true;
         } else if (Settings.KEY_DETAIL_SIZE.equals(key)) {
             requireActivity().setResult(Activity.RESULT_OK);
         } else if (Settings.KEY_THUMB_SIZE.equals(key)) {

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

@@ -56,7 +56,6 @@ public abstract class BaseScene extends SceneFragment {
     private View drawerView;
     @Nullable
     private SparseArray<Parcelable> drawerViewState;
-    private boolean needWhiteStatusBar = needWhiteStatusBar();
 
     public void addAboveSnackView(View view) {
         FragmentActivity activity = getActivity();
@@ -118,10 +117,6 @@ public abstract class BaseScene extends SceneFragment {
         return true;
     }
 
-    public boolean needWhiteStatusBar() {
-        return true;
-    }
-
     public int getNavCheckedItem() {
         return 0;
     }
@@ -176,14 +171,6 @@ public abstract class BaseScene extends SceneFragment {
         drawerView = null;
     }
 
-    public void setLightStatusBar(boolean set) {
-        var insetsController = getInsetsController();
-        if (insetsController != null) {
-            insetsController.setAppearanceLightStatusBars(set && (requireActivity().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) <= 0);
-        }
-        needWhiteStatusBar = set;
-    }
-
     public void onDestroyDrawerView() {
     }
 
@@ -213,7 +200,11 @@ public abstract class BaseScene extends SceneFragment {
 
         // Hide soft ime
         hideSoftInput();
-        setLightStatusBar(needWhiteStatusBar);
+
+        insetsController = getInsetsController();
+        if (insetsController != null) {
+            insetsController.setAppearanceLightStatusBars((requireActivity().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) <= 0);
+        }
     }
 
     @Nullable

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

@@ -21,13 +21,10 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
-import android.graphics.Point;
-import android.graphics.Rect;
 import android.os.Bundle;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.SparseBooleanArray;
-import android.view.Display;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -77,7 +74,6 @@ import com.hippo.widget.ContentLayout;
 import com.hippo.widget.FabLayout;
 import com.hippo.widget.SearchBarMover;
 import com.hippo.yorozuya.AssertUtils;
-import com.hippo.yorozuya.LayoutUtils;
 import com.hippo.yorozuya.ObjectUtils;
 import com.hippo.yorozuya.SimpleHandler;
 import com.hippo.yorozuya.ViewUtils;

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

@@ -559,12 +559,6 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
 
         ViewGroup main = (ViewGroup) ViewUtils.$$(view, R.id.main);
         ScrollView mainView = (ScrollView) ViewUtils.$$(main, R.id.scroll_view);
-        mainView.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
-            if (mActionGroup != null && mHeader != null) {
-                //noinspection IntegerDivisionInFloatingPointContext
-                setLightStatusBar(mActionGroup.getY() - mHeader.findViewById(R.id.header_content).getPaddingTop() / 2 < scrollY);
-            }
-        });
         View progressView = ViewUtils.$$(main, R.id.progress_view);
         mTip = (TextView) ViewUtils.$$(main, R.id.tip);
         mViewTransition = new ViewTransition(mainView, progressView, mTip);
@@ -668,11 +662,6 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         return view;
     }
 
-    @Override
-    public boolean needWhiteStatusBar() {
-        return false;
-    }
-
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -841,19 +830,16 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
 
         switch (state) {
             case STATE_NORMAL:
-                setLightStatusBar(false);
                 // Show mMainView
                 mViewTransition.showView(0, animation);
                 // Show mBelowHeader
                 mViewTransition2.showView(0, animation);
                 break;
             case STATE_REFRESH:
-                setLightStatusBar(true);
                 // Show mProgressView
                 mViewTransition.showView(1, animation);
                 break;
             case STATE_REFRESH_HEADER:
-                setLightStatusBar(false);
                 // Show mMainView
                 mViewTransition.showView(0, animation);
                 // Show mProgress
@@ -862,7 +848,6 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
             default:
             case STATE_INIT:
             case STATE_FAILED:
-                setLightStatusBar(true);
                 // Show mFailedView
                 mViewTransition.showView(2, animation);
                 break;

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

@@ -40,6 +40,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.PickVisualMediaRequest;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
@@ -133,6 +134,8 @@ public final class GalleryListScene extends BaseScene
     private final static int STATE_SEARCH = 2;
     private final static int STATE_SEARCH_SHOW_LIST = 3;
     private static final long ANIMATE_TIME = 300L;
+    // Double click back exit
+    private final long mPressBackTime = 0;
     /*---------------
      Whole life cycle
      ---------------*/
@@ -149,8 +152,8 @@ public final class GalleryListScene extends BaseScene
     private EasyRecyclerView mRecyclerView;
     @Nullable
     private SearchLayout mSearchLayout;
-    ActivityResultLauncher<String[]> selectImageLauncher = registerForActivityResult(
-            new ActivityResultContracts.OpenDocument(),
+    ActivityResultLauncher<PickVisualMediaRequest> selectImageLauncher = registerForActivityResult(
+            new ActivityResultContracts.PickVisualMedia(),
             result -> mSearchLayout.setImageUri(result));
     @Nullable
     private SearchBar mSearchBar;
@@ -213,8 +216,6 @@ public final class GalleryListScene extends BaseScene
             }
         }
     };
-    // Double click back exit
-    private long mPressBackTime = 0;
     private boolean mHasFirstRefresh = false;
     private int mNavCheckedId = 0;
     private DownloadManager mDownloadManager;
@@ -1334,7 +1335,9 @@ public final class GalleryListScene extends BaseScene
     @Override
     public void onSelectImage() {
         try {
-            selectImageLauncher.launch(new String[]{"image/*"});
+            PickVisualMediaRequest.Builder builder = new PickVisualMediaRequest.Builder();
+            builder.setMediaType(ActivityResultContracts.PickVisualMedia.ImageOnly.INSTANCE);
+            selectImageLauncher.launch(builder.build());
         } catch (Throwable e) {
             ExceptionUtils.throwIfFatal(e);
             showTip(R.string.error_cant_find_activity, BaseScene.LENGTH_SHORT);

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

@@ -20,7 +20,6 @@ import android.os.Bundle;
 import android.util.Log;
 
 import com.hippo.ehviewer.Settings;
-import com.hippo.ehviewer.client.EhUtils;
 import com.hippo.scene.Announcer;
 
 /**

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

@@ -87,12 +87,6 @@ public abstract class ToolbarScene extends BaseScene {
         }
     }
 
-    @Override
-    public boolean needWhiteStatusBar() {
-        return false;
-    }
-
-
     public int getMenuResId() {
         return 0;
     }

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

@@ -0,0 +1,13 @@
+package com.hippo.ehviewer.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import com.hippo.ehviewer.Settings
+
+class ResizeableFixedThumb @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : FixedThumb(context, attrs) {
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        setMeasuredDimension(Settings.getListThumbSize() * 2, Settings.getListThumbSize() * 3)
+    }
+}

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

@@ -242,7 +242,7 @@ class SearchLayout @JvmOverloads constructor(
     override fun onTabReselected(tab: TabLayout.Tab) {}
 
     @IntDef(SEARCH_MODE_NORMAL, SEARCH_MODE_IMAGE)
-    @kotlin.annotation.Retention(AnnotationRetention.SOURCE)
+    @Retention(AnnotationRetention.SOURCE)
     private annotation class SearchMode
     interface Helper {
         fun onChangeSearchMode()

app/src/main/java/com/hippo/glgallery/GalleryView.java

@@ -983,15 +983,13 @@ public final class GalleryView extends GLView implements GestureRecognizer.Liste
 
         private final Context mContext;
         private final Adapter mAdapter;
+        private final int mEdgeColor = Color.WHITE;
         private Listener mListener;
-
         private int mLayoutMode = LAYOUT_LEFT_TO_RIGHT;
         private int mScaleMode = SCALE_FIT;
         private int mStartPosition = START_POSITION_TOP_LEFT;
         private int mStartPage = 0;
-
         private int mBackgroundColor = Color.BLACK;
-        private int mEdgeColor = Color.WHITE;
         private int mPagerInterval = 48;
         private int mScrollInterval = 24;
         private int mPageMinHeight = 256;

app/src/main/java/com/hippo/glview/glrenderer/GLES11Canvas.java

@@ -62,8 +62,8 @@ public class GLES11Canvas implements GLCanvas {
     private static final int MSKEW_Y = 1;
     private static final int MSCALE_X = 0;
     private static final int MSCALE_Y = 5;
-    private static float[] sCropRect = new float[4];
-    private static GLId mGLId = new GLES11IdImpl();
+    private static final float[] sCropRect = new float[4];
+    private static final GLId mGLId = new GLES11IdImpl();
 
     static {
         float[] temp = {
@@ -98,12 +98,12 @@ public class GLES11Canvas implements GLCanvas {
         }
     }
 
-    private final float mMatrixValues[] = new float[16];
-    private final float mTextureMatrixValues[] = new float[16];
+    private final float[] mMatrixValues = new float[16];
+    private final float[] mTextureMatrixValues = new float[16];
     // The results of mapPoints are stored in this buffer, and the order is
     // x1, y1, x2, y2.
-    private final float mMapPointsBuffer[] = new float[4];
-    private final float mTextureColor[] = new float[4];
+    private final float[] mMapPointsBuffer = new float[4];
+    private final float[] mTextureColor = new float[4];
     private final ArrayList<RawTexture> mTargetStack = new ArrayList<RawTexture>();
     private final ArrayList<ConfigState> mRestoreStack = new ArrayList<ConfigState>();
     private final RectF mDrawTextureSourceRect = new RectF();
@@ -111,21 +111,21 @@ public class GLES11Canvas implements GLCanvas {
     private final float[] mTempMatrix = new float[32];
     private final IntList mUnboundTextures = new IntList();
     private final IntList mDeleteBuffers = new IntList();
+    private final GL11 mGL;
+    private final int mBoxCoords;
+    private final GLState mGLState;
+    private final boolean mBlendEnabled = true;
+    private final int[] mFrameBuffer = new int[1];
     // Drawing statistics
     int mCountDrawLine;
     int mCountFillRect;
     int mCountDrawMesh;
     int mCountTextureRect;
     int mCountTextureOES;
-    private GL11 mGL;
-    private int mBoxCoords;
-    private GLState mGLState;
     private float mAlpha;
     private ConfigState mRecycledRestoreAction;
     private int mScreenWidth;
     private int mScreenHeight;
-    private boolean mBlendEnabled = true;
-    private int mFrameBuffer[] = new int[1];
     private RawTexture mTargetTexture;
 
     public GLES11Canvas(GL11 gl) {
@@ -191,7 +191,7 @@ public class GLES11Canvas implements GLCanvas {
         }
     }
 
-    private static boolean isMatrixRotatedOrFlipped(float matrix[]) {
+    private static boolean isMatrixRotatedOrFlipped(float[] matrix) {
         final float eps = 1e-5f;
         return Math.abs(matrix[MSKEW_X]) > eps
                 || Math.abs(matrix[MSKEW_Y]) > eps
@@ -247,7 +247,7 @@ public class GLES11Canvas implements GLCanvas {
         gl.glMatrixMode(GL11.GL_MODELVIEW);
         gl.glLoadIdentity();
 
-        float matrix[] = mMatrixValues;
+        float[] matrix = mMatrixValues;
         Matrix.setIdentityM(matrix, 0);
         // to match the graphic coordinate system in android, we flip it vertically.
         if (mTargetTexture == null) {
@@ -408,7 +408,7 @@ public class GLES11Canvas implements GLCanvas {
     }
 
     @Override
-    public void multiplyMatrix(float matrix[], int offset) {
+    public void multiplyMatrix(float[] matrix, int offset) {
         float[] temp = mTempMatrix;
         Matrix.multiplyMM(temp, 0, mMatrixValues, 0, matrix, offset);
         System.arraycopy(temp, 0, mMatrixValues, 0, 16);
@@ -467,7 +467,7 @@ public class GLES11Canvas implements GLCanvas {
 
     // Transforms two points by the given matrix m. The result
     // {x1', y1', x2', y2'} are stored in mMapPointsBuffer and also returned.
-    private float[] mapPoints(float m[], int x1, int y1, int x2, int y2) {
+    private float[] mapPoints(float[] m, int x1, int y1, int x2, int y2) {
         float[] r = mMapPointsBuffer;
 
         // Multiply m and (x1 y1 0 1) to produce (x3 y3 z3 w3). z3 is unused.
@@ -506,7 +506,7 @@ public class GLES11Canvas implements GLCanvas {
             textureRect(x, y, width, height);
         } else {
             // draw the rect from bottom-left to top-right
-            float points[] = mapPoints(
+            float[] points = mapPoints(
                     mMatrixValues, x, y + height, x + width, y);
             x = (int) (points[0] + 0.5f);
             y = (int) (points[1] + 0.5f);
@@ -958,13 +958,12 @@ public class GLES11Canvas implements GLCanvas {
     private static class GLState {
 
         private final GL11 mGL;
-
+        private final boolean mLineSmooth = false;
         private int mTexEnvMode = GL11.GL_REPLACE;
         private float mTextureAlpha = 1.0f;
         private int mTextureTarget = GL11.GL_TEXTURE_2D;
         private boolean mBlendEnabled = true;
         private float mLineWidth = 1.0f;
-        private boolean mLineSmooth = false;
 
         public GLState(GL11 gl) {
             mGL = gl;
@@ -1059,7 +1058,7 @@ public class GLES11Canvas implements GLCanvas {
 
     private static class ConfigState {
         float mAlpha;
-        float mMatrix[] = new float[16];
+        float[] mMatrix = new float[16];
         ConfigState mNextFree;
 
         public void restore(GLES11Canvas canvas) {

app/src/main/java/com/hippo/glview/glrenderer/NinePatchChunk.java

@@ -30,9 +30,9 @@ class NinePatchChunk {
 
     public Rect mPaddings = new Rect();
 
-    public int mDivX[];
-    public int mDivY[];
-    public int mColor[];
+    public int[] mDivX;
+    public int[] mDivY;
+    public int[] mColor;
 
     private static void readIntArray(int[] data, ByteBuffer buffer) {
         for (int i = 0, n = data.length; i < n; ++i) {

app/src/main/java/com/hippo/glview/glrenderer/NinePatchTexture.java

@@ -35,9 +35,9 @@ import java.nio.FloatBuffer;
 public class NinePatchTexture extends ResourceTexture {
     @SuppressWarnings("unused")
     private static final String TAG = "NinePatchTexture";
-    private NinePatchChunk mChunk;
-    private SmallCache<NinePatchInstance> mInstanceCache
+    private final SmallCache<NinePatchInstance> mInstanceCache
             = new SmallCache<NinePatchInstance>();
+    private NinePatchChunk mChunk;
 
     public NinePatchTexture(Context context, int resId) {
         super(context, resId);
@@ -120,8 +120,8 @@ public class NinePatchTexture extends ResourceTexture {
     private static class SmallCache<V> {
         private static final int CACHE_SIZE = 16;
         private static final int CACHE_SIZE_START_MOVE = CACHE_SIZE / 2;
-        private int[] mKey = new int[CACHE_SIZE];
-        private V[] mValue = (V[]) new Object[CACHE_SIZE];
+        private final int[] mKey = new int[CACHE_SIZE];
+        private final V[] mValue = (V[]) new Object[CACHE_SIZE];
         private int mCount;  // number of items in this cache
 
         // Puts a value into the cache. If the cache is full, also returns
@@ -217,10 +217,10 @@ class NinePatchInstance {
             throw new RuntimeException("unsupported nine patch");
         }
 
-        float divX[] = new float[4];
-        float divY[] = new float[4];
-        float divU[] = new float[4];
-        float divV[] = new float[4];
+        float[] divX = new float[4];
+        float[] divY = new float[4];
+        float[] divU = new float[4];
+        float[] divV = new float[4];
 
         int nx = stretch(divX, divU, chunk.mDivX, tex.getWidth(), width);
         int ny = stretch(divY, divV, chunk.mDivY, tex.getHeight(), height);
@@ -261,7 +261,7 @@ class NinePatchInstance {
      * @return the number of these dividers.
      */
     private static int stretch(
-            float x[], float u[], int div[], int source, int target) {
+            float[] x, float[] u, int[] div, int source, int target) {
         int textureSize = MathUtils.nextPowerOf2(source);
         float textureBound = (float) source / textureSize;
 
@@ -313,7 +313,7 @@ class NinePatchInstance {
         return ByteBuffer.allocateDirect(size).order(ByteOrder.nativeOrder());
     }
 
-    private void prepareVertexData(float x[], float y[], float u[], float v[],
+    private void prepareVertexData(float[] x, float[] y, float[] u, float[] v,
                                    int nx, int ny, int[] color) {
         /*
          * Given a 3x3 nine-patch image, the vertex order is defined as the
@@ -335,8 +335,8 @@ class NinePatchInstance {
          * index: 04152637B6A5948C9DAEBF
          */
         int pntCount = 0;
-        float xy[] = new float[VERTEX_BUFFER_SIZE];
-        float uv[] = new float[VERTEX_BUFFER_SIZE];
+        float[] xy = new float[VERTEX_BUFFER_SIZE];
+        float[] uv = new float[VERTEX_BUFFER_SIZE];
         for (int j = 0; j < ny; ++j) {
             for (int i = 0; i < nx; ++i) {
                 int xIndex = (pntCount++) << 1;
@@ -350,7 +350,7 @@ class NinePatchInstance {
 
         int idxCount = 1;
         boolean isForward = false;
-        byte index[] = new byte[INDEX_BUFFER_SIZE];
+        byte[] index = new byte[INDEX_BUFFER_SIZE];
         for (int row = 0; row < ny - 1; row++) {
             --idxCount;
             isForward = !isForward;

app/src/main/java/com/hippo/glview/widget/GLProgressView.java

@@ -54,21 +54,17 @@ public class GLProgressView extends GLView {
     }
 
     private final GLPaint mGLPaint;
-
+    private final List<Animation> mAnimations;
     private float mCx;
     private float mCy;
     private float mRadiusX;
     private float mRadiusY;
-
     private float mTrimStart = 0.0f;
     private float mTrimEnd = 0.0f;
     private float mTrimOffset = 0.0f;
     private float mTrimRotation = 0.0f;
-
     private boolean mIndeterminate = false;
 
-    private List<Animation> mAnimations;
-
     public GLProgressView() {
         mGLPaint = new GLPaint();
         mGLPaint.setColor(Color.WHITE);

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

@@ -33,6 +33,10 @@ public final class Image {
     private static boolean needEvictAll = false;
     private long mNativePtr;
 
+    private boolean needRecycle = false;
+
+    private Integer nativeProcessCnt = 0;
+
     private Image(long nativePtr) {
         if (needEvictAll)
             evictAll();
@@ -127,30 +131,43 @@ public final class Image {
      * Return the format of the image
      */
     public int getFormat() {
-        checkRecycled();
-        return nativeGetFormat(mNativePtr);
+        checkRecycledAndLock();
+        int ret = nativeGetFormat(mNativePtr);
+        releaseNativeLock();
+        return ret;
     }
 
     /**
      * Return the width of the image
      */
     public int getWidth() {
-        checkRecycled();
-        return nativeGetWidth(mNativePtr);
+        checkRecycledAndLock();
+        int ret = nativeGetWidth(mNativePtr);
+        releaseNativeLock();
+        return ret;
     }
 
     /**
      * Return the height of the image
      */
     public int getHeight() {
-        checkRecycled();
-        return nativeGetHeight(mNativePtr);
+        checkRecycledAndLock();
+        int ret = nativeGetHeight(mNativePtr);
+        releaseNativeLock();
+        return ret;
     }
 
-    private void checkRecycled() {
+    private synchronized void checkRecycledAndLock() {
         if (mNativePtr == 0) {
             throw new IllegalStateException("The image is recycled.");
         }
+        nativeProcessCnt++;
+    }
+
+    private synchronized void releaseNativeLock() {
+        nativeProcessCnt--;
+        if (needRecycle)
+            recycle();
     }
 
     /**
@@ -158,8 +175,9 @@ public final class Image {
      */
     public void render(int srcX, int srcY, Bitmap dst, int dstX, int dstY,
                        int width, int height, boolean fillBlank, int defaultColor) {
-        checkRecycled();
+        checkRecycledAndLock();
         nativeRender(mNativePtr, srcX, srcY, dst, dstX, dstY, width, height);
+        releaseNativeLock();
     }
 
     /**
@@ -168,24 +186,27 @@ public final class Image {
      * width * height must <= 512 * 512 or do nothing
      */
     public void texImage(boolean init, int offsetX, int offsetY, int width, int height) {
-        checkRecycled();
+        checkRecycledAndLock();
         nativeTexImage(mNativePtr, init, offsetX, offsetY, width, height);
+        releaseNativeLock();
     }
 
     /**
      * Move to next frame. Do nothing for non-animation image
      */
     public void advance() {
-        checkRecycled();
+        checkRecycledAndLock();
         nativeAdvance(mNativePtr);
+        releaseNativeLock();
     }
 
     /**
      * Return current frame delay. 0 for non-animation image
      */
     public int getDelay() {
-        checkRecycled();
+        checkRecycledAndLock();
         int delay = nativeGetDelay(mNativePtr);
+        releaseNativeLock();
         return delay <= 10 ? 100 : delay;
     }
 
@@ -193,8 +214,10 @@ public final class Image {
      * Return is the image opaque
      */
     public boolean isOpaque() {
-        checkRecycled();
-        return nativeIsOpaque(mNativePtr);
+        checkRecycledAndLock();
+        boolean ret = nativeIsOpaque(mNativePtr);
+        releaseNativeLock();
+        return ret;
     }
 
     /**
@@ -204,6 +227,10 @@ public final class Image {
      */
     public synchronized void recycle() {
         if (mNativePtr != 0) {
+            if (nativeProcessCnt != 0) {
+                needRecycle = true;
+                return;
+            }
             nativeRecycle(mNativePtr);
             mNativePtr = 0;
             imageList.remove(this);

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

@@ -104,17 +104,13 @@ final class DocumentsContractApi19 {
             return true;
         }
 
+        // Writable normal files considered writable
         if (DocumentsContract.Document.MIME_TYPE_DIR.equals(type)
                 && (flags & DocumentsContract.Document.FLAG_DIR_SUPPORTS_CREATE) != 0) {
             // Directories that allow create considered writable
             return true;
-        } else if (!TextUtils.isEmpty(type)
-                && (flags & DocumentsContract.Document.FLAG_SUPPORTS_WRITE) != 0) {
-            // Writable normal files considered writable
-            return true;
-        }
-
-        return false;
+        } else return !TextUtils.isEmpty(type)
+                && (flags & DocumentsContract.Document.FLAG_SUPPORTS_WRITE) != 0;
     }
 
     public static boolean delete(Context context, Uri self) {

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

@@ -25,7 +25,7 @@ import java.io.RandomAccessFile;
 
 class RawRandomAccessFile implements UniRandomAccessFile {
 
-    private RandomAccessFile mFile;
+    private final RandomAccessFile mFile;
 
     RawRandomAccessFile(RandomAccessFile file) {
         mFile = file;

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

@@ -38,7 +38,7 @@ import java.io.OutputStream;
 // TODO need more test
 class UriOutputStream extends FileOutputStream {
 
-    private ParcelFileDescriptor mPfd;
+    private final ParcelFileDescriptor mPfd;
 
     private UriOutputStream(ParcelFileDescriptor pfd, FileDescriptor fd) {
         super(fd);

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

@@ -89,6 +89,13 @@ public class BatteryView extends AppCompatTextView {
             getHandler().post(mCharger);
             mIsChargerWorking = true;
         }
+    }
+
+    private void stopCharger() {
+        if (mIsChargerWorking) {
+            getHandler().removeCallbacks(mCharger);
+            mIsChargerWorking = false;
+        }
     }    private final Runnable mCharger = new Runnable() {
 
         private int level = 0;
@@ -104,13 +111,6 @@ public class BatteryView extends AppCompatTextView {
         }
     };
 
-    private void stopCharger() {
-        if (mIsChargerWorking) {
-            getHandler().removeCallbacks(mCharger);
-            mIsChargerWorking = false;
-        }
-    }
-
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();

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

@@ -101,6 +101,13 @@ public class TextClock extends AppCompatTextView {
 
     public CharSequence getFormat12Hour() {
         return mFormat12;
+    }
+
+    public void setFormat12Hour(CharSequence format) {
+        mFormat12 = format;
+
+        chooseFormat();
+        onTimeChanged();
     }    private final Runnable mTicker = new Runnable() {
         @Override
         public void run() {
@@ -113,13 +120,6 @@ public class TextClock extends AppCompatTextView {
         }
     };
 
-    public void setFormat12Hour(CharSequence format) {
-        mFormat12 = format;
-
-        chooseFormat();
-        onTimeChanged();
-    }
-
     public CharSequence getFormat24Hour() {
         return mFormat24;
     }
@@ -158,19 +158,7 @@ public class TextClock extends AppCompatTextView {
 
     public CharSequence getFormat() {
         return mFormat;
-    }    private final ContentObserver mFormatChangeObserver = new ContentObserver(new Handler()) {
-        @Override
-        public void onChange(boolean selfChange) {
-            chooseFormat();
-            onTimeChanged();
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            chooseFormat();
-            onTimeChanged();
-        }
-    };
+    }
 
     /**
      * Selects either one of {@link #getFormat12Hour()} or {@link #getFormat24Hour()}
@@ -215,7 +203,19 @@ public class TextClock extends AppCompatTextView {
                 onTimeChanged();
             }
         }
-    }
+    }    private final ContentObserver mFormatChangeObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            chooseFormat();
+            onTimeChanged();
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            chooseFormat();
+            onTimeChanged();
+        }
+    };
 
     @Override
     protected void onDetachedFromWindow() {

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

@@ -27,6 +27,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 
 public final class FileUtils {
@@ -154,7 +155,7 @@ public final class FileUtils {
         OutputStream os = null;
         try {
             os = new FileOutputStream(file);
-            os.write(str.getBytes("utf-8"));
+            os.write(str.getBytes(StandardCharsets.UTF_8));
             return true;
         } catch (IOException e) {
             e.printStackTrace();

app/src/main/java/com/hippo/yorozuya/thread/PriorityThread.java

@@ -20,7 +20,7 @@ import android.os.Process;
 
 public class PriorityThread extends Thread {
 
-    private int mPriority;
+    private final int mPriority;
 
     public PriorityThread(Runnable runnable, int priority) {
         super(runnable);

app/src/main/java/com/hippo/yorozuya/thread/SerialThreadExecutor.java

@@ -28,9 +28,9 @@ public class SerialThreadExecutor implements Executor, Runnable {
 
     private final Lock mThreadLock = new ReentrantLock();
     private final Object mWaitLock = new Object();
-    private long mKeepAliveMillis;
-    private Queue<Runnable> mWorkQueue;
-    private ThreadFactory mThreadFactory;
+    private final long mKeepAliveMillis;
+    private final Queue<Runnable> mWorkQueue;
+    private final ThreadFactory mThreadFactory;
     // The worker
     private Thread mThread;
 

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

@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2022 Tarsin Norbin
+  ~
+  ~ This file is part of EhViewer
+  ~
+  ~ EhViewer is free software: you can redistribute it and/or modify it
+  ~ under the terms of the GNU GeneralPublic License as published
+  ~ by the Free Software Foundation,either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ EhViewer is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along with EhViewer.
+  ~ If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"

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

@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2022 Tarsin Norbin
+  ~
+  ~ This file is part of EhViewer
+  ~
+  ~ EhViewer is free software: you can redistribute it and/or modify it
+  ~ under the terms of the GNU GeneralPublic License as published
+  ~ by the Free Software Foundation,either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ EhViewer is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along with EhViewer.
+  ~ If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"

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

@@ -29,10 +29,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.hippo.ehviewer.widget.FixedThumb
+        <com.hippo.ehviewer.widget.ResizeableFixedThumb
             android:id="@+id/thumb"
-            android:layout_width="@dimen/gallery_list_thumb_width"
-            android:layout_height="@dimen/gallery_list_thumb_height"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             app:alwaysCutAndScale="true"
             app:retryType="longClick" />
 

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

@@ -35,10 +35,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
 
-            <com.hippo.ehviewer.widget.FixedThumb
+            <com.hippo.ehviewer.widget.ResizeableFixedThumb
                 android:id="@+id/thumb"
-                android:layout_width="@dimen/gallery_list_thumb_width"
-                android:layout_height="@dimen/gallery_list_thumb_height"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
                 app:alwaysCutAndScale="true"
                 app:retryType="click"/>
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -768,4 +768,5 @@
     <string name="archive_need_passwd">归档文件需要密码</string>
     <string name="passwd_wrong">密码错误</string>
     <string name="passwd_cannot_be_empty">密码不能为空</string>
+    <string name="list_tile_thumb_size">详情模式下缩略图大小</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -95,7 +95,7 @@
 
     <string name="kokomade_tip">設定->Eh->圖庫站台->e-hentai</string>
 
-    <string name="app_waring">本應用程式中內容來自網際網路，部分內容可能對您的生理及心理造成難以恢復的傷害。本應用程式的作者不會對由其所造成的任何影響負責。\n\n未成年人應在監護人指導下使用本應用程式。</string>
+    <string name="app_waring">本應用程式中內容來自網際網路，部分內容可能對您的生理及心理造成難以恢復的傷害。本應用程式的作者不會對由其所造成的任何影響負責。\n\n未成年人應在監護人指導下使用本應用程式。\n\n繼續使用即代表您同意上述條款。</string>
     <string name="error_username_cannot_empty">使用者名稱欄位不能為空</string>
     <string name="error_password_cannot_empty">密碼欄位不能為空</string>
     <string name="skip_signing_in">略過登入</string>

app/src/main/res/values/attrs.xml

@@ -134,10 +134,6 @@
         <attr name="url" format="string" />
     </declare-styleable>
 
-    <declare-styleable name="SeekBarPreference">
-        <attr name="max" format="integer" />
-    </declare-styleable>
-
     <declare-styleable name="FastScroller">
         <attr name="handler" format="reference" />
         <attr name="draggable" format="boolean" />

app/src/main/res/values/dimens.xml

@@ -31,8 +31,6 @@
     <dimen name="rating_size">16dp</dimen>
     <dimen name="rating_interval">1dp</dimen>
 
-    <dimen name="gallery_list_thumb_height">120dp</dimen>
-    <dimen name="gallery_list_thumb_width">80dp</dimen>
     <!-- 4dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_list_interval">0dp</dimen>
     <!-- 8dp - 4dp, 4dp for card padding -->

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

@@ -832,4 +832,5 @@
     <string name="archive_need_passwd">Archive need password</string>
     <string name="passwd_wrong">Password Wrong</string>
     <string name="passwd_cannot_be_empty">Password can\'t be empty</string>
+    <string name="list_tile_thumb_size">Thumb size in thumb mode</string>
 </resources>

app/src/main/res/xml/eh_settings.xml

@@ -82,6 +82,15 @@
         app:entryValues="@array/list_mode_entry_values"
         app:iconSpaceReserved="false" />
 
+    <SeekBarPreference
+        android:defaultValue="40"
+        android:key="list_tile_size"
+        android:title="@string/list_tile_thumb_size"
+        android:max="60"
+        app:iconSpaceReserved="false"
+        app:min="30"
+        app:showSeekBarValue="true" />
+
     <rikka.preference.SimpleMenuPreference
         android:defaultValue="0"
         android:key="detail_size"

app/src/main/res/xml/locales_config.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2022 Tarsin Norbin
+  ~
+  ~ This file is part of EhViewer
+  ~
+  ~ EhViewer is free software: you can redistribute it and/or modify it
+  ~ under the terms of the GNU GeneralPublic License as published
+  ~ by the Free Software Foundation,either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ EhViewer is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along with EhViewer.
+  ~ If not, see <https://www.gnu.org/licenses/>.
+  -->
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en" />
+    <locale android:name="de" />
+    <locale android:name="es" />
+    <locale android:name="fr" />
+    <locale android:name="ja" />
+    <locale android:name="ko" />
+    <locale android:name="th" />
+    <locale android:name="zh-CN" />
+    <locale android:name="zh-HK" />
+    <locale android:name="zh-TW" />
+</locale-config>

app/src/main/res/xml/read_settings.xml

@@ -122,8 +122,8 @@
         android:dependency="custom_screen_lightness"
         android:key="screen_lightness"
         android:title="@string/settings_read_screen_lightness"
+        android:max="200"
         app:iconSpaceReserved="false"
-        app:max="200"
         app:showSeekBarValue="true" />
 
 </PreferenceScreen>