Tidy up

Author: SessionHero01

library/src/main/cpp/pro_proof_util.cpp

@@ -51,20 +51,20 @@ session::ProProof java_to_cpp_proof(JNIEnv *env, jobject proof) {
     };
 }
 
-jobject cpp_to_java_proof(JNIEnv *env, const session::ProProof &proof) {
+JavaLocalRef<jobject> cpp_to_java_proof(JNIEnv *env, const session::ProProof &proof) {
     static BasicJavaClassInfo class_info(env,
             "network/loki/messenger/libsession_util/pro/ProProof",
             "(I[B[BJ[B)V");
 
-    return env->NewObject(
+    return {env, env->NewObject(
             class_info.java_class,
             class_info.constructor,
             static_cast<jint>(proof.version),
             util::bytes_from_span(env, proof.gen_index_hash).get(),
             util::bytes_from_span(env, proof.rotating_pubkey).get(),
             static_cast<jlong>(proof.expiry_unix_ts.time_since_epoch().count()),
             util::bytes_from_span(env, proof.sig).get()
-    );
+    )};
 }
 
 extern "C"

library/src/main/cpp/pro_proof_util.h

@@ -3,5 +3,7 @@
 #include <session/session_protocol.hpp>
 #include <jni.h>
 
+#include "jni_utils.h"
+
 session::ProProof java_to_cpp_proof(JNIEnv *, jobject proof);
-jobject cpp_to_java_proof(JNIEnv *, const session::ProProof &proof);
+jni_utils::JavaLocalRef<jobject> cpp_to_java_proof(JNIEnv *, const session::ProProof &proof);

library/src/main/cpp/protocol.cpp

@@ -43,7 +43,7 @@ static JavaLocalRef<jobject> serializeDecodedEnvelope(JNIEnv *env, const session
                           serializeEnvelop(env, envelop.envelope).get(),
                           envelop.pro ? static_cast<jint>(envelop.pro->status)
                                        : static_cast<jint>(-1),
-                          envelop.pro ? JavaLocalRef(env, cpp_to_java_proof(env, envelop.pro->proof)).get() : nullptr,
+                          envelop.pro ? cpp_to_java_proof(env, envelop.pro->proof).get() : nullptr,
                           static_cast<jlong>(envelop.pro ? envelop.pro->features : 0),
                           content.get(),
                           sender_ed25519.get(),
@@ -157,7 +157,7 @@ Java_network_loki_messenger_libsession_1util_protocol_SessionProtocol_decodeForC
                 init,
                 decoded.pro ? static_cast<jint>(decoded.pro->status)
                              : static_cast<jint>(-1),
-                decoded.pro ? JavaLocalRef(env, cpp_to_java_proof(env, decoded.pro->proof)).get() : nullptr,
+                decoded.pro ? cpp_to_java_proof(env, decoded.pro->proof).get() : nullptr,
                 static_cast<jlong>(decoded.pro ? decoded.pro->features : 0),
                 util::bytes_from_vector(env, decoded.content_plaintext).get()
         );

library/src/main/cpp/user_profile.cpp

@@ -203,7 +203,7 @@ Java_network_loki_messenger_libsession_1util_UserProfile_getProConfig(JNIEnv *en
 
     return env->NewObject(class_info.java_class,
                           class_info.constructor,
-                          cpp_to_java_proof(env, profile->proof),
+                          cpp_to_java_proof(env, profile->proof).get(),
                           util::bytes_from_span(env, profile->rotating_privkey).get()
     );
 }