Refactor a few C layer reflection access

Author: SessionHero01

library/src/main/cpp/attachments.cpp

@@ -1,6 +1,7 @@
 #include <jni.h>
 #include <session/attachments.hpp>
 #include "jni_utils.h"
+#include "util.h"
 
 using namespace session::attachment;
 using namespace jni_utils;
@@ -49,7 +50,7 @@ Java_network_loki_messenger_libsession_1util_encrypt_Attachments_encryptBytes(JN
         );
 
 
-        return util::bytes_from_span(env, std::span(reinterpret_cast<unsigned char *>(key.data()), key.size()));
+        return util::bytes_from_span(env, std::span(reinterpret_cast<unsigned char *>(key.data()), key.size())).leak();
     });
 }
 

library/src/main/cpp/blinded_key.cpp

@@ -17,7 +17,7 @@ Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blindVersionKeyPai
                                                                                   jbyteArray ed25519_secret_key) {
     return jni_utils::run_catching_cxx_exception_or_throws<jobject>(env, [=] {
         const auto [pk, sk] = session::blind_version_key_pair(util::vector_from_bytes(env, ed25519_secret_key));
-        return jni_utils::new_key_pair(env, util::bytes_from_span(env, pk), util::bytes_from_span(env, sk));
+        return jni_utils::new_key_pair(env, util::bytes_from_span(env, pk).get(), util::bytes_from_span(env, sk).get());
     });
 }
 extern "C"
@@ -32,7 +32,7 @@ Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blindVersionSign(J
                 session::Platform::android,
                 timestamp
         );
-        return util::bytes_from_vector(env, bytes);
+        return util::bytes_from_vector(env, bytes).leak();
     });
 }
 
@@ -53,7 +53,7 @@ Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blindVersionSignRe
                 jni_utils::JavaStringRef(env, path).view(),
                 body ? std::make_optional(jni_utils::JavaByteArrayRef(env, body).get()) : std::nullopt
         );
-        return util::bytes_from_vector(env, bytes);
+        return util::bytes_from_vector(env, bytes).leak();
     });
 }
 
@@ -68,7 +68,7 @@ Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blind15KeyPair(JNI
                 jni_utils::JavaByteArrayRef(env, ed25519_secret_key).get(),
                 jni_utils::JavaByteArrayRef(env, server_pub_key).get()
                 );
-        return jni_utils::new_key_pair(env, util::bytes_from_span(env, pk), util::bytes_from_span(env, sk));
+        return jni_utils::new_key_pair(env, util::bytes_from_span(env, pk).get(), util::bytes_from_span(env, sk).get());
     });
 }
 
@@ -84,7 +84,7 @@ Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blind15Sign(JNIEnv
                 jni_utils::JavaStringRef(env, server_pub_key).view(),
                 jni_utils::JavaByteArrayRef(env, message).get()
                 );
-        return util::bytes_from_vector(env, data);
+        return util::bytes_from_vector(env, data).leak();
     });
 }
 
@@ -128,9 +128,9 @@ Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blind25Id(JNIEnv *
                                                                         jstring session_id,
                                                                         jstring server_pub_key) {
     return jni_utils::run_catching_cxx_exception_or_throws<jstring>(env, [=]() -> jstring {
-        return util::jstringFromOptional(env, session::blind25_id(
+        return jni_utils::jstring_from_optional(env, session::blind25_id(
                 jni_utils::JavaStringRef(env, session_id).view(),
                 jni_utils::JavaStringRef(env, server_pub_key).view()
-        ));
+        )).leak();
     });
 }

library/src/main/cpp/config_base.cpp

@@ -2,6 +2,20 @@
 #include "util.h"
 #include "jni_utils.h"
 
+
+std::pair<std::string, std::vector<unsigned char>> extractHashAndData(JNIEnv *env, jobject kotlin_pair) {
+    jni_utils::JavaLocalRef<jclass> pair(env, env->GetObjectClass(kotlin_pair));
+    jfieldID first = env->GetFieldID(pair.get(), "first", "Ljava/lang/Object;");
+    jfieldID second = env->GetFieldID(pair.get(), "second", "Ljava/lang/Object;");
+    auto hash_as_jstring = jni_utils::JavaLocalRef(env, reinterpret_cast<jstring>(env->GetObjectField(kotlin_pair, first)));
+    auto data_as_jbytes = jni_utils::JavaLocalRef(env, reinterpret_cast<jbyteArray>(env->GetObjectField(kotlin_pair, second)));
+
+    return std::make_pair(
+            std::string(jni_utils::JavaStringRef(env, hash_as_jstring.get()).view()),
+            jni_utils::JavaByteArrayRef(env, data_as_jbytes.get()).copy()
+    );
+}
+
 extern "C" {
 JNIEXPORT jboolean JNICALL
 Java_network_loki_messenger_libsession_1util_ConfigBase_dirty(JNIEnv *env, jobject thiz) {
@@ -49,8 +63,7 @@ JNIEXPORT jbyteArray JNICALL
 Java_network_loki_messenger_libsession_1util_ConfigBase_dump(JNIEnv *env, jobject thiz) {
     auto config = ptrToConfigBase(env, thiz);
     auto dumped = config->dump();
-    jbyteArray bytes = util::bytes_from_vector(env, dumped);
-    return bytes;
+    return util::bytes_from_vector(env, dumped).leak();
 }
 
 JNIEXPORT jstring JNICALL

library/src/main/cpp/config_base.h

@@ -14,18 +14,6 @@ inline session::config::ConfigBase* ptrToConfigBase(JNIEnv *env, jobject obj) {
     return (session::config::ConfigBase*) env->GetLongField(obj, pointerField);
 }
 
-inline std::pair<std::string, std::vector<unsigned char>> extractHashAndData(JNIEnv *env, jobject kotlin_pair) {
-    auto pair = jni_utils::JavaLocalRef(env, env->FindClass("kotlin/Pair"));
-    jfieldID first = env->GetFieldID(pair.get(), "first", "Ljava/lang/Object;");
-    jfieldID second = env->GetFieldID(pair.get(), "second", "Ljava/lang/Object;");
-    auto hash_as_jstring = jni_utils::JavaLocalRef(env, reinterpret_cast<jstring>(env->GetObjectField(kotlin_pair, first)));
-    auto data_as_jbytes = jni_utils::JavaLocalRef(env, reinterpret_cast<jbyteArray>(env->GetObjectField(kotlin_pair, second)));
-
-    return std::make_pair(
-            std::string(jni_utils::JavaStringRef(env, hash_as_jstring.get()).view()),
-            jni_utils::JavaByteArrayRef(env, data_as_jbytes.get()).copy()
-        );
-}
 
 inline session::config::ConfigSig* ptrToConfigSig(JNIEnv* env, jobject obj) {
     auto sigClass = jni_utils::JavaLocalRef(env, env->FindClass("network/loki/messenger/libsession_util/ConfigSig"));