diff --git a/app/src/main/cpp/main.c b/app/src/main/cpp/main.c index cc540335a..e0449f50e 100644 --- a/app/src/main/cpp/main.c +++ b/app/src/main/cpp/main.c @@ -43,23 +43,3 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved) { image_onUnload(); } - -JNIEXPORT jstring JNICALL -Java_com_hippo_Native_getlibarchiveVersion(JNIEnv *env, jclass clazz) { - return (*env)->NewStringUTF(env, ARCHIVE_VERSION_STRING); -} - -JNIEXPORT jstring JNICALL -Java_com_hippo_Native_getliblzmaVersion(JNIEnv *env, jclass clazz) { - return (*env)->NewStringUTF(env, lzma_version_string()); -} - -JNIEXPORT jstring JNICALL -Java_com_hippo_Native_getzlibVersion(JNIEnv *env, jclass clazz) { - return (*env)->NewStringUTF(env, ZLIB_VERSION); -} - -JNIEXPORT jstring JNICALL -Java_com_hippo_Native_getnettleVersion(JNIEnv *env, jclass clazz) { - return (*env)->NewStringUTF(env, PACKAGE_STRING); -} \ No newline at end of file diff --git a/app/src/main/java/com/hippo/Native.java b/app/src/main/java/com/hippo/Native.java index 96ee1fce5..06d02cb10 100644 --- a/app/src/main/java/com/hippo/Native.java +++ b/app/src/main/java/com/hippo/Native.java @@ -19,16 +19,7 @@ package com.hippo; public class Native { - public static void initialize() { System.loadLibrary("ehviewer"); } - - public static native String getlibarchiveVersion(); - - public static native String getliblzmaVersion(); - - public static native String getzlibVersion(); - - public static native String getnettleVersion(); } diff --git a/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt index b4ba0de6b..ec5e154f3 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt @@ -18,14 +18,12 @@ package com.hippo.ehviewer.preference import android.content.Context import android.content.pm.PackageManager import android.util.AttributeSet -import androidx.appcompat.app.AlertDialog -import com.hippo.Native +import androidx.preference.Preference import com.hippo.ehviewer.R -import com.hippo.preference.MessagePreference class VersionPreference @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null -) : MessagePreference(context, attrs) { +) : Preference(context, attrs) { init { setTitle(R.string.settings_about_version) @Suppress("DEPRECATION") val version: String = try { @@ -37,31 +35,4 @@ class VersionPreference @JvmOverloads constructor( } summary = version } - - override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) { - super.onPrepareDialogBuilder(builder) - builder.setTitle(R.string.show_library_version) - val info = NativeLibInfo().addLib(Native.getlibarchiveVersion()) - .addLib("lzma(xz-utils)", Native.getliblzmaVersion()) - .addLib("zlib", Native.getzlibVersion()) - .addLib(Native.getnettleVersion()) - builder.setMessage(info.getMessage()) - } - - inner class NativeLibInfo { - private var message: String = "" - fun addLib(libname: String, libversion: String): NativeLibInfo { - message = "$message$libname $libversion\n" - return this - } - - fun getMessage(): String { - return message; - } - - fun addLib(msg: String): NativeLibInfo { - message = "$message$msg\n" - return this - } - } } \ No newline at end of file