[FEAT]: Upgrade to devel version

jni-wrappers/privmx-endpoint/CMakeLists.txt

@@ -30,7 +30,6 @@ add_library(${CMAKE_PROJECT_NAME} SHARED
         ${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/modules/Utils.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/modules/KvdbApi.cpp
         src/cpp/modules/WebRTCInterfaceJNI.cpp
-        #src/cpp/modules/StreamSettingsJNI.cpp
         src/cpp/modules/StreamApiLow.cpp
 )
 target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/includes)

jni-wrappers/privmx-endpoint/includes/privmx/endpoint/wrapper/parsers/model_native_initializers.h

@@ -303,7 +303,6 @@ namespace privmx {
                 JniContextUtils &ctx,
                 privmx::endpoint::stream::StreamsUpdatedData data
         );
-
     } // wrapper
 } // privmx
 

jni-wrappers/privmx-endpoint/includes/privmx/endpoint/wrapper/parsers/parser.h

@@ -45,6 +45,7 @@ privmx::endpoint::stream::StreamSubscription parseStreamSubscription(JniContextU
 
 privmx::endpoint::stream::SdpWithTypeModel parseSdpWithTypeModel(JniContextUtils &ctx, jobject sdpWithTypeModel);
 
+privmx::endpoint::stream::StreamEncryptionMode parseStreamEncryptionMode(JniContextUtils &ctx, jobject streamEncryptionMode);
 
 jobject parseEvent(JniContextUtils &ctx, std::shared_ptr<privmx::endpoint::core::Event> event);
 

jni-wrappers/privmx-endpoint/src/cpp/modules/StreamApiLow.cpp

@@ -14,7 +14,6 @@
 
 using namespace privmx::endpoint::stream;
 using namespace privmx::endpoint;
-//using namespace privmx::wrapper;
 
 StreamApiLow *getStreamApi(JniContextUtils &ctx, jobject streamApiInstance) {
     jclass cls = ctx->GetObjectClass(streamApiInstance);
@@ -32,22 +31,26 @@ Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_init(
         JNIEnv *env,
         jobject thiz,
         jobject connection,
-        jobject eventApi
+        jobject eventApi,
+        jobject stream_encryption_mode
 ) {
     JniContextUtils ctx(env);
     jobject result;
 
     if (ctx.nullCheck(connection, "Connection") ||
-            ctx.nullCheck(eventApi, "EventApi")) {
+            ctx.nullCheck(eventApi, "EventApi") ||
+        ctx.nullCheck(stream_encryption_mode, "Stream Encryption Mode")
+            ) {
         return nullptr;
     }
 
-    ctx.callResultEndpointApi<jobject>(&result, [&ctx, &env, &connection, &eventApi] {
+    ctx.callResultEndpointApi<jobject>(&result, [&ctx, &env, &connection, &eventApi, &stream_encryption_mode] {
         auto connection_c = getConnection(env, connection);
         auto eventApi_c = getEventApi(env, eventApi);
         auto streamApiLow = stream::StreamApiLow::create(
                 *connection_c,
-                *eventApi_c
+                *eventApi_c,
+                parseStreamEncryptionMode(ctx, stream_encryption_mode)
         );
         auto streamApiLow_ptr = new stream::StreamApiLow();
         *streamApiLow_ptr = streamApiLow;
@@ -95,10 +98,10 @@ Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_createStream
 ) {
     JniContextUtils ctx(env);
     if (ctx.nullCheck(context_id, "Context ID") ||
-            ctx.nullCheck(users, "Users list") ||
-            ctx.nullCheck(managers, "Managers list") ||
-            ctx.nullCheck(public_meta, "Public meta") ||
-            ctx.nullCheck(private_meta, "Private meta")) {
+        ctx.nullCheck(users, "Users list") ||
+        ctx.nullCheck(managers, "Managers list") ||
+        ctx.nullCheck(public_meta, "Public meta") ||
+        ctx.nullCheck(private_meta, "Private meta")) {
         return nullptr;
     }
 
@@ -156,10 +159,10 @@ Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_updateStream
 ) {
     JniContextUtils ctx(env);
     if (ctx.nullCheck(stream_room_id, "Stream room ID") ||
-            ctx.nullCheck(users, "Users list") ||
-            ctx.nullCheck(managers, "Managers list") ||
-            ctx.nullCheck(public_meta, "Public meta") ||
-            ctx.nullCheck(private_meta, "Private meta")) {
+        ctx.nullCheck(users, "Users list") ||
+        ctx.nullCheck(managers, "Managers list") ||
+        ctx.nullCheck(public_meta, "Public meta") ||
+        ctx.nullCheck(private_meta, "Private meta")) {
         return;
     }
     ctx.callVoidEndpointApi(
@@ -214,7 +217,7 @@ Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_listStreamRo
 ) {
     JniContextUtils ctx(env);
     if (ctx.nullCheck(context_id, "Context ID") ||
-            ctx.nullCheck(sort_order, "Sort order")) {
+        ctx.nullCheck(sort_order, "Sort order")) {
         return nullptr;
     }
 
@@ -399,11 +402,10 @@ Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_joinStreamRo
         jobject thiz,
         jstring stream_room_id,
         jobject web_rtc
-        // todo - made changes in arguments
 ) {
     JniContextUtils ctx(env);
     if (ctx.nullCheck(stream_room_id, "Stream room ID") ||
-            ctx.nullCheck(web_rtc, "webRtc")) {
+        ctx.nullCheck(web_rtc, "webRtc")) {
         return;
     }
 
@@ -692,7 +694,7 @@ Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_unsubscribeF
 ) {
     JniContextUtils ctx(env);
     if (ctx.nullCheck(stream_room_id, "Stream Room ID") ||
-            ctx.nullCheck(subscriptions_to_remove, "Subscriptions to remove")) {
+        ctx.nullCheck(subscriptions_to_remove, "Subscriptions to remove")) {
         return;
     }
 
@@ -733,9 +735,9 @@ Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_modifyRemote
 ) {
     JniContextUtils ctx(env);
     if (ctx.nullCheck(stream_room_id, "Stream Room ID") ||
-            ctx.nullCheck(subscriptions_to_add, "Subscriptions to add") ||
-            ctx.nullCheck(subscriptions_to_add, "Subscriptions to remove") ||
-            ctx.nullCheck(options, "Options")) {
+        ctx.nullCheck(subscriptions_to_add, "Subscriptions to add") ||
+        ctx.nullCheck(subscriptions_to_add, "Subscriptions to remove") ||
+        ctx.nullCheck(options, "Options")) {
         return;
     }
 
@@ -764,7 +766,7 @@ Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_modifyRemote
                 }
                 for (int i = 0; i < subscriptions_to_remove_length; i++) {
                     jobject arrayElement = ctx->GetObjectArrayElement(subscriptions_to_remove_arr,
-                            i);
+                                                                      i);
                     if (ctx.nullCheck(arrayElement, "Subscriptions to remove array elements")) {
                         return;
                     }
@@ -795,8 +797,8 @@ Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_subscribeToR
 ) {
     JniContextUtils ctx(env);
     if (ctx.nullCheck(stream_room_id, "Stream Room ID") ||
-            ctx.nullCheck(subscriptions, "Subscriptions") ||
-            ctx.nullCheck(options, "Options")) {
+        ctx.nullCheck(subscriptions, "Subscriptions") ||
+        ctx.nullCheck(options, "Options")) {
         return;
     }
     ctx.callVoidEndpointApi([&ctx, &thiz, &stream_room_id, &subscriptions, &options]() {

jni-wrappers/privmx-endpoint/src/cpp/parsers/model_native_initializers.cpp

@@ -1617,6 +1617,7 @@ namespace privmx {
                     "Lcom/simplito/java/privmx_endpoint/model/ContainerPolicy;" // policy
                     "Ljava/lang/Long;"      // statusCode
                     "Ljava/lang/Long;"      // schemaVersion
+                    "Ljava/lang/Boolean;"   // closed
                     ")V"
             );
 
@@ -1647,7 +1648,8 @@ namespace privmx {
                     privateMeta,
                     privmx::wrapper::containerPolicy2Java(ctx, streamRoom_c.policy),
                     ctx.long2jLong(streamRoom_c.statusCode),
-                    ctx.long2jLong(streamRoom_c.schemaVersion)
+                    ctx.long2jLong(streamRoom_c.schemaVersion),
+                    ctx.bool2jBoolean(streamRoom_c.closed)
             );
         }
 

jni-wrappers/privmx-endpoint/src/cpp/parsers/parser.cpp

@@ -846,21 +846,21 @@ privmx::endpoint::stream::StreamSubscription parseStreamSubscription(JniContextU
     privmx::endpoint::stream::StreamSubscription result;
     jclass cls = ctx->GetObjectClass(streamSubscription);
     jfieldID streamIdFID = ctx->GetFieldID(
-            ctx->GetObjectClass(streamSubscription),
+            cls,
             "streamId",
-            "J"
+            "Ljava/lang/Long;"
     );
 
     jfieldID trackIdFID = ctx->GetFieldID(
-            ctx->GetObjectClass(streamSubscription),
+            cls,
             "streamTrackId",
             "Ljava/lang/String;"
     );
 
-    jlong streamId = ctx->GetLongField(streamSubscription, streamIdFID);
+    jobject streamId = ctx->GetObjectField(streamSubscription, streamIdFID);
     jobject streamTrackId = ctx->GetObjectField(streamSubscription, trackIdFID);
 
-    result.streamId = streamId;
+    result.streamId = jobject2long(ctx, streamId);
     if (streamTrackId != nullptr) result.streamTrackId = jobject2string(ctx, streamTrackId);
 
     return result;
@@ -884,6 +884,26 @@ privmx::endpoint::stream::SdpWithTypeModel parseSdpWithTypeModel(JniContextUtils
 }
 
 
+privmx::endpoint::stream::StreamEncryptionMode parseStreamEncryptionMode(
+        JniContextUtils &ctx,
+        jobject streamEncryptionMode
+) {
+    jclass cls = ctx->GetObjectClass(streamEncryptionMode);
+    jmethodID nameFID = ctx->GetMethodID(
+            cls,
+            "name",
+            "()Ljava/lang/String;"
+    );
+
+    auto name_j = (jstring) ctx->CallObjectMethod(streamEncryptionMode, nameFID);
+    std::string name_c = ctx.jString2string(name_j);
+
+    if (name_c == "SINGLE_KEY") return privmx::endpoint::stream::StreamEncryptionMode::SINGLE_KEY;
+    if (name_c == "MULTIPLE_KEY") return privmx::endpoint::stream::StreamEncryptionMode::MULTIPLE_KEY;
+
+    return {};
+}
+
 // java -> c++
 template<typename T>
 std::vector<T> jArrayToVector(

privmx-endpoint/src/main/java/com/simplito/java/privmx_endpoint/model/stream/StreamEncryptionMode.java

@@ -0,0 +1,6 @@
+package com.simplito.java.privmx_endpoint.model.stream;
+
+public enum StreamEncryptionMode {
+    SINGLE_KEY,
+    MULTIPLE_KEY
+}

privmx-endpoint/src/main/java/com/simplito/java/privmx_endpoint/model/stream/StreamRoom.java

@@ -30,6 +30,7 @@ public class StreamRoom {
     public ContainerPolicy policy;
     public Long statusCode;
     public Long schemaVersion;
+    public Boolean closed;
 
     public StreamRoom(
             String contextId,
@@ -45,7 +46,8 @@ public StreamRoom(
             byte[] privateMeta,
             ContainerPolicy policy,
             Long statusCode,
-            Long schemaVersion
+            Long schemaVersion,
+            boolean closed
     ) {
         this.contextId = contextId;
         this.streamRoomId = streamRoomId;
@@ -61,5 +63,6 @@ public StreamRoom(
         this.policy = policy;
         this.statusCode = statusCode;
         this.schemaVersion = schemaVersion;
+        this.closed = closed;
     }
 }

privmx-endpoint/src/main/java/com/simplito/java/privmx_endpoint/model/stream/StreamSubscription.java

@@ -1,7 +1,7 @@
 package com.simplito.java.privmx_endpoint.model.stream;
 
 public class StreamSubscription {
-    public long streamId;
+    public Long streamId;
     public String streamTrackId;
 
     public StreamSubscription(long streamId, String streamTrackId) {

privmx-endpoint/src/main/java/com/simplito/java/privmx_endpoint/modules/stream/StreamApiLow.java

@@ -16,6 +16,7 @@
 import com.simplito.java.privmx_endpoint.model.UserWithPubKey;
 import com.simplito.java.privmx_endpoint.model.stream.SdpWithTypeModel;
 import com.simplito.java.privmx_endpoint.model.stream.Settings;
+import com.simplito.java.privmx_endpoint.model.stream.StreamEncryptionMode;
 import com.simplito.java.privmx_endpoint.model.stream.StreamHandle;
 import com.simplito.java.privmx_endpoint.model.stream.StreamInfo;
 import com.simplito.java.privmx_endpoint.model.stream.StreamPublishResult;
@@ -46,23 +47,36 @@ private StreamApiLow(Long api) {
         this.api = api;
     }
 
-    private native Long init(Connection connection, EventApi eventApi) throws IllegalStateException;
+    private native Long init(
+            Connection connection,
+            EventApi eventApi,
+            StreamEncryptionMode streamEncryptionMode
+    ) throws IllegalStateException;
 
     public StreamApiLow(
             Connection connection
     ) throws IllegalStateException {
-        this.api = init(connection, null);
+        this.api = init(connection, null, StreamEncryptionMode.SINGLE_KEY);
     }
 
     public StreamApiLow(
             Connection connection,
             EventApi eventApi
+    ) throws IllegalStateException {
+        this.api = init(connection, eventApi, StreamEncryptionMode.SINGLE_KEY);
+    }
+
+    public StreamApiLow(
+            Connection connection,
+            EventApi eventApi,
+            StreamEncryptionMode streamEncryptionMode
     ) throws IllegalStateException {
         Objects.requireNonNull(connection);
         EventApi tmpEventApi = eventApi == null ? new EventApi(connection) : null;
         this.api = init(
                 connection,
-                Optional.ofNullable(eventApi).orElse(tmpEventApi)
+                Optional.ofNullable(eventApi).orElse(tmpEventApi),
+                Optional.ofNullable(streamEncryptionMode).orElse(StreamEncryptionMode.SINGLE_KEY)
         );
 
         try {
@@ -222,7 +236,6 @@ public String buildSubscriptionQuery(
     }
 
     public native void keyManagement(String streamRoomId, boolean disable);
-
     private native void deinit() throws IllegalStateException;
 
     @Override