Update to latest changes

Author: SessionHero01

library/src/main/cpp/protocol.cpp

@@ -8,7 +8,7 @@ using namespace jni_utils;
 
 
 
-static JavaLocalRef<jobject> serializeProStatus(JNIEnv *env, const session::DecryptedEnvelope & envelope) {
+static JavaLocalRef<jobject> serializeProStatus(JNIEnv *env, const session::DecodedEnvelope & envelope) {
     if (!envelope.pro.has_value()) {
         JavaLocalRef noneClass(env, env->FindClass("network/loki/messenger/libsession_util/protocol/ProStatus$None"));
         auto fieldId = env->GetStaticFieldID(
@@ -41,7 +41,7 @@ Java_network_loki_messenger_libsession_1util_protocol_SessionProtocol_decryptEnv
                                                                                       jlong now_epoch_seconds,
                                                                                       jbyteArray java_pro_backend_pub_key) {
 
-    session::DecryptEnvelopeKey key;
+    session::DecodeEnvelopeKey key;
 
     std::vector<std::span<const unsigned char>> privateKeysStorage;
 
@@ -92,7 +92,7 @@ Java_network_loki_messenger_libsession_1util_protocol_SessionProtocol_decryptEnv
     key.ed25519_privkeys = { privateKeysStorage.data(), privateKeysStorage.size() };
 
     return run_catching_cxx_exception_or_throws<jobject>(env, [&] {
-        auto envelop = session::decrypt_envelope(key, JavaByteArrayRef(env, java_payload).get(),
+        auto envelop = session::decode_envelope(key, JavaByteArrayRef(env, java_payload).get(),
                                                  std::chrono::sys_seconds { std::chrono::seconds { now_epoch_seconds } },
                                                  *java_to_cpp_array<32>(env, java_pro_backend_pub_key));
 
@@ -125,16 +125,16 @@ Java_network_loki_messenger_libsession_1util_protocol_SessionProtocol_encryptFor
                                                                                     jbyteArray my_ed25519_priv_key,
                                                                                     jlong timestamp_ms,
                                                                                     jbyteArray recipient_pub_key,
-                                                                                    jbyteArray pro_signature) {
+                                                                                    jbyteArray rotating_key) {
     return run_catching_cxx_exception_or_throws<jbyteArray>(env, [=] {
         return util::bytes_from_vector(
                 env,
-                session::encrypt_for_1o1(
+                session::encode_for_1o1(
                         JavaByteArrayRef(env, plaintext).get(),
                         JavaByteArrayRef(env, my_ed25519_priv_key).get(),
                         std::chrono::milliseconds { timestamp_ms },
                         *java_to_cpp_array<33>(env, recipient_pub_key),
-                        java_to_cpp_array<64>(env, pro_signature)
+                        rotating_key ? JavaByteArrayRef(env, rotating_key).get() : std::span<uint8_t>()
         ));
     });
 }
@@ -144,17 +144,17 @@ JNIEXPORT jbyteArray JNICALL
 Java_network_loki_messenger_libsession_1util_protocol_SessionProtocol_encryptForCommunityInbox(
         JNIEnv *env, jobject thiz, jbyteArray plaintext, jbyteArray my_ed25519_priv_key,
         jlong timestamp_ms, jbyteArray recipient_pub_key, jbyteArray community_server_pub_key,
-        jbyteArray pro_signature) {
+        jbyteArray rotating_key) {
     return run_catching_cxx_exception_or_throws<jbyteArray>(env, [=] {
         return util::bytes_from_vector(
                 env,
-                session::encrypt_for_community_inbox(
+                session::encode_for_community_inbox(
                         JavaByteArrayRef(env, plaintext).get(),
                         JavaByteArrayRef(env, my_ed25519_priv_key).get(),
                         std::chrono::milliseconds { timestamp_ms },
                         *java_to_cpp_array<33>(env, recipient_pub_key),
                         *java_to_cpp_array<32>(env, community_server_pub_key),
-                        java_to_cpp_array<64>(env, pro_signature)
+                        rotating_key ? JavaByteArrayRef(env, rotating_key).get() : std::span<uint8_t>()
                 ));
     });
 }
@@ -168,7 +168,7 @@ Java_network_loki_messenger_libsession_1util_protocol_SessionProtocol_encryptFor
                                                                                       jlong timestamp_ms,
                                                                                       jbyteArray group_ed25519_public_key,
                                                                                       jbyteArray group_ed25519_private_key,
-                                                                                      jbyteArray pro_signature) {
+                                                                                      jbyteArray rotating_key) {
     return run_catching_cxx_exception_or_throws<jbyteArray>(env, [=] {
         session::cleared_uc32 group_private_key;
 
@@ -177,13 +177,13 @@ Java_network_loki_messenger_libsession_1util_protocol_SessionProtocol_encryptFor
 
         return util::bytes_from_vector(
                 env,
-                session::encrypt_for_group(
+                session::encode_for_group(
                         JavaByteArrayRef(env, plaintext).get(),
                         JavaByteArrayRef(env, my_ed25519_priv_key).get(),
                         std::chrono::milliseconds { timestamp_ms },
                         *java_to_cpp_array<33>(env, group_ed25519_public_key),
                         group_private_key,
-                        java_to_cpp_array<64>(env, pro_signature)
+                        rotating_key ? JavaByteArrayRef(env, rotating_key).get() : std::span<uint8_t>()
                 ));
     });
 }

library/src/main/java/network/loki/messenger/libsession_util/protocol/SessionProtocol.kt

@@ -8,7 +8,7 @@ object SessionProtocol : LibSessionUtilCApi() {
         myEd25519PrivKey: ByteArray,
         timestampMs: Long,
         recipientPubKey: ByteArray, // 33 bytes prefixed key
-        proSignature: ByteArray?, // 64 bytes
+        proRotatingEd25519PrivKey: ByteArray?, // 64 bytes
     ): ByteArray
 
     external fun encryptForCommunityInbox(
@@ -17,7 +17,7 @@ object SessionProtocol : LibSessionUtilCApi() {
         timestampMs: Long,
         recipientPubKey: ByteArray, // 33 bytes prefixed key
         communityServerPubKey: ByteArray, // 32 bytes key
-        proSignature: ByteArray?, // 64 bytes
+        proRotatingEd25519PrivKey: ByteArray?, // 64 bytes
     ): ByteArray
 
     external fun encryptForGroup(
@@ -26,7 +26,7 @@ object SessionProtocol : LibSessionUtilCApi() {
         timestampMs: Long,
         groupEd25519PublicKey: ByteArray, // 33 bytes 03 prefixed key
         groupEd25519PrivateKey: ByteArray, // 32 bytes group "encryption" key
-        proSignature: ByteArray?, // 64 bytes
+        proRotatingEd25519PrivKey: ByteArray?, // 64 bytes
     ): ByteArray
 
     external fun decryptEnvelope(