Native lib info refactor

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

@@ -41,6 +41,28 @@ class VersionPreference @JvmOverloads constructor(
     override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
         super.onPrepareDialogBuilder(builder)
         builder.setTitle(R.string.show_library_version)
-        builder.setMessage(Native.getlibarchiveVersion() + "\nlzma(xz-utils) " + Native.getliblzmaVersion() + "\nzlib " + Native.getzlibVersion() + "\nlibjpeg-turbo " + Native.getlibjpeg_turboVersion())
+        val info = NativeLibInfo().addLib(Native.getlibarchiveVersion())
+            .addLib("lzma(xz-utils)", Native.getliblzmaVersion())
+            .addLib("zlib", Native.getzlibVersion())
+            .addLib("libjpeg-turbo", Native.getlibjpeg_turboVersion())
+            .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
+        }
     }
 }

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

@@ -31,4 +31,6 @@ public class Native {
     public static native String getlibjpeg_turboVersion();
 
     public static native String getzlibVersion();
+
+    public static native String getnettleVersion();
 }

native/src/main/jni/main.c

@@ -22,6 +22,7 @@
 #include <lzma.h>
 #include <zlib.h>
 #include "image/libjpeg-turbo/jconfigint.h"
+#include <nettle/config.h>
 
 #include "java_wrapper.h"
 
@@ -58,3 +59,8 @@ 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);
+}