Cleanup unnecessary jni call

app/src/main/cpp/CMakeLists.txt

@@ -63,5 +63,5 @@ FetchContent_MakeAvailable(libarchive)
 include_directories(${libarchive_SOURCE_DIR}/libarchive)
 
 # Build and link our app's native lib
-add_library(${PROJECT_NAME} SHARED archive.c fdutils.c gifutils.c natsort/strnatcmp.c)
+add_library(${PROJECT_NAME} SHARED archive.c gifutils.c natsort/strnatcmp.c)
 target_link_libraries(${PROJECT_NAME} archive_static log)

app/src/main/cpp/archive.c

@@ -459,7 +459,7 @@ Java_com_hippo_UriArchiveAccessor_getFilename(JNIEnv *env, jobject thiz, jint in
 }
 
 JNIEXPORT void JNICALL
-Java_com_hippo_UriArchiveAccessor_extractToFd(JNIEnv *env, jobject thiz, jint index, jint fd) {
+Java_com_hippo_UriArchiveAccessor_extractToFd(JNIEnv *env, jobject thiz, jint index, jobject fd) {
     EH_UNUSED(env);
     EH_UNUSED(thiz);
     index = entries[index].index;
@@ -467,7 +467,10 @@ Java_com_hippo_UriArchiveAccessor_extractToFd(JNIEnv *env, jobject thiz, jint in
     int ret;
     ret = archive_get_ctx(&ctx, index);
     if (!ret) {
-        archive_read_data_into_fd(ctx->arc, fd);
+        jclass fdClass = (*env)->FindClass(env, "java/io/FileDescriptor");
+        jfieldID fdClassDescriptorFieldID = (*env)->GetFieldID(env, fdClass, "descriptor", "I");
+        int realfd = (*env)->GetIntField(env, fd, fdClassDescriptorFieldID);
+        archive_read_data_into_fd(ctx->arc, realfd);
         ctx->using = 0;
     }
 }

app/src/main/cpp/fdutils.c

@@ -1,36 +0,0 @@
-#include <jni.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/sendfile.h>
-
-#include <android/log.h>
-#include <string.h>
-#include <errno.h>
-
-#define LOG_TAG "mmap_utils"
-
-#include "ehviewer.h"
-
-// TODO: Replace it with AFileDescriptor_getFd when minsdk 31
-// https://developer.android.com/ndk/reference/group/file-descriptor
-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;
-}
-
-JNIEXPORT void JNICALL
-Java_com_hippo_Native_sendfile(JNIEnv *env, jclass clazz, jint from, jint to) {
-    struct stat st;
-    fstat(from, &st);
-    sendfile(to, from, 0, st.st_size);
-}