Release 1.8.2.4

Update plugin com.android.application to v8.0.0-alpha02

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -30,6 +30,7 @@ jobs:
       - name: Gradle Build
         uses: gradle/gradle-build-action@v2
         with:
+          gradle-home-cache-cleanup: true
           arguments: assembleRelease
 
       - name: Update ARM64

app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "moe.tarsin.ehviewer"
         minSdkVersion 31
         targetSdkVersion 33
-        versionCode 180012
-        versionName "1.8.2.3"
+        versionCode 180013
+        versionName "1.8.2.4"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
     }
 
@@ -93,11 +93,11 @@ android {
 }
 
 dependencies {
-    def activity_version = "1.6.0-rc02"
+    def activity_version = "1.6.0"
     implementation "androidx.activity:activity:$activity_version"
     implementation "androidx.activity:activity-ktx:$activity_version"
 
-    implementation "androidx.annotation:annotation:1.5.0-rc01"
+    implementation "androidx.annotation:annotation:1.5.0"
     implementation "androidx.annotation:annotation-experimental:1.3.0"
     implementation "androidx.appcompat:appcompat:1.6.0-rc01"
 
@@ -105,14 +105,14 @@ dependencies {
     implementation "androidx.arch.core:core-common:$arch_core_version"
     implementation "androidx.arch.core:core-runtime:$arch_core_version"
 
-    implementation "androidx.biometric:biometric-ktx:1.2.0-alpha04"
+    implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
     implementation "androidx.browser:browser:1.4.0"
 
     def collection_version = "1.3.0-alpha02"
     implementation "androidx.collection:collection:$collection_version"
     implementation "androidx.collection:collection-ktx:$collection_version"
 
-    def compose_version = "1.3.0-beta02"
+    def compose_version = "1.3.0-beta03"
     implementation "androidx.compose.animation:animation:$compose_version"
     implementation "androidx.compose.foundation:foundation:$compose_version"
     implementation "androidx.compose.foundation:foundation-layout:$compose_version"
@@ -120,16 +120,16 @@ dependencies {
     implementation "androidx.compose.runtime:runtime-saveable:$compose_version"
     implementation "androidx.compose.ui:ui:$compose_version"
 
-    implementation "androidx.compose.material3:material3:1.0.0-beta02"
+    implementation "androidx.compose.material3:material3:1.0.0-beta03"
 
-    implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha03"
+    implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha04"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
 
     def core_version = "1.9.0"
     implementation "androidx.core:core:$core_version"
     implementation "androidx.core:core-ktx:$core_version"
 
-    implementation "androidx.customview:customview:1.2.0-alpha01"
+    implementation "androidx.customview:customview:1.2.0-alpha02"
     implementation "androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03"
 
     def fragment_version = "1.6.0-alpha02"
@@ -155,7 +155,7 @@ dependencies {
     implementation "androidx.paging:paging-runtime:3.2.0-alpha02"
 
     implementation 'androidx.preference:preference:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0-beta02'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0-rc01'
 
     def room_version = "2.5.0-alpha03"
     implementation "androidx.room:room-runtime:$room_version"

app/src/main/cpp/CMakeLists.txt

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

app/src/main/cpp/archive.c

@@ -195,8 +195,8 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
 
 JNIEXPORT jint JNICALL
 Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *env, jobject thiz, jint fd, jlong size) {
-    (void)env; /* UNUSED */
-    (void)thiz; /* UNUSED */
+    (void) env; /* UNUSED */
+    (void) thiz; /* UNUSED */
     archive_ctx *ctx = NULL;
     archiveAddr = mmap64(0, size, PROT_READ, MAP_PRIVATE, fd, 0);
     if (archiveAddr == MAP_FAILED) {
@@ -246,51 +246,39 @@ Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *env, jobject thiz, jint fd
     return r;
 }
 
-typedef struct Memarea {
-    void *buffer;
-    long size;
-} Memarea;
-
 JNIEXPORT jlong JNICALL
-Java_com_hippo_UriArchiveAccessor_extracttoOutputStream(JNIEnv *env, jobject thiz, jint index) {
-    (void)env; /* UNUSED */
-    (void)thiz; /* UNUSED */
+Java_com_hippo_UriArchiveAccessor_extractToAddr(JNIEnv *env, jobject thiz, jint index) {
+    (void) env; /* UNUSED */
+    (void) thiz; /* UNUSED */
     archive_ctx *ctx = NULL;
     int ret;
     ret = archive_get_ctx(&ctx, index);
     if (ret)
         return 0;
-    Memarea *memarea = malloc(sizeof(Memarea));
-    if (!memarea) {
+    long long size = archive_entry_size(ctx->entry);
+    void *buffer = malloc(size + sizeof(long long));
+    if (!buffer) {
         ctx->using = 0;
         LOGE("Allocate buffer for decompression failed:ENOMEM");
         return 0;
     }
-    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);
+    *(long long *) buffer = size;
+    ret = archive_read_data(ctx->arc, buffer + sizeof(long long), size);
     ctx->using = 0;
-    if (ret == memarea->size)
-        return (jlong) memarea;
-    if (ret != memarea->size)
+    if (ret == size)
+        return (jlong) buffer;
+    if (ret != 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);
+    free(buffer);
     return 0;
 }
 
 JNIEXPORT void JNICALL
 Java_com_hippo_UriArchiveAccessor_closeArchive(JNIEnv *env, jobject thiz) {
-    (void)env; /* UNUSED */
-    (void)thiz; /* UNUSED */
+    (void) env; /* UNUSED */
+    (void) thiz; /* UNUSED */
     for (int i = 0; i < CTX_POOL_SIZE; i++)
         archive_release_ctx(ctx_pool[i]);
     free(passwd);
@@ -303,14 +291,14 @@ Java_com_hippo_UriArchiveAccessor_closeArchive(JNIEnv *env, jobject thiz) {
 
 JNIEXPORT jboolean JNICALL
 Java_com_hippo_UriArchiveAccessor_needPassword(JNIEnv *env, jobject thiz) {
-    (void)env; /* UNUSED */
-    (void)thiz; /* UNUSED */
+    (void) env; /* UNUSED */
+    (void) thiz; /* UNUSED */
     return need_encrypt;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_com_hippo_UriArchiveAccessor_providePassword(JNIEnv *env, jobject thiz, jstring str) {
-    (void)thiz; /* UNUSED */
+    (void) thiz; /* UNUSED */
     struct archive_entry *entry;
     archive_ctx *ctx;
     jboolean ret = true;
@@ -337,3 +325,30 @@ Java_com_hippo_UriArchiveAccessor_providePassword(JNIEnv *env, jobject thiz, jst
     archive_release_ctx(ctx);
     return ret;
 }
+
+JNIEXPORT jstring JNICALL
+Java_com_hippo_UriArchiveAccessor_getFilename(JNIEnv *env, jobject thiz, jint index) {
+    (void) env; /* UNUSED */
+    (void) thiz; /* UNUSED */
+    archive_ctx *ctx = NULL;
+    int ret;
+    ret = archive_get_ctx(&ctx, index);
+    if (ret)
+        return NULL;
+    jstring str = (*env)->NewStringUTF(env, archive_entry_pathname(ctx->entry));
+    ctx->using = 0;
+    return str;
+}
+
+JNIEXPORT void JNICALL
+Java_com_hippo_UriArchiveAccessor_extractToFd(JNIEnv *env, jobject thiz, jint index, jint fd) {
+    (void) env; /* UNUSED */
+    (void) thiz; /* UNUSED */
+    archive_ctx *ctx = NULL;
+    int ret;
+    ret = archive_get_ctx(&ctx, index);
+    if (!ret) {
+        archive_read_data_into_fd(ctx->arc, fd);
+        ctx->using = 0;
+    }
+}

app/src/main/cpp/fdutils.c

@@ -0,0 +1,16 @@
+#include <jni.h>
+
+JNIEXPORT jint JNICALL
+Java_com_hippo_Native_getFd(JNIEnv *env, jclass clazz, jobject fileDescriptor) {
+    jint fd = -1;
+    jclass fdClass = (*env)->FindClass(env, "java/io/FileDescriptor");
+
+    if (fdClass != NULL) {
+        jfieldID fdClassDescriptorFieldID = (*env)->GetFieldID(env, fdClass, "descriptor", "I");
+        if (fdClassDescriptorFieldID != NULL && fileDescriptor != NULL) {
+            fd = (*env)->GetIntField(env, fileDescriptor, fdClassDescriptorFieldID);
+        }
+    }
+
+    return fd;
+}

app/src/main/cpp/image.c

@@ -84,11 +84,6 @@ static void recycle(IMAGE *image) {
     free(image);
 }
 
-typedef struct Memarea {
-    void *buffer;
-    long size;
-} Memarea;
-
 bool copy_pixels(const void *src, int src_w, int src_h, int src_x, int src_y,
                  void *dst, int dst_w, int dst_h, int dst_x, int dst_y,
                  int width, int height) {
@@ -159,17 +154,17 @@ bool copy_pixels(const void *src, int src_w, int src_h, int src_x, int src_y,
     dst_blank_length = (size_t) (dst_y * dst_w + dst_x) * 4;
 
     // First line
-    dst_pos += (int)dst_blank_length;
+    dst_pos += (int) dst_blank_length;
     memcpy(dst + dst_pos, src + src_pos, line_stride);
-    dst_pos += (int)line_stride;
+    dst_pos += (int) line_stride;
     src_pos += src_stride;
 
     // Other lines
     dst_blank_length = (size_t) ((dst_w - width) * 4);
     for (line = 1; line < height; line++) {
-        dst_pos += (int)dst_blank_length;
+        dst_pos += (int) dst_blank_length;
         memcpy(dst + dst_pos, src + src_pos, line_stride);
-        dst_pos += (int)line_stride;
+        dst_pos += (int) line_stride;
         src_pos += src_stride;
     }
 
@@ -216,9 +211,9 @@ IMAGE *createFromFd(int fd) {
     return image;
 }
 
-IMAGE *createFromAddr(void *addr, long size) {
+IMAGE *createFromAddr(void *addr, long long size) {
     AImageDecoder *decoder;
-    AImageDecoder_createFromBuffer((const void *) addr, size, &decoder);
+    AImageDecoder_createFromBuffer((const void *) addr + sizeof(long long), size, &decoder);
     IMAGE *image = calloc(1, sizeof(IMAGE));
     SOURCE *src = calloc(1, sizeof(SOURCE));
     src->decoder = decoder;
@@ -263,32 +258,12 @@ void advance(IMAGE *image) {
     }
 }
 
-static int jniGetFDFromFileDescriptor(JNIEnv *env, jobject fileDescriptor) {
-    jint fd = -1;
-    jclass fdClass = (*env)->FindClass(env, "java/io/FileDescriptor");
-
-    if (fdClass != NULL) {
-        jfieldID fdClassDescriptorFieldID = (*env)->GetFieldID(env, fdClass, "descriptor", "I");
-        if (fdClassDescriptorFieldID != NULL && fileDescriptor != NULL) {
-            fd = (*env)->GetIntField(env, fileDescriptor, fdClassDescriptorFieldID);
-        }
-    }
-
-    return fd;
-}
-
 JNIEXPORT jlong JNICALL
-Java_com_hippo_image_Image_nativeDecodeFdInt(JNIEnv *env, jclass clazz, jint fd) {
+Java_com_hippo_image_Image_nativeDecode(JNIEnv *env, jclass clazz, jint fd) {
     IMAGE *image = createFromFd(fd);
     return (jlong) image;
 }
 
-JNIEXPORT jlong JNICALL
-Java_com_hippo_image_Image_nativeDecode(JNIEnv *env, jclass clazz, jobject fd) {
-    return Java_com_hippo_image_Image_nativeDecodeFdInt(env, clazz,
-                                                        jniGetFDFromFileDescriptor(env, fd));
-}
-
 JNIEXPORT jlong JNICALL
 Java_com_hippo_image_Image_nativeCreate(JNIEnv *env, jclass clazz, jobject bitmap) {
     AndroidBitmapInfo info;
@@ -298,7 +273,7 @@ Java_com_hippo_image_Image_nativeCreate(JNIEnv *env, jclass clazz, jobject bitma
     AndroidBitmap_getInfo(env, bitmap, &info);
     AndroidBitmap_lockPixels(env, bitmap, &pixels);
 
-    image = create((int)info.width, (int)info.height, pixels);
+    image = create((int) info.width, (int) info.height, pixels);
     AndroidBitmap_unlockPixels(env, bitmap);
     return (jlong) image;
 }
@@ -313,7 +288,8 @@ Java_com_hippo_image_Image_nativeRender(JNIEnv *env, jclass clazz, jlong ptr, ji
     AndroidBitmap_getInfo(env, dst, &info);
     AndroidBitmap_lockPixels(env, dst, &pixels);
 
-    render((IMAGE *) ptr, src_x, src_y, pixels, (int)info.width, (int)info.height, dst_x, dst_y, width,
+    render((IMAGE *) ptr, src_x, src_y, pixels, (int) info.width, (int) info.height, dst_x, dst_y,
+           width,
            height);
 
     AndroidBitmap_unlockPixels(env, dst);
@@ -358,9 +334,7 @@ Java_com_hippo_image_Image_nativeRecycle(JNIEnv *env, jclass clazz, jlong ptr) {
 
 JNIEXPORT jlong JNICALL
 Java_com_hippo_image_Image_nativeDecodeAddr(JNIEnv *env, jclass clazz, jlong addr) {
-    Memarea *memarea = (Memarea *) addr;
-    IMAGE *image = createFromAddr(memarea->buffer, memarea->size);
-    free(memarea);
+    IMAGE *image = createFromAddr((void *) addr, *(long long *) addr);
     return (jlong) image;
 }
 

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

@@ -18,8 +18,12 @@
 
 package com.hippo;
 
+import java.io.FileDescriptor;
+
 public class Native {
     public static void initialize() {
         System.loadLibrary("ehviewer");
     }
+
+    public static native int getFd(FileDescriptor fd);
 }

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;
@@ -43,7 +39,11 @@ public class UriArchiveAccessor {
 
     private native int openArchive(int fd, long size);
 
-    public native long extracttoOutputStream(int index);
+    public native long extractToAddr(int index);
+
+    public native void extractToFd(int index, int fd);
+
+    public native String getFilename(int index);
 
     public native boolean needPassword();
 

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

@@ -9,11 +9,11 @@ open class BaseDialogBuilder constructor(
     context: Context
 ) : MaterialAlertDialogBuilder(context) {
     override fun create(): AlertDialog {
-        return super.create().also { dialog ->
-            dialog.window?.let {
-                it.addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND)
-                it.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
-                it.attributes.blurBehindRadius = 32
+        return super.create().apply {
+            window?.run {
+                addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND)
+                addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+                attributes.blurBehindRadius = 32
             }
         }
     }

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

@@ -68,7 +68,6 @@ import com.hippo.network.StatusCodeException;
 import com.hippo.scene.SceneApplication;
 import com.hippo.unifile.UniFile;
 import com.hippo.util.BitmapUtils;
-import com.hippo.util.ClipboardUtil;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.IoThreadPoolExecutor;
 import com.hippo.util.ReadableTime;
@@ -329,7 +328,6 @@ public class EhApplication extends SceneApplication {
         super.onCreate();
 
         Native.initialize();
-        ClipboardUtil.initialize(this);
         GetText.initialize(this);
         StatusCodeException.initialize(this);
         Settings.initialize(this);

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

@@ -24,15 +24,19 @@ import android.os.Process;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.hippo.Native;
 import com.hippo.UriArchiveAccessor;
 import com.hippo.ehviewer.GetText;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.Settings;
 import com.hippo.image.Image;
 import com.hippo.unifile.UniFile;
+import com.hippo.yorozuya.FileUtils;
 import com.hippo.yorozuya.thread.PVLock;
 import com.hippo.yorozuya.thread.PriorityThread;
 
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -143,28 +147,43 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
     @NonNull
     @Override
     public String getImageFilename(int index) {
-        // TODO
-        return Integer.toString(index);
-    }
-
-    @Override
-    public boolean save(int index, @NonNull UniFile file) {
-        // TODO
-        return false;
-    }
-
-    @Nullable
-    @Override
-    public UniFile save(int index, @NonNull UniFile dir, @NonNull String filename) {
-        // TODO
-        return null;
+        return FileUtils.getNameFromFilename(getImageFilenameWithExtension(index));
     }
 
     @NonNull
     @Override
     public String getImageFilenameWithExtension(int index) {
-        // TODO
-        return Integer.toString(index);
+        return FileUtils.sanitizeFilename(archiveAccessor.getFilename(index));
+    }
+
+    @Override
+    public boolean save(int index, @NonNull UniFile file) {
+        int fd;
+        FileOutputStream stream;
+        try {
+            stream = (FileOutputStream)file.openOutputStream();
+            fd = Native.getFd(stream.getFD());
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+        archiveAccessor.extractToFd(index, fd);
+        try {
+            stream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    @Nullable
+    @Override
+    public UniFile save(int index, @NonNull UniFile dir, @NonNull String filename) {
+        String extension = FileUtils.getExtensionFromFilename(getImageFilenameWithExtension(index));
+        UniFile dst = dir.subFile(null != extension ? filename + "." + extension : filename);
+        save(index, dst);
+        return dst;
     }
 
     private class ArchiveHostTask implements Runnable {
@@ -279,7 +298,7 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
                     }
                 }
 
-                long addr = archiveAccessor.extracttoOutputStream(index);
+                long addr = archiveAccessor.extractToAddr(index);
 
                 synchronized (streams) {
                     streams.put(index, addr);

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

@@ -16,8 +16,6 @@
 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
@@ -29,6 +27,8 @@ import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.ui.SettingsActivity
 import com.hippo.ehviewer.ui.scene.BaseScene
 import com.hippo.preference.MessagePreference
+import com.hippo.util.addTextToClipboard
+import com.hippo.util.getClipboardManager
 import okhttp3.Cookie
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import java.util.*
@@ -81,20 +81,9 @@ class AccountPreference @JvmOverloads constructor(
         super.onPrepareDialogBuilder(builder)
         if (message != null) {
             builder.setNeutralButton(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)
+                context.getClipboardManager().addTextToClipboard(message, true) {
                     mActivity.showTip(R.string.copied_to_clipboard, BaseScene.LENGTH_SHORT)
+                }
                 this@AccountPreference.onClick(dialog, which)
             }
         }

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

@@ -858,7 +858,8 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
         intent.setAction(Intent.ACTION_SEND);
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         intent.putExtra(Intent.EXTRA_STREAM, uri);
-        intent.putExtra(Intent.EXTRA_TEXT, EhUrl.getGalleryDetailUrl(mGalleryInfo.gid, mGalleryInfo.token));
+        if (mGalleryInfo != null)
+            intent.putExtra(Intent.EXTRA_TEXT, EhUrl.getGalleryDetailUrl(mGalleryInfo.gid, mGalleryInfo.token));
         intent.setDataAndType(uri, mimeType);
 
         try {

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

@@ -77,7 +77,7 @@ import com.hippo.scene.SceneFragment;
 import com.hippo.scene.StageActivity;
 import com.hippo.unifile.UniFile;
 import com.hippo.util.BitmapUtils;
-import com.hippo.util.ClipboardUtil;
+import com.hippo.util.ClipboardUtilKt;
 import com.hippo.widget.DrawerView;
 import com.hippo.yorozuya.IOUtils;
 import com.hippo.yorozuya.SimpleHandler;
@@ -259,7 +259,7 @@ public final class MainActivity extends StageActivity
                     String url = intent.getData().toString();
                     new EditTextDialogBuilder(this, url, "")
                             .setTitle(R.string.error_cannot_parse_the_url)
-                            .setPositiveButton(android.R.string.copy, (dialog, which) -> ClipboardUtil.addTextToClipboard(url))
+                            .setPositiveButton(android.R.string.copy, (dialog, which) -> ClipboardUtilKt.addTextToClipboard(ClipboardUtilKt.getClipboardManager(this), url, false, () -> null))
                             .show();
                 }
             }
@@ -456,7 +456,7 @@ public final class MainActivity extends StageActivity
     }
 
     private void checkClipboardUrlInternal() {
-        String text = ClipboardUtil.getUrlFromClipboard();
+        String text = ClipboardUtilKt.getUrlFromClipboard(ClipboardUtilKt.getClipboardManager(this), this);
         int hashCode = text != null ? text.hashCode() : 0;
 
         if (text != null && hashCode != 0 && Settings.getClipboardTextHashCode() != hashCode) {

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

@@ -42,6 +42,8 @@ import androidx.fragment.app.FragmentActivity;
 import com.hippo.ehviewer.ui.MainActivity;
 import com.hippo.scene.SceneFragment;
 
+import kotlin.Unit;
+
 public abstract class BaseScene extends SceneFragment {
 
     public static final int LENGTH_SHORT = 0;
@@ -106,11 +108,12 @@ public abstract class BaseScene extends SceneFragment {
         }
     }
 
-    public void showTip(@StringRes int id, int length) {
+    public Unit showTip(@StringRes int id, int length) {
         FragmentActivity activity = getActivity();
         if (activity instanceof MainActivity) {
             ((MainActivity) activity).showTip(id, length);
         }
+        return null;
     }
 
     public boolean needShowLeftDrawer() {

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

@@ -38,7 +38,7 @@ import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.client.EhCookieStore;
 import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.ehviewer.client.EhUtils;
-import com.hippo.util.ClipboardUtil;
+import com.hippo.util.ClipboardUtilKt;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.yorozuya.AssertUtils;
 import com.hippo.yorozuya.ViewUtils;
@@ -253,7 +253,7 @@ public class CookieSignInScene extends SolidScene implements EditText.OnEditorAc
 
     private void fillCookiesFromClipboard() {
         hideSoftInput();
-        String text = ClipboardUtil.getTextFromClipboard();
+        String text = ClipboardUtilKt.getTextFromClipboard(ClipboardUtilKt.getClipboardManager(getContext()), getContext());
         if (text == null) {
             showTip(R.string.from_clipboard_error, LENGTH_SHORT);
             return;

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

@@ -72,7 +72,7 @@ import com.hippo.ehviewer.client.parser.VoteCommentParser;
 import com.hippo.ehviewer.ui.MainActivity;
 import com.hippo.scene.SceneFragment;
 import com.hippo.text.URLImageGetter;
-import com.hippo.util.ClipboardUtil;
+import com.hippo.util.ClipboardUtilKt;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.ReadableTime;
 import com.hippo.util.TextUrl;
@@ -354,8 +354,7 @@ public final class GalleryCommentsScene extends ToolbarScene
                     }
                     int id = menuId.get(which);
                     if (id == R.id.copy) {
-                        ClipboardUtil.addTextToClipboard(comment.comment);
-                        showTip(R.string.copied_to_clipboard, LENGTH_SHORT);
+                        ClipboardUtilKt.addTextToClipboard(ClipboardUtilKt.getClipboardManager(getContext()), comment.comment, false, () -> showTip(R.string.copied_to_clipboard, LENGTH_SHORT));
                     } else if (id == R.id.vote_up) {
                         voteComment(comment.id, 1);
                     } else if (id == R.id.vote_down) {

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

@@ -103,7 +103,7 @@ import com.hippo.scene.Announcer;
 import com.hippo.scene.SceneFragment;
 import com.hippo.text.URLImageGetter;
 import com.hippo.util.AppHelper;
-import com.hippo.util.ClipboardUtil;
+import com.hippo.util.ClipboardUtilKt;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.ReadableTime;
 import com.hippo.view.ViewTransition;
@@ -1454,11 +1454,9 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
                     } else if (id == R.id.add_filter) {
                         showFilterTagDialog(tag);
                     } else if (id == R.id.copy) {
-                        ClipboardUtil.addTextToClipboard(tag);
-                        showTip(R.string.copied_to_clipboard, LENGTH_SHORT);
+                        ClipboardUtilKt.addTextToClipboard(ClipboardUtilKt.getClipboardManager(getContext()), tag, false, () -> showTip(R.string.copied_to_clipboard, LENGTH_SHORT));
                     } else if (id == R.id.copy_trans) {
-                        ClipboardUtil.addTextToClipboard(tv.getText().toString());
-                        showTip(R.string.copied_to_clipboard, LENGTH_SHORT);
+                        ClipboardUtilKt.addTextToClipboard(ClipboardUtilKt.getClipboardManager(getContext()), tv.getText().toString(), false, () -> showTip(R.string.copied_to_clipboard, LENGTH_SHORT));
                     }
                 }).show();
     }

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

@@ -35,7 +35,7 @@ import com.hippo.ehviewer.UrlOpener;
 import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.ehviewer.client.EhUtils;
 import com.hippo.ehviewer.client.data.GalleryDetail;
-import com.hippo.util.ClipboardUtil;
+import com.hippo.util.ClipboardUtilKt;
 import com.hippo.yorozuya.AssertUtils;
 import com.hippo.yorozuya.ViewUtils;
 
@@ -188,14 +188,11 @@ public final class GalleryInfoScene extends ToolbarScene {
             if (position == INDEX_PARENT) {
                 UrlOpener.openUrl(context, mValues.get(position), true);
             } else {
-                ClipboardUtil.addTextToClipboard(mValues.get(position));
-
+                ClipboardUtilKt.addTextToClipboard(ClipboardUtilKt.getClipboardManager(getContext()), mValues.get(position), false, () -> showTip(R.string.copied_to_clipboard, LENGTH_SHORT));
                 if (position == INDEX_URL) {
                     // Save it to avoid detect the gallery
                     Settings.putClipboardTextHashCode(mValues.get(position).hashCode());
                 }
-
-                showTip(R.string.copied_to_clipboard, LENGTH_SHORT);
             }
             return true;
         } else {

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

@@ -20,6 +20,8 @@ import android.graphics.Bitmap;
 
 import androidx.annotation.Nullable;
 
+import com.hippo.Native;
+
 import java.io.FileDescriptor;
 import java.util.ArrayList;
 
@@ -64,7 +66,7 @@ public final class Image {
      */
     @Nullable
     public static Image decode(FileDescriptor fd, boolean partially) {
-        return newFromAddr(nativeDecode(fd));
+        return newFromAddr(nativeDecode(Native.getFd(fd)));
     }
 
     /**
@@ -72,7 +74,7 @@ public final class Image {
      */
     @Nullable
     public static Image decode(Integer fd, boolean partially) {
-        return newFromAddr(nativeDecodeFdInt(fd));
+        return newFromAddr(nativeDecode(fd));
     }
 
     /**
@@ -99,9 +101,7 @@ public final class Image {
         return imageList.size();
     }
 
-    private static native long nativeDecode(FileDescriptor fd);
-
-    private static native long nativeDecodeFdInt(int fd);
+    private static native long nativeDecode(int fd);
 
     private static native long nativeDecodeAddr(long addr);
 

app/src/main/java/com/hippo/text/URLImageGetter.java

@@ -1,43 +0,0 @@
-/*
- * Copyright 2015 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.text;
-
-import android.graphics.drawable.Drawable;
-import android.text.Html;
-
-import com.hippo.conaco.Conaco;
-import com.hippo.drawable.UnikeryDrawable;
-import com.hippo.image.ImageBitmap;
-import com.hippo.widget.ObservedTextView;
-
-public class URLImageGetter implements Html.ImageGetter {
-
-    private final ObservedTextView mTextView;
-    private final Conaco<ImageBitmap> mConaco;
-
-    public URLImageGetter(ObservedTextView textView, Conaco<ImageBitmap> conaco) {
-        mTextView = textView;
-        mConaco = conaco;
-    }
-
-    @Override
-    public Drawable getDrawable(String source) {
-        UnikeryDrawable drawable = new UnikeryDrawable(mTextView, mConaco);
-        drawable.load(source);
-        return drawable;
-    }
-}

app/src/main/java/com/hippo/text/URLImageGetter.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015 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.text
+
+import android.graphics.drawable.Drawable
+import android.text.Html.ImageGetter
+import com.hippo.conaco.Conaco
+import com.hippo.drawable.UnikeryDrawable
+import com.hippo.image.ImageBitmap
+import com.hippo.widget.ObservedTextView
+
+class URLImageGetter(
+    private val mTextView: ObservedTextView,
+    private val mConaco: Conaco<ImageBitmap>
+) : ImageGetter {
+    override fun getDrawable(source: String): Drawable {
+        return UnikeryDrawable(mTextView, mConaco).apply { load(source) }
+    }
+}

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

@@ -1,126 +0,0 @@
-/*
- * 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 General Public 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/>.
- */
-
-package com.hippo.util;
-
-import android.annotation.SuppressLint;
-import android.content.ClipData;
-import android.content.ClipDescription;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.os.Build;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.textclassifier.TextClassifier;
-
-import androidx.annotation.Nullable;
-
-public class ClipboardUtil {
-    private static final String TAG = "ClipboardUtil";
-    @Nullable
-    private static ClipboardManager clipboardManager;
-
-    @SuppressLint("StaticFieldLeak")
-    private static Context sContext;
-
-    public static void initialize(Context context) {
-        sContext = context;
-        clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-        if (clipboardManager == null) {
-            Log.e(TAG, "This device has no clipboard!");
-        }
-    }
-
-    public static void addTextToClipboard(String text) {
-        if (clipboardManager != null) {
-            try {
-                clipboardManager.setPrimaryClip(ClipData.newPlainText(null, text));
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public static String getTextFromClipboard() {
-        if (clipboardManager != null) {
-            try {
-                if (!clipboardManager.hasPrimaryClip()) {
-                    return null;
-                }
-                ClipData primaryClip = clipboardManager.getPrimaryClip();
-                if (primaryClip == null) {
-                    return null;
-                }
-                ClipData.Item item = primaryClip.getItemAt(0);
-                if (item == null) {
-                    return null;
-                }
-                String string = String.valueOf(item.coerceToText(sContext));
-                if (!TextUtils.isEmpty(string)) {
-                    return string;
-                } else {
-                    return null;
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                return null;
-            }
-        } else {
-            return null;
-        }
-    }
-
-    public static String getUrlFromClipboard() {
-        if (clipboardManager != null) {
-            try {
-                if (!clipboardManager.hasPrimaryClip()) {
-                    return null;
-                }
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    ClipDescription primaryClipDescription = clipboardManager.getPrimaryClipDescription();
-                    if (primaryClipDescription != null) {
-                        if (primaryClipDescription.getClassificationStatus() == ClipDescription.CLASSIFICATION_COMPLETE) {
-                            if (primaryClipDescription.getConfidenceScore(TextClassifier.TYPE_URL) <= 0) {
-                                return null;
-                            }
-                        }
-                    }
-                }
-                ClipData primaryClip = clipboardManager.getPrimaryClip();
-                if (primaryClip == null) {
-                    return null;
-                }
-                ClipData.Item item = primaryClip.getItemAt(0);
-                if (item == null) {
-                    return null;
-                }
-                String string = String.valueOf(item.coerceToText(sContext));
-                if (!TextUtils.isEmpty(string)) {
-                    return string;
-                } else {
-                    return null;
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                return null;
-            }
-        } else {
-            return null;
-        }
-    }
-}

app/src/main/java/com/hippo/util/ClipboardUtil.kt

@@ -0,0 +1,61 @@
+/*
+ * 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 General Public 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/>.
+ */
+package com.hippo.util
+
+import android.content.ClipData
+import android.content.ClipDescription
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.Build
+import android.os.PersistableBundle
+import android.text.TextUtils
+import android.view.textclassifier.TextClassifier
+
+fun Context.getClipboardManager(): ClipboardManager {
+    return getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+}
+
+fun ClipboardManager.addTextToClipboard(text: String?, isSensitive: Boolean, showTip: () -> Unit) {
+    setPrimaryClip(ClipData.newPlainText(null, text).apply {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && isSensitive)
+            description.extras = PersistableBundle().apply {
+                putBoolean(ClipDescription.EXTRA_IS_SENSITIVE, true)
+            }
+    })
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
+        showTip()
+}
+
+fun ClipboardManager.getTextFromClipboard(context: Context): String? {
+    val item = primaryClip?.getItemAt(0)
+    val string = item?.coerceToText(context).toString()
+    return if (!TextUtils.isEmpty(string)) string else null
+}
+
+fun ClipboardManager.getUrlFromClipboard(context: Context): String? {
+    if (primaryClipDescription?.classificationStatus == ClipDescription.CLASSIFICATION_COMPLETE) {
+        if ((primaryClipDescription?.getConfidenceScore(TextClassifier.TYPE_URL)
+                ?.let { it <= 0 }) == true
+        ) {
+            return null
+        }
+    }
+    val item = primaryClip?.getItemAt(0)
+    val string = item?.coerceToText(context).toString()
+    return if (!TextUtils.isEmpty(string)) string else null
+}

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

@@ -40,7 +40,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:alwaysCutAndScale="true"
-                app:retryType="click"/>
+                app:retryType="longClick"/>
 
         </com.google.android.material.card.MaterialCardView>
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.application' version '7.3.0' apply false
+    id 'com.android.application' version '8.0.0-alpha02' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
     id 'com.google.devtools.ksp' version '1.7.10-1.0.6' apply false
 }