more info in about tab

Zoxcore · Nov 26, 2023 · 08a640b · 08a640b
1 parent 87d4765
commit 08a640b
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,7 +23,6 @@ repositories {
 buildConfig {
     buildConfigField("String", "APP_NAME", "\"${project.name}\"")
     buildConfigField("String", "APP_VERSION", provider { "\"${project.version}\"" })
-    buildConfigField("String", "KOTLIN_VERSION", "\"" + embeddedKotlinVersion + "\"")
     buildConfigField("String", "PROJECT_VERSION", "\"${project.version}\"")
     try
     {

diff --git a/src/main/kotlin/com/zoffcc/applications/trifa/MainActivity.kt b/src/main/kotlin/com/zoffcc/applications/trifa/MainActivity.kt
@@ -117,6 +117,7 @@ class MainActivity
         // --------- global config ---------
         var native_lib_loaded = false
         @JvmStatic var native_notification_lib_loaded_error = -1
+        @JvmStatic var native_ffmpegav_lib_loaded_error = -1
         var tox_service_fg: TrifaToxService? = null
         var tox_savefile_directory = "."
         var PREF__udp_enabled = 1
@@ -324,7 +325,16 @@ class MainActivity
 
                 val libdir2: String = resourcesDir.path
                 System.out.println("XXXXX7:" + libdir2)
-                ffmpegav_loadjni(libdir2)
+
+                native_ffmpegav_lib_loaded_error = -1
+                try
+                {
+                    native_ffmpegav_lib_loaded_error = ffmpegav_loadjni(libdir2)
+                }
+                catch(_: Exception)
+                {
+                }
+
                 if (OperatingSystem.getCurrent() == OperatingSystem.LINUX)
                 {
                     native_notification_lib_loaded_error = jninotifications_loadjni(libdir2)

diff --git a/src/main/kotlin/org/briarproject/briar/desktop/ui/AboutScreen.kt b/src/main/kotlin/org/briarproject/briar/desktop/ui/AboutScreen.kt
@@ -38,6 +38,16 @@ import androidx.compose.ui.semantics.text
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.unit.dp
+import com.zoffcc.applications.ffmpegav.AVActivity
+import com.zoffcc.applications.jninotifications.NTFYActivity
+import com.zoffcc.applications.trifa.MainActivity
+import com.zoffcc.applications.trifa.MainActivity.Companion.jnictoxcore_version
+import com.zoffcc.applications.trifa.MainActivity.Companion.libavutil_version
+import com.zoffcc.applications.trifa.MainActivity.Companion.libopus_version
+import com.zoffcc.applications.trifa.MainActivity.Companion.libsodium_version
+import com.zoffcc.applications.trifa.MainActivity.Companion.tox_version_major
+import com.zoffcc.applications.trifa.MainActivity.Companion.tox_version_minor
+import com.zoffcc.applications.trifa.MainActivity.Companion.tox_version_patch
 import com.zoffcc.applications.trifa_material.trifa_material.BuildConfig
 import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18n
 import java.time.Instant
@@ -111,14 +121,66 @@ private fun GeneralInfo() {
         //   add(Entry("Git branch/tag", "None detected")) // NON-NLS
         // add(Entry("Git hash", BuildData.GIT_HASH)) // NON-NLS
         // add(Entry("Commit time", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(commitTime))) // NON-NLS
-        add(Entry(i18n("about.version"), BuildConfig.APP_VERSION))
-        add(Entry(i18n("about.git_kotlin_version"), BuildConfig.KOTLIN_VERSION))
+        add(Entry(i18n("about.trifa_material_version"), BuildConfig.APP_VERSION))
         add(Entry(i18n("about.git_commit_branch"), BuildConfig.GIT_BRANCH))
         add(Entry(i18n("about.git_commit_hash"), BuildConfig.GIT_COMMIT_HASH))
         add(Entry(i18n("about.git_commit_date"), BuildConfig.GIT_COMMIT_DATE))
         add(Entry(i18n("about.git_commit_msg"), BuildConfig.GIT_COMMIT_MSG))
         add(Entry(i18n("about.website"), "https://github.com/Zoxcore/trifa_material", true))
 
+        add(Entry(i18n("about.toxcore_version"), ""+tox_version_major() +"."+ tox_version_minor()+"."+ tox_version_patch()))
+        add(Entry(i18n("about.jnictoxcore_version"), jnictoxcore_version()))
+        var libavutil_version = "???"
+        var libopus_version = "???"
+        var libsodium_version = "???"
+        try
+        {
+            libavutil_version = libavutil_version()!!
+            libopus_version = libopus_version()!!
+            libsodium_version = libsodium_version()!!
+        }
+        catch (_: Exception)
+        {
+        }
+        add(Entry(i18n("about.libavutil_version"), libavutil_version))
+        add(Entry(i18n("about.libopus_version"), libopus_version))
+        add(Entry(i18n("about.libsodium_version"), libsodium_version))
+        var ffmpegav_libavutil_version = "???"
+        var ffmpegav_version = "???"
+        if (MainActivity.native_ffmpegav_lib_loaded_error == 0)
+        {
+            try
+            {
+                ffmpegav_libavutil_version = AVActivity.ffmpegav_libavutil_version()
+                ffmpegav_version = AVActivity.ffmpegav_version()
+            } catch (_: Exception)
+            {
+            }
+        }
+        else
+        {
+            ffmpegav_libavutil_version = "JNI lib not loaded"
+            ffmpegav_version = "JNI lib not loaded"
+        }
+        add(Entry(i18n("about.ffmpegav_libavutil_version"), ffmpegav_libavutil_version))
+        add(Entry(i18n("about.ffmpegav_version"), ffmpegav_version))
+        var jninotifications_version = "???"
+
+        if (MainActivity.native_notification_lib_loaded_error == 0)
+        {
+            try
+            {
+                jninotifications_version = NTFYActivity.jninotifications_version()
+            } catch (_: Exception)
+            {
+            }
+        }
+        else
+        {
+            jninotifications_version = "JNI lib not loaded"
+        }
+        add(Entry(i18n("about.jninotifications_version"), jninotifications_version))
+
         // add(Entry(i18n("about.contact"), Strings.EMAIL, true))
     }