Merge remote-tracking branch 'upstream/main'

src/main/java/com/b44t/messenger/DcAccounts.java

@@ -2,8 +2,8 @@ package com.b44t.messenger;
 
 public class DcAccounts {
 
-    public DcAccounts(String dir) {
-        accountsCPtr = createAccountsCPtr(dir);
+    public DcAccounts(String dir, DcEventChannel channel) {
+        accountsCPtr = createAccountsCPtr(dir, channel);
         if (accountsCPtr == 0) throw new RuntimeException("createAccountsCPtr() returned null pointer");
     }
 
@@ -46,7 +46,7 @@ public class DcAccounts {
 
     // working with raw c-data
     private long         accountsCPtr;          // CAVE: the name is referenced in the JNI
-    private native long  createAccountsCPtr     (String dir);
+    private native long  createAccountsCPtr     (String dir, DcEventChannel channel);
     private native void  unrefAccountsCPtr      ();
     private native long  getEventEmitterCPtr    ();
     private native long  getJsonrpcInstanceCPtr ();

src/main/java/com/b44t/messenger/DcEventChannel.java

@@ -0,0 +1,27 @@
+package com.b44t.messenger;
+
+public class DcEventChannel {
+
+  public DcEventChannel() {
+    eventChannelCPtr = createEventChannelCPtr();
+  }
+
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    if (eventChannelCPtr != 0) {
+      unrefEventChannelCPtr();
+      eventChannelCPtr = 0;
+    }
+  }
+
+  public DcEventEmitter getEventEmitter() {
+    return new DcEventEmitter(getEventEmitterCPtr());
+  }
+
+  // working with raw c-data
+  private long         eventChannelCPtr;      // CAVE: the name is referenced in the JNI
+  private native long  createEventChannelCPtr ();
+  private native void  unrefEventChannelCPtr  ();
+  private native long  getEventEmitterCPtr    ();
+}