Merge remote-tracking branch 'origin/main'

jni/dc_wrapper.c

@@ -1118,6 +1118,20 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcEvent_getData2Str(JNIEnv *env, jobje
 }
 
 
+JNIEXPORT jbyteArray Java_com_b44t_messenger_DcEvent_getData2Blob(JNIEnv *env, jobject obj)
+{
+    jbyteArray ret = NULL;
+    dc_event_t* event = get_dc_event(env, obj);
+
+    size_t ptrSize = dc_event_get_data2_int(event);
+    char* ptr = dc_event_get_data2_str(get_dc_event(env, obj));
+        ret = ptr2jbyteArray(env, ptr, ptrSize);
+    dc_str_unref(ptr);
+
+    return ret;
+}
+
+
 JNIEXPORT jint Java_com_b44t_messenger_DcEvent_getAccountId(JNIEnv *env, jobject obj)
 {
     return (jint)dc_event_get_account_id(get_dc_event(env, obj));

src/com/b44t/messenger/DcContext.java

@@ -29,6 +29,8 @@ public class DcContext {
     public final static int DC_EVENT_CONNECTIVITY_CHANGED        = 2100;
     public final static int DC_EVENT_SELFAVATAR_CHANGED          = 2110;
     public final static int DC_EVENT_WEBXDC_STATUS_UPDATE        = 2120;
+    public final static int DC_EVENT_WEBXDC_INSTANCE_DELETED     = 2121;
+    public final static int DC_EVENT_WEBXDC_REALTIME_DATA        = 2150;
 
     public final static int DC_IMEX_EXPORT_SELF_KEYS = 1;
     public final static int DC_IMEX_IMPORT_SELF_KEYS = 2;

src/com/b44t/messenger/DcEvent.java

@@ -16,6 +16,7 @@ public class DcEvent {
     public native int    getData1Int ();
     public native int    getData2Int ();
     public native String getData2Str ();
+    public native byte[] getData2Blob();
     public native int    getAccountId();
 
     // working with raw c-data