From 4c6ccab0512659c575fd706c875ffdfaa486dd40 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 23 Jul 2022 16:25:53 +0800
Subject: [PATCH] Native lib info refactor

---
 .../ehviewer/preference/VersionPreference.kt  | 24 ++++++++++++++++++-
 native/src/main/java/com/hippo/Native.java    |  2 ++
 native/src/main/jni/libarchive                |  2 +-
 native/src/main/jni/main.c                    |  6 +++++
 4 files changed, 32 insertions(+), 2 deletions(-)

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 3cf9361b3..f44161f38 100644
--- a/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt
+++ b/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
+        }
     }
 }
\ No newline at end of file
diff --git a/native/src/main/java/com/hippo/Native.java b/native/src/main/java/com/hippo/Native.java
index 305201db4..45d7ede81 100644
--- a/native/src/main/java/com/hippo/Native.java
+++ b/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();
 }
diff --git a/native/src/main/jni/libarchive b/native/src/main/jni/libarchive
index b0ff23367..37d2cf606 160000
--- a/native/src/main/jni/libarchive
+++ b/native/src/main/jni/libarchive
@@ -1 +1 @@
-Subproject commit b0ff233678bd0b2226d0f31aa1ea6d4c94d98fe4
+Subproject commit 37d2cf6063f652fbe0fe9479f4951b77e8553691
diff --git a/native/src/main/jni/main.c b/native/src/main/jni/main.c
index 26979b4aa..3b45993e6 100644
--- a/native/src/main/jni/main.c
+++ b/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);
+}
\ No newline at end of file