Tidy up

Author: SessionHero01

library/src/main/java/network/loki/messenger/libsession_util/Config.kt

@@ -10,7 +10,7 @@ import network.loki.messenger.libsession_util.util.GroupMember
 import network.loki.messenger.libsession_util.util.UserPic
 import java.io.Closeable
 
-sealed class Config(initialPointer: Long): Closeable {
+sealed class Config(initialPointer: Long): Closeable, LibSessionUtilCApi() {
     var pointer = initialPointer
         private set
 

library/src/main/java/network/loki/messenger/libsession_util/Curve25519.kt

@@ -2,7 +2,7 @@ package network.loki.messenger.libsession_util
 
 import network.loki.messenger.libsession_util.util.KeyPair
 
-object Curve25519 {
+object Curve25519 : LibSessionUtilCApi() {
     private external fun fromED25519(
         ed25519PublicKey: ByteArray,
         ed25519PrivateKey: ByteArray,

library/src/main/java/network/loki/messenger/libsession_util/ED25519.kt

@@ -2,7 +2,7 @@ package network.loki.messenger.libsession_util
 
 import network.loki.messenger.libsession_util.util.KeyPair
 
-object ED25519 {
+object ED25519 : LibSessionUtilCApi() {
     /**
      * Sign a message using the ed25519 private key
      *

library/src/main/java/network/loki/messenger/libsession_util/Hash.kt

@@ -1,6 +1,6 @@
 package network.loki.messenger.libsession_util
 
-object Hash {
+object Hash : LibSessionUtilCApi() {
     private external fun hash(message: ByteArray, hashOut: ByteArray, key: ByteArray?)
 
     fun hash64(message: ByteArray, key: ByteArray? = null): ByteArray {

library/src/main/java/network/loki/messenger/libsession_util/LibSessionUtilCApi.kt

@@ -0,0 +1,12 @@
+package network.loki.messenger.libsession_util
+
+/**
+ * Base class for all objects that need access to the native library.
+ *
+ * This is needed so that the native library can be loaded as soon as any object is accessed.
+ */
+abstract class LibSessionUtilCApi {
+    init {
+        System.loadLibrary("session_util")
+    }
+}

library/src/main/java/network/loki/messenger/libsession_util/Namespace.kt

@@ -1,6 +1,6 @@
 package network.loki.messenger.libsession_util
 
-object Namespace {
+object Namespace : LibSessionUtilCApi() {
     fun ALL() = "all"
 
     // Namespaces used for legacy group

library/src/main/java/network/loki/messenger/libsession_util/SessionEncrypt.kt

@@ -4,7 +4,7 @@ import network.loki.messenger.libsession_util.util.Bytes
 
 private typealias SessionId = String
 
-object SessionEncrypt {
+object SessionEncrypt : LibSessionUtilCApi() {
     /**
      * Decrypts data using the Session protocol for a blinded recipient.
      *

library/src/main/java/network/loki/messenger/libsession_util/util/BlindKeyAPI.kt

@@ -1,15 +1,8 @@
 package network.loki.messenger.libsession_util.util
 
-object BlindKeyAPI {
-    private val loadLibrary by lazy {
-        System.loadLibrary("session_util")
-    }
-
-    init {
-        // Ensure the library is loaded at initialization
-        loadLibrary
-    }
+import network.loki.messenger.libsession_util.LibSessionUtilCApi
 
+object BlindKeyAPI : LibSessionUtilCApi() {
     external fun blindVersionKeyPair(ed25519SecretKey: ByteArray): KeyPair
     external fun blindVersionSign(ed25519SecretKey: ByteArray, timestamp: Long): ByteArray
     external fun blindVersionSignRequest(

library/src/main/java/network/loki/messenger/libsession_util/util/Sodium.kt

@@ -1,13 +1,12 @@
 package network.loki.messenger.libsession_util.util
 
+import network.loki.messenger.libsession_util.LibSessionUtilCApi
 
-object Sodium {
+
+object Sodium : LibSessionUtilCApi() {
 
     const val KICKED_DOMAIN = "SessionGroupKickedMessage"
 
-    init {
-        System.loadLibrary("session_util")
-    }
     external fun ed25519KeyPair(seed: ByteArray): KeyPair
     external fun ed25519PkToCurve25519(pk: ByteArray): ByteArray