Tidy up

Author: SessionHero01

library/src/main/cpp/config_base.cpp

@@ -16,6 +16,29 @@ std::pair<std::string, std::vector<unsigned char>> extractHashAndData(JNIEnv *en
     );
 }
 
+struct JavaConfigClassInfo : public jni_utils::JavaClassInfo {
+    jfieldID pointer_field;
+
+    JavaConfigClassInfo(JNIEnv *env, jobject obj)
+            :JavaClassInfo(env, obj),
+             pointer_field(env->GetFieldID(java_class, "pointer", "J")) {}
+
+    static const JavaConfigClassInfo& get(JNIEnv *env, jobject obj) {
+        static JavaConfigClassInfo class_info(env, obj);
+        return class_info;
+    }
+};
+
+session::config::ConfigBase* ptrToConfigBase(JNIEnv *env, jobject obj) {
+    return reinterpret_cast<session::config::ConfigBase*>(
+            env->GetLongField(obj, JavaConfigClassInfo::get(env, obj).pointer_field));
+}
+
+session::config::ConfigSig* ptrToConfigSig(JNIEnv* env, jobject obj) {
+    return reinterpret_cast<session::config::ConfigSig*>(
+            env->GetLongField(obj, JavaConfigClassInfo::get(env, obj).pointer_field));
+}
+
 extern "C" {
 JNIEXPORT jboolean JNICALL
 Java_network_loki_messenger_libsession_1util_ConfigBase_dirty(JNIEnv *env, jobject thiz) {
@@ -47,9 +70,14 @@ Java_network_loki_messenger_libsession_1util_ConfigBase_push(JNIEnv *env, jobjec
 
         jobject obsoleteHashes = jni_utils::jstring_list_from_collection(env, to_delete);
 
-        jclass returnObjectClass = env->FindClass("network/loki/messenger/libsession_util/util/ConfigPush");
-        jmethodID methodId = env->GetMethodID(returnObjectClass, "<init>", "(Ljava/util/List;JLjava/util/List;)V");
-        return env->NewObject(returnObjectClass, methodId, messages, static_cast<jlong>(seq_no), obsoleteHashes);
+        static jni_utils::BasicJavaClassInfo class_info(
+            env,
+            "network/loki/messenger/libsession_util/util/ConfigPush",
+            "(Ljava/util/List;JLjava/util/List;)V"
+        );
+
+        return env->NewObject(class_info.java_class, class_info.constructor,
+                              messages, static_cast<jlong>(seq_no), obsoleteHashes);
     });
 }
 

library/src/main/cpp/config_base.h

@@ -1,24 +1,11 @@
 #ifndef SESSION_ANDROID_CONFIG_BASE_H
 #define SESSION_ANDROID_CONFIG_BASE_H
 
-#include "session/config/base.hpp"
-#include "util.h"
-#include "jni_utils.h"
-#include <jni.h>
-#include <string>
-#include <vector>
-
-inline session::config::ConfigBase* ptrToConfigBase(JNIEnv *env, jobject obj) {
-    auto baseClass = jni_utils::JavaLocalRef(env, env->FindClass("network/loki/messenger/libsession_util/ConfigBase"));
-    jfieldID pointerField = env->GetFieldID(baseClass.get(), "pointer", "J");
-    return (session::config::ConfigBase*) env->GetLongField(obj, pointerField);
-}
+#include <session/config/base.hpp>
 
+#include <jni.h>
 
-inline session::config::ConfigSig* ptrToConfigSig(JNIEnv* env, jobject obj) {
-    auto sigClass = jni_utils::JavaLocalRef(env, env->FindClass("network/loki/messenger/libsession_util/ConfigSig"));
-    jfieldID pointerField = env->GetFieldID(sigClass.get(), "pointer", "J");
-    return (session::config::ConfigSig*) env->GetLongField(obj, pointerField);
-}
+session::config::ConfigBase* ptrToConfigBase(JNIEnv *env, jobject obj);
+session::config::ConfigSig* ptrToConfigSig(JNIEnv* env, jobject obj);
 
 #endif

library/src/main/cpp/conversation.cpp

@@ -1,10 +1,16 @@
 #include <jni.h>
-#include "conversation.h"
+#include <session/config/convo_info_volatile.hpp>
+
 #include "jni_utils.h"
+#include "util.h"
 #include "user_groups.h"
+#include "config_base.h"
 
 using namespace jni_utils;
 
+static auto ptrToConvoInfo(JNIEnv *env, jobject obj) {
+    return dynamic_cast<session::config::ConvoInfoVolatile *>(ptrToConfigBase(env, obj));
+}
 
 JavaLocalRef<jobject> serialize_pro_proof_info(JNIEnv *env,
                                  std::optional<std::span<const unsigned char>> gen_index_hash,

library/src/main/cpp/conversation.h

@@ -1,6 +1,14 @@
+#include <session/config/groups/info.hpp>
 #include <jni.h>
-#include "group_info.h"
-#include "session/config/groups/info.hpp"
+
+#include "util.h"
+#include "jni_utils.h"
+#include "config_base.h"
+
+inline auto ptrToInfo(JNIEnv* env, jobject obj) {
+    return dynamic_cast<session::config::groups::Info*>(ptrToConfigBase(env, obj));
+}
+
 
 extern "C"
 JNIEXPORT jlong JNICALL

library/src/main/cpp/group_info.cpp

@@ -1,8 +1,13 @@
-#include "group_keys.h"
-#include "group_info.h"
-#include "group_members.h"
+#include <session/config/groups/keys.hpp>
 
+#include "group_members.h"
 #include "jni_utils.h"
+#include "util.h"
+#include "config_base.h"
+
+inline auto ptrToKeys(JNIEnv* env, jobject obj) {
+    return dynamic_cast<session::config::groups::Keys*>(ptrToConfigSig(env, obj));
+}
 
 extern "C"
 JNIEXPORT jint JNICALL

library/src/main/cpp/group_info.h

@@ -1,9 +1,19 @@
 #include "group_members.h"
-
 #include "jni_utils.h"
+#include "util.h"
+#include "config_base.h"
 
 using namespace jni_utils;
 
+inline session::config::groups::Members* ptrToMembers(JNIEnv* env, jobject obj) {
+    return dynamic_cast<session::config::groups::Members *>(ptrToConfigBase(env, obj));
+}
+
+inline session::config::groups::member *ptrToMember(JNIEnv *env, jobject thiz) {
+    auto ptrField = env->GetFieldID(jni_utils::JavaLocalRef(env, env->GetObjectClass(thiz)).get(), "nativePtr", "J");
+    return reinterpret_cast<session::config::groups::member*>(env->GetLongField(thiz, ptrField));
+}
+
 extern "C"
 JNIEXPORT jlong JNICALL
 Java_network_loki_messenger_libsession_1util_GroupMembersConfig_00024Companion_newInstance(

library/src/main/cpp/group_keys.cpp

@@ -1,18 +1,10 @@
 #ifndef SESSION_ANDROID_GROUP_MEMBERS_H
 #define SESSION_ANDROID_GROUP_MEMBERS_H
 
-#include "util.h"
 #include "jni_utils.h"
 
-inline session::config::groups::Members* ptrToMembers(JNIEnv* env, jobject obj) {
-    jfieldID pointerField = env->GetFieldID(jni_utils::JavaLocalRef(env, env->GetObjectClass(obj)).get(), "pointer", "J");
-    return (session::config::groups::Members*) env->GetLongField(obj, pointerField);
-}
+#include <session/config/groups/members.hpp>
 
-inline session::config::groups::member *ptrToMember(JNIEnv *env, jobject thiz) {
-    auto ptrField = env->GetFieldID(jni_utils::JavaLocalRef(env, env->GetObjectClass(thiz)).get(), "nativePtr", "J");
-    return reinterpret_cast<session::config::groups::member*>(env->GetLongField(thiz, ptrField));
-}
 
 jni_utils::JavaLocalRef<jobject> serialize_group_member(JNIEnv* env, const session::config::groups::member& member);