From 36b091c64025cdf6d60c6e1dc9e707d12b3fee38 Mon Sep 17 00:00:00 2001
From: 0x330a <92654767+0x330a@users.noreply.github.com>
Date: Wed, 7 Dec 2022 09:06:08 +1100
Subject: [PATCH] feat: trying to get tests and sodium object working with new
 changes

---
 libsession-util/libsession-util                           | 2 +-
 .../loki/messenger/libsession_util/InstrumentedTests.kt   | 8 ++++++--
 .../network/loki/messenger/libsession_util/util/Sodium.kt | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libsession-util/libsession-util b/libsession-util/libsession-util
index fa7e0d0acf..57f6bbd91b 160000
--- a/libsession-util/libsession-util
+++ b/libsession-util/libsession-util
@@ -1 +1 @@
-Subproject commit fa7e0d0acf9c343f0d7f0a23e5852077c2cf288f
+Subproject commit 57f6bbd91bb4b1f2d115b75e8beb850153bb6767
diff --git a/libsession-util/src/androidTest/java/network/loki/messenger/libsession_util/InstrumentedTests.kt b/libsession-util/src/androidTest/java/network/loki/messenger/libsession_util/InstrumentedTests.kt
index 294efd1574..667e76425a 100644
--- a/libsession-util/src/androidTest/java/network/loki/messenger/libsession_util/InstrumentedTests.kt
+++ b/libsession-util/src/androidTest/java/network/loki/messenger/libsession_util/InstrumentedTests.kt
@@ -3,6 +3,7 @@ package network.loki.messenger.libsession_util
 import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import network.loki.messenger.libsession_util.util.KeyPair
 import network.loki.messenger.libsession_util.util.Sodium
 import network.loki.messenger.libsession_util.util.UserPic
 import org.junit.Assert.*
@@ -18,8 +19,11 @@ import org.session.libsignal.utilities.Hex
 @RunWith(AndroidJUnit4::class)
 class InstrumentedTests {
 
-    val seed = Hex.fromStringCondensed("0123456789abcdef0123456789abcdef00000000000000000000000000000000")
-    val keyPair = Sodium.ed25519KeyPair(seed)
+    private val keyPair: KeyPair
+    get() {
+        val seed = Hex.fromStringCondensed("0123456789abcdef0123456789abcdef00000000000000000000000000000000")
+        return Sodium.ed25519KeyPair(seed)
+    }
 
     @Test
     fun useAppContext() {
diff --git a/libsession-util/src/main/java/network/loki/messenger/libsession_util/util/Sodium.kt b/libsession-util/src/main/java/network/loki/messenger/libsession_util/util/Sodium.kt
index c5df22a9ce..131c8c7084 100644
--- a/libsession-util/src/main/java/network/loki/messenger/libsession_util/util/Sodium.kt
+++ b/libsession-util/src/main/java/network/loki/messenger/libsession_util/util/Sodium.kt
@@ -1,5 +1,8 @@
 package network.loki.messenger.libsession_util.util
 
 object Sodium {
+    init {
+        System.loadLibrary("session_util")
+    }
     external fun ed25519KeyPair(seed: ByteArray): KeyPair
 }
\ No newline at end of file