Fixed up the build errors

Author: mpretty-cyro

library/src/main/cpp/blinded_key.cpp

@@ -1,5 +1,6 @@
 #include <jni.h>
 #include <session/blinding.hpp>
+#include <session/util.hpp>
 
 #include "util.h"
 #include "jni_utils.h"
@@ -45,13 +46,15 @@ Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blindVersionSignRe
     return jni_utils::run_catching_cxx_exception_or_throws<jbyteArray>(env, [=] {
         auto methodC = util::string_from_jstring(env, method);
         auto pathC = util::string_from_jstring(env, path);
+        auto keyBytes = util::vector_from_bytes(env, ed25519_secret_key);
+        auto bodyBytes = body ? std::optional(util::vector_from_bytes(env, body)) : std::nullopt;
 
         auto bytes = session::blind_version_sign_request(
-                util::span_from_bytes(env, ed25519_secret_key),
+                session::to_span(keyBytes),
                 timestamp,
                 methodC,
                 pathC,
-                body ? std::optional(util::span_from_bytes(env, body)) : std::nullopt
+                body ? std::optional(session::to_span(*bodyBytes)) : std::nullopt
         );
         return util::bytes_from_vector(env, bytes);
     });

library/src/main/cpp/group_keys.cpp

@@ -146,7 +146,7 @@ Java_network_loki_messenger_libsession_1util_GroupKeysConfig_rekey(JNIEnv *env,
     auto info = reinterpret_cast<session::config::groups::Info*>(info_ptr);
     auto members = reinterpret_cast<session::config::groups::Members*>(members_ptr);
     auto rekey = keys->rekey(*info, *members);
-    auto rekey_bytes = util::bytes_from_span(env, rekey.data());
+    auto rekey_bytes = util::bytes_from_span(env, rekey);
     return rekey_bytes;
 }
 

library/src/main/cpp/util.cpp

@@ -243,8 +243,8 @@ Java_network_loki_messenger_libsession_1util_util_Sodium_encryptForMultipleSimpl
         recipient_vec.emplace_back(recipient);
     }
 
-    std::vector<session::ustring_view> message_sv_vec{};
-    std::vector<session::ustring_view> recipient_sv_vec{};
+    std::vector<std::span<const unsigned char>> message_sv_vec{};
+    std::vector<std::span<const unsigned char>> recipient_sv_vec{};
     for (int i = 0; i < size; i++) {
         message_sv_vec.emplace_back(session::to_span(message_vec[i]));
         recipient_sv_vec.emplace_back(session::to_span(recipient_vec[i]));

library/src/main/cpp/util.h

@@ -16,7 +16,7 @@
 
 namespace util {
     extern std::mutex util_mutex_;
-    jbyteArray bytes_from_vector(JNIEnv* env, std::vector<unsigned char> from_str);
+    jbyteArray bytes_from_vector(JNIEnv* env, const std::vector<unsigned char> &from_str);
     std::vector<unsigned char> vector_from_bytes(JNIEnv* env, jbyteArray byteArray);
     jbyteArray bytes_from_span(JNIEnv* env, std::span<const unsigned char> from_str);
     std::string string_from_jstring(JNIEnv* env, jstring string);