Add session protocol binding

Author: SessionHero01

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-agp = "8.12.0"
-kotlin = "2.2.0"
+agp = "8.12.1"
+kotlin = "2.2.10"
 
 [libraries]
 junit = { module = "junit:junit", version = "4.13.2" }

library/build.gradle.kts

@@ -12,7 +12,7 @@ android {
     compileSdk = 35
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

library/src/main/cpp/CMakeLists.txt

@@ -44,6 +44,7 @@ set(SOURCES
         ed25519.cpp
         curve25519.cpp
         hash.cpp
+        protocol.cpp
 )
 
 add_library( # Sets the name of the library.

library/src/main/cpp/group_keys.cpp

@@ -187,6 +187,13 @@ Java_network_loki_messenger_libsession_1util_GroupKeysConfig_keys(JNIEnv *env, j
     return jni_utils::jlist_from_collection(env, ptr->group_keys(), util::bytes_from_span);
 }
 
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_network_loki_messenger_libsession_1util_GroupKeysConfig_groupEncKey(JNIEnv *env, jobject thiz) {
+    auto ptr = ptrToKeys(env, thiz);
+    return util::bytes_from_span(env, ptr->group_enc_key());
+}
+
 extern "C"
 JNIEXPORT jobject JNICALL
 Java_network_loki_messenger_libsession_1util_GroupKeysConfig_activeHashes(JNIEnv *env,

library/src/main/cpp/jni_utils.h

@@ -69,6 +69,11 @@ namespace jni_utils {
                 env_->DeleteLocalRef(ref_);
             }
         }
+        JavaLocalRef(JavaLocalRef&& other) : env_(other.env_), ref_(other.ref_) {
+            other.ref_ = nullptr;
+        }
+
+        JavaLocalRef(const JavaLocalRef&) = delete;
 
         inline JNIType get() const {
             return ref_;
@@ -162,6 +167,8 @@ namespace jni_utils {
                 data = std::span<char>(const_cast<char *>(c_str), env->GetStringUTFLength(s));
             }
 
+            JavaStringRef(const JavaStringRef &) = delete;
+
             ~JavaStringRef() {
                 env->ReleaseStringUTFChars(s, data.data());
             }
@@ -195,8 +202,18 @@ namespace jni_utils {
                 data = std::span<unsigned char>(reinterpret_cast<unsigned char *>(env->GetByteArrayElements(byte_array, nullptr)), length);
             }
 
+            JavaByteArrayRef(const JavaByteArrayRef &) = delete;
+
+            JavaByteArrayRef(JavaByteArrayRef&& other) : env(other.env), byte_array(other.byte_array), data(other.data) {
+                other.byte_array = nullptr;
+                other.data = {};
+            }
+
             ~JavaByteArrayRef() {
-                env->ReleaseByteArrayElements(byte_array, reinterpret_cast<jbyte *>(data.data()), 0);
+                if (byte_array) {
+                    env->ReleaseByteArrayElements(byte_array,
+                                                  reinterpret_cast<jbyte *>(data.data()), 0);
+                }
             }
 
             // Get the data as a span. Only valid during the lifetime of this object.