@dittolive/ditto 4.12.0 → 5.0.0-experimental.js-cocoapods-publishing.3

package/react-native/android/dittoffi/src/dittoffi_java.cpp

@@ -797,7 +797,7 @@ namespace Swig {
 namespace Swig {
   namespace {
     jclass jclass_dittoffiJNI = NULL;
-    jmethodID director_method_ids[125];
+    jmethodID director_method_ids[119];
   }
 }
 
@@ -985,6 +985,18 @@ SWIGINTERN void SWIG_JavaException(JNIEnv *jenv, int code, const char *msg) {
     ) {
       return unsigned_long_ints[index];
     }
+
+    // This makes working with sync subscriptions easier
+    dittoffi_sync_subscription_t const * dittoffi_sync_subscription_at_index(
+      dittoffi_sync_subscription_t const * * subscriptions,
+      unsigned long int index
+    ) {
+      if (subscriptions == nullptr) {
+        throw std::invalid_argument("subscriptions pointer is null");
+      }
+
+      return subscriptions[index];
+    }
   }
 
 
@@ -4914,73 +4926,13 @@ void SwigDirector_PresenceRust::java_release() {
   if (swigjobj) jenv->DeleteLocalRef(swigjobj);
 }
 
-void SwigDirector_PresenceRust::v1Callback(char const *const json) {
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  jstring jjson = 0 ;
-  
-  if (!swig_override[2]) {
-    SWIG_JavaThrowException(JNIEnvWrapper(this).getJNIEnv(), SWIG_JavaDirectorPureVirtual, "Attempted to invoke pure virtual method PresenceRust::v1Callback.");
-    return;
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jjson = 0;
-    if (json) {
-      jjson = jenv->NewStringUTF((const char *)json);
-      if (!jjson) return ;
-    }
-    Swig::LocalRefGuard json_refguard(jenv, jjson);
-    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[111], swigjobj, jjson);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in PresenceRust::v1Callback ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-}
-
-void SwigDirector_PresenceRust::v2Callback(char const *const json) {
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  jstring jjson = 0 ;
-  
-  if (!swig_override[3]) {
-    SWIG_JavaThrowException(JNIEnvWrapper(this).getJNIEnv(), SWIG_JavaDirectorPureVirtual, "Attempted to invoke pure virtual method PresenceRust::v2Callback.");
-    return;
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jjson = 0;
-    if (json) {
-      jjson = jenv->NewStringUTF((const char *)json);
-      if (!jjson) return ;
-    }
-    Swig::LocalRefGuard json_refguard(jenv, jjson);
-    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[112], swigjobj, jjson);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in PresenceRust::v2Callback ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-}
-
 void SwigDirector_PresenceRust::v3Callback(char const *const json) {
   JNIEnvWrapper swigjnienv(this) ;
   JNIEnv * jenv = swigjnienv.getJNIEnv() ;
   jobject swigjobj = (jobject) NULL ;
   jstring jjson = 0 ;
   
-  if (!swig_override[4]) {
+  if (!swig_override[2]) {
     SWIG_JavaThrowException(JNIEnvWrapper(this).getJNIEnv(), SWIG_JavaDirectorPureVirtual, "Attempted to invoke pure virtual method PresenceRust::v3Callback.");
     return;
   }
@@ -4992,7 +4944,7 @@ void SwigDirector_PresenceRust::v3Callback(char const *const json) {
       if (!jjson) return ;
     }
     Swig::LocalRefGuard json_refguard(jenv, jjson);
-    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[113], swigjobj, jjson);
+    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[111], swigjobj, jjson);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -5004,64 +4956,18 @@ void SwigDirector_PresenceRust::v3Callback(char const *const json) {
   if (swigjobj) jenv->DeleteLocalRef(swigjobj);
 }
 
-void SwigDirector_PresenceRust::register_v1() {
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  
-  if (!swig_override[5]) {
-    PresenceRust::register_v1();
-    return;
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[114], swigjobj);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in PresenceRust::register_v1 ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-}
-
-void SwigDirector_PresenceRust::register_v2() {
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  
-  if (!swig_override[6]) {
-    PresenceRust::register_v2();
-    return;
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[115], swigjobj);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in PresenceRust::register_v2 ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-}
-
 void SwigDirector_PresenceRust::register_v3() {
   JNIEnvWrapper swigjnienv(this) ;
   JNIEnv * jenv = swigjnienv.getJNIEnv() ;
   jobject swigjobj = (jobject) NULL ;
   
-  if (!swig_override[7]) {
+  if (!swig_override[3]) {
     PresenceRust::register_v3();
     return;
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[116], swigjobj);
+    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[112], swigjobj);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -5073,64 +4979,18 @@ void SwigDirector_PresenceRust::register_v3() {
   if (swigjobj) jenv->DeleteLocalRef(swigjobj);
 }
 
-void SwigDirector_PresenceRust::requestV1Update() {
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  
-  if (!swig_override[8]) {
-    PresenceRust::requestV1Update();
-    return;
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[117], swigjobj);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in PresenceRust::requestV1Update ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-}
-
-void SwigDirector_PresenceRust::requestV2Update() {
-  JNIEnvWrapper swigjnienv(this) ;
-  JNIEnv * jenv = swigjnienv.getJNIEnv() ;
-  jobject swigjobj = (jobject) NULL ;
-  
-  if (!swig_override[9]) {
-    PresenceRust::requestV2Update();
-    return;
-  }
-  swigjobj = swig_get_self(jenv);
-  if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[118], swigjobj);
-    jthrowable swigerror = jenv->ExceptionOccurred();
-    if (swigerror) {
-      Swig::DirectorException::raise(jenv, swigerror);
-    }
-    
-  } else {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object in PresenceRust::requestV2Update ");
-  }
-  if (swigjobj) jenv->DeleteLocalRef(swigjobj);
-}
-
 void SwigDirector_PresenceRust::requestV3Update() {
   JNIEnvWrapper swigjnienv(this) ;
   JNIEnv * jenv = swigjnienv.getJNIEnv() ;
   jobject swigjobj = (jobject) NULL ;
   
-  if (!swig_override[10]) {
+  if (!swig_override[4]) {
     PresenceRust::requestV3Update();
     return;
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[119], swigjobj);
+    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[113], swigjobj);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -5148,20 +5008,14 @@ void SwigDirector_PresenceRust::swig_connect_director(JNIEnv *jenv, jobject jsel
   static SwigDirectorMethod methods[] = {
     SwigDirectorMethod(jenv, baseclass, "java_retain", "()V"),
     SwigDirectorMethod(jenv, baseclass, "java_release", "()V"),
-    SwigDirectorMethod(jenv, baseclass, "v1Callback", "(Ljava/lang/String;)V"),
-    SwigDirectorMethod(jenv, baseclass, "v2Callback", "(Ljava/lang/String;)V"),
     SwigDirectorMethod(jenv, baseclass, "v3Callback", "(Ljava/lang/String;)V"),
-    SwigDirectorMethod(jenv, baseclass, "register_v1", "()V"),
-    SwigDirectorMethod(jenv, baseclass, "register_v2", "()V"),
     SwigDirectorMethod(jenv, baseclass, "register_v3", "()V"),
-    SwigDirectorMethod(jenv, baseclass, "requestV1Update", "()V"),
-    SwigDirectorMethod(jenv, baseclass, "requestV2Update", "()V"),
     SwigDirectorMethod(jenv, baseclass, "requestV3Update", "()V")
   };
   
   if (swig_set_self(jenv, jself, swig_mem_own, weak_global)) {
     bool derived = (jenv->IsSameObject(baseclass, jcls) ? false : true);
-    for (int i = 0; i < 11; ++i) {
+    for (int i = 0; i < 5; ++i) {
       swig_override[i] = derived;
     }
   }
@@ -5187,7 +5041,7 @@ void SwigDirector_StoreObserverHandlerRust::java_retain() {
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[120], swigjobj);
+    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[114], swigjobj);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -5210,7 +5064,7 @@ void SwigDirector_StoreObserverHandlerRust::java_release() {
   }
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
-    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[121], swigjobj);
+    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[115], swigjobj);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -5236,7 +5090,7 @@ void SwigDirector_StoreObserverHandlerRust::eventHandler(ChangeHandlerWithQueryR
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jc_cb_params = 0;
     *((ChangeHandlerWithQueryResult_t **)&jc_cb_params) = new ChangeHandlerWithQueryResult_t(SWIG_STD_MOVE(c_cb_params)); 
-    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[122], swigjobj, jc_cb_params);
+    jenv->CallStaticVoidMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[116], swigjobj, jc_cb_params);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -5280,7 +5134,7 @@ dittoffi_result_int64_t SwigDirector_StoreObserverHandlerRust::registerStoreObse
     }
     Swig::LocalRefGuard query_args_cbor_refguard(jenv, jquery_args_cbor);
     jlq_availability = (jint) lq_availability;
-    jresult = (jlong) jenv->CallStaticLongMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[123], swigjobj, jditto_raw, jquery, jquery_args_cbor, jlq_availability);
+    jresult = (jlong) jenv->CallStaticLongMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[117], swigjobj, jditto_raw, jquery, jquery_args_cbor, jlq_availability);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -5316,7 +5170,7 @@ int SwigDirector_StoreObserverHandlerRust::startLiveQuery(CDitto *ditto_raw,int6
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((CDitto **)&jditto_raw) = (CDitto *) ditto_raw; 
     jid = (jlong) id;
-    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[124], swigjobj, jditto_raw, jid);
+    jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_dittoffiJNI, Swig::director_method_ids[118], swigjobj, jditto_raw, jid);
     jthrowable swigerror = jenv->ExceptionOccurred();
     if (swigerror) {
       Swig::DirectorException::raise(jenv, swigerror);
@@ -9466,6 +9320,35 @@ SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_get_1inde
 }
 
 
+SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1subscription_1at_1index(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
+  jlong jresult = 0 ;
+  dittoffi_sync_subscription_t **arg1 = (dittoffi_sync_subscription_t **) 0 ;
+  unsigned long arg2 ;
+  dittoffi_sync_subscription_t *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(dittoffi_sync_subscription_t ***)&jarg1; 
+  arg2 = (unsigned long)jarg2; 
+  {
+    try {
+      result = (dittoffi_sync_subscription_t *)dittoffi_sync_subscription_at_index((dittoffi_sync_subscription const **)arg1,arg2);
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return 0;
+    }
+  }
+  *(dittoffi_sync_subscription_t **)&jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_new_1Ditto_1DocumentHandle(JNIEnv *jenv, jclass jcls) {
   jlong jresult = 0 ;
   CDocument_t **result = 0 ;
@@ -11790,68 +11673,6 @@ SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_delete_1Pr
 }
 
 
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1v1Callback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  PresenceRust *arg1 = (PresenceRust *) 0 ;
-  char *arg2 = (char *) (char *)0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(PresenceRust **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    try {
-      (arg1)->v1Callback((char const *)arg2);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1v2Callback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  PresenceRust *arg1 = (PresenceRust *) 0 ;
-  char *arg2 = (char *) (char *)0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(PresenceRust **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    try {
-      (arg1)->v2Callback((char const *)arg2);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
-}
-
-
 SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1v3Callback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
   PresenceRust *arg1 = (PresenceRust *) 0 ;
   char *arg2 = (char *) (char *)0 ;
@@ -11883,66 +11704,6 @@ SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRu
 }
 
 
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1invokeV1Callback(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {
-  void *arg1 = (void *) (void *)0 ;
-  char *arg2 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(void **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    try {
-      PresenceRust::invokeV1Callback(arg1,(char const *)arg2);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1invokeV2Callback(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {
-  void *arg1 = (void *) (void *)0 ;
-  char *arg2 = (char *) (char *)0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(void **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return ;
-  }
-  {
-    try {
-      PresenceRust::invokeV2Callback(arg1,(char const *)arg2);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
-}
-
-
 SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1invokeV3Callback(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {
   void *arg1 = (void *) (void *)0 ;
   char *arg2 = (char *) (char *)0 ;
@@ -11973,102 +11734,6 @@ SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRu
 }
 
 
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1register_1v1(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  PresenceRust *arg1 = (PresenceRust *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(PresenceRust **)&jarg1; 
-  {
-    try {
-      (arg1)->register_v1();
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1register_1v1SwigExplicitPresenceRust(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  PresenceRust *arg1 = (PresenceRust *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(PresenceRust **)&jarg1; 
-  {
-    try {
-      (arg1)->PresenceRust::register_v1();
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1register_1v2(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  PresenceRust *arg1 = (PresenceRust *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(PresenceRust **)&jarg1; 
-  {
-    try {
-      (arg1)->register_v2();
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1register_1v2SwigExplicitPresenceRust(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  PresenceRust *arg1 = (PresenceRust *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(PresenceRust **)&jarg1; 
-  {
-    try {
-      (arg1)->PresenceRust::register_v2();
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
 SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1register_1v3(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
   PresenceRust *arg1 = (PresenceRust *) 0 ;
   
@@ -12117,102 +11782,6 @@ SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRu
 }
 
 
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1requestV1Update(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  PresenceRust *arg1 = (PresenceRust *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(PresenceRust **)&jarg1; 
-  {
-    try {
-      (arg1)->requestV1Update();
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1requestV1UpdateSwigExplicitPresenceRust(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  PresenceRust *arg1 = (PresenceRust *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(PresenceRust **)&jarg1; 
-  {
-    try {
-      (arg1)->PresenceRust::requestV1Update();
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1requestV2Update(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  PresenceRust *arg1 = (PresenceRust *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(PresenceRust **)&jarg1; 
-  {
-    try {
-      (arg1)->requestV2Update();
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1requestV2UpdateSwigExplicitPresenceRust(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  PresenceRust *arg1 = (PresenceRust *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(PresenceRust **)&jarg1; 
-  {
-    try {
-      (arg1)->PresenceRust::requestV2Update();
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
 SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_PresenceRust_1requestV3Update(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
   PresenceRust *arg1 = (PresenceRust *) 0 ;
   
@@ -15565,6 +15134,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -16993,52 +16567,6 @@ SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1cle
 }
 
 
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1clear_1presence_1v1_1callback(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  CDitto_t *arg1 = (CDitto_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(CDitto_t **)&jarg1; 
-  {
-    try {
-      ditto_clear_presence_v1_callback((CDitto const *)arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1clear_1presence_1v2_1callback(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  CDitto_t *arg1 = (CDitto_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(CDitto_t **)&jarg1; 
-  {
-    try {
-      ditto_clear_presence_v2_callback((CDitto const *)arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
 SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1clear_1presence_1v3_1callback(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   CDitto_t *arg1 = (CDitto_t *) 0 ;
   
@@ -20114,6 +19642,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -22778,60 +22311,6 @@ SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1ne
 }
 
 
-SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1presence_1v1(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jstring jresult = 0 ;
-  CDitto_t *arg1 = (CDitto_t *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(CDitto_t **)&jarg1; 
-  {
-    try {
-      result = (char *)ditto_presence_v1((CDitto const *)arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return 0;
-    }
-  }
-  if (result) jresult = jenv->NewStringUTF((const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1presence_1v2(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jstring jresult = 0 ;
-  CDitto_t *arg1 = (CDitto_t *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(CDitto_t **)&jarg1; 
-  {
-    try {
-      result = (char *)ditto_presence_v2((CDitto const *)arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return 0;
-    }
-  }
-  if (result) jresult = jenv->NewStringUTF((const char *)result);
-  return jresult;
-}
-
-
 SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1presence_1v3(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   jstring jresult = 0 ;
   CDitto_t *arg1 = (CDitto_t *) 0 ;
@@ -22855,6 +22334,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -23366,68 +22850,6 @@ SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1reg
 }
 
 
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1register_1presence_1v1_1callback(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3, jlong jarg4, jlong jarg5) {
-  CDitto_t *arg1 = (CDitto_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void (*arg3)(void *) = (void (*)(void *)) 0 ;
-  void (*arg4)(void *) = (void (*)(void *)) 0 ;
-  void (*arg5)(void *,char const *) = (void (*)(void *,char const *)) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(CDitto_t **)&jarg1; 
-  arg2 = *(void **)&jarg2; 
-  arg3 = *(void (**)(void *))&jarg3; 
-  arg4 = *(void (**)(void *))&jarg4; 
-  arg5 = *(void (**)(void *,char const *))&jarg5; 
-  {
-    try {
-      ditto_register_presence_v1_callback((CDitto const *)arg1,arg2,arg3,arg4,arg5);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1register_1presence_1v2_1callback(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3, jlong jarg4, jlong jarg5) {
-  CDitto_t *arg1 = (CDitto_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void (*arg3)(void *) = (void (*)(void *)) 0 ;
-  void (*arg4)(void *) = (void (*)(void *)) 0 ;
-  void (*arg5)(void *,char const *) = (void (*)(void *,char const *)) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(CDitto_t **)&jarg1; 
-  arg2 = *(void **)&jarg2; 
-  arg3 = *(void (**)(void *))&jarg3; 
-  arg4 = *(void (**)(void *))&jarg4; 
-  arg5 = *(void (**)(void *,char const *))&jarg5; 
-  {
-    try {
-      ditto_register_presence_v2_callback((CDitto const *)arg1,arg2,arg3,arg4,arg5);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
 SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1register_1transport_1condition_1changed_1callback(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3, jlong jarg4, jlong jarg5) {
   CDitto_t *arg1 = (CDitto_t *) 0 ;
   void *arg2 = (void *) 0 ;
@@ -23864,6 +23286,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -24308,6 +23735,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -24572,6 +24004,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -25735,6 +25172,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoff
       jenv->ReleaseByteArrayElements(jarg1, (jbyte *)(&arg1)->ptr, JNI_ABORT);
     }
   }
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -26025,6 +25467,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoff
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -26527,6 +25974,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoff
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -27997,6 +27449,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoff
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -28072,6 +27529,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoff
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -28329,6 +27791,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoff
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -28356,166 +27823,16 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoff
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
-  return jresult;
-}
-
-
-SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1presence_1graph(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jbyteArray jresult = 0 ;
-  CDitto_t *arg1 = (CDitto_t *) 0 ;
-  slice_boxed_uint8_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(CDitto_t **)&jarg1; 
-  {
-    try {
-      result = dittoffi_presence_graph((CDitto const *)arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return 0;
-    }
-  }
-  {
-    if ((&result)->ptr != NULL) {
-      jresult = jenv->NewByteArray((&result)->len);
-      jenv->SetByteArrayRegion(jresult, 0, (&result)->len, (jbyte *)(&result)->ptr);
-      // We do not call `ditto_c_bytes_free(result);` here since the `ret` typemap
-      // takes care of that.
-    } else {
-      jresult = jenv->NewByteArray(0);
-    }
-  }
-  {
-    if ((&result)->ptr != NULL) {
-      ditto_c_bytes_free(result);
-    }
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1presence_1observer_1cancel(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  dittoffi_presence_observer_t *arg1 = (dittoffi_presence_observer_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(dittoffi_presence_observer_t **)&jarg1; 
   {
-    try {
-      dittoffi_presence_observer_cancel((dittoffi_presence_observer const *)arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1presence_1observer_1free(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  dittoffi_presence_observer_t *arg1 = (dittoffi_presence_observer_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(dittoffi_presence_observer_t **)&jarg1; 
-  {
-    try {
-      dittoffi_presence_observer_free(arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
-    }
-  }
-}
-
-
-SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1presence_1observer_1id(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jbyteArray jresult = 0 ;
-  dittoffi_presence_observer_t *arg1 = (dittoffi_presence_observer_t *) 0 ;
-  slice_boxed_uint8_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(dittoffi_presence_observer_t **)&jarg1; 
-  {
-    try {
-      result = dittoffi_presence_observer_id((dittoffi_presence_observer const *)arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return 0;
-    }
-  }
-  {
-    if ((&result)->ptr != NULL) {
-      jresult = jenv->NewByteArray((&result)->len);
-      jenv->SetByteArrayRegion(jresult, 0, (&result)->len, (jbyte *)(&result)->ptr);
-      // We do not call `ditto_c_bytes_free(result);` here since the `ret` typemap
-      // takes care of that.
-    } else {
-      jresult = jenv->NewByteArray(0);
-    }
-  }
-  {
-    if ((&result)->ptr != NULL) {
-      ditto_c_bytes_free(result);
-    }
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT jboolean JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1presence_1observer_1is_1cancelled(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  dittoffi_presence_observer_t *arg1 = (dittoffi_presence_observer_t *) 0 ;
-  bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(dittoffi_presence_observer_t **)&jarg1; 
-  {
-    try {
-      result = (bool)dittoffi_presence_observer_is_cancelled((dittoffi_presence_observer const *)arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return 0;
+    if (result != NULL) {
+      ditto_c_string_free(result);
     }
   }
-  jresult = (jboolean)result; 
   return jresult;
 }
 
 
-SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1presence_1peer_1metadata_1json(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1presence_1graph(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   jbyteArray jresult = 0 ;
   CDitto_t *arg1 = (CDitto_t *) 0 ;
   slice_boxed_uint8_t result;
@@ -28525,7 +27842,162 @@ SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditt
   arg1 = *(CDitto_t **)&jarg1; 
   {
     try {
-      result = dittoffi_presence_peer_metadata_json((CDitto const *)arg1);
+      result = dittoffi_presence_graph((CDitto const *)arg1);
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return 0;
+    }
+  }
+  {
+    if ((&result)->ptr != NULL) {
+      jresult = jenv->NewByteArray((&result)->len);
+      jenv->SetByteArrayRegion(jresult, 0, (&result)->len, (jbyte *)(&result)->ptr);
+      // We do not call `ditto_c_bytes_free(result);` here since the `ret` typemap
+      // takes care of that.
+    } else {
+      jresult = jenv->NewByteArray(0);
+    }
+  }
+  {
+    if ((&result)->ptr != NULL) {
+      ditto_c_bytes_free(result);
+    }
+  }
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1presence_1observer_1cancel(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  dittoffi_presence_observer_t *arg1 = (dittoffi_presence_observer_t *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(dittoffi_presence_observer_t **)&jarg1; 
+  {
+    try {
+      dittoffi_presence_observer_cancel((dittoffi_presence_observer const *)arg1);
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return ;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return ;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1presence_1observer_1free(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  dittoffi_presence_observer_t *arg1 = (dittoffi_presence_observer_t *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(dittoffi_presence_observer_t **)&jarg1; 
+  {
+    try {
+      dittoffi_presence_observer_free(arg1);
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return ;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return ;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1presence_1observer_1id(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jbyteArray jresult = 0 ;
+  dittoffi_presence_observer_t *arg1 = (dittoffi_presence_observer_t *) 0 ;
+  slice_boxed_uint8_t result;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(dittoffi_presence_observer_t **)&jarg1; 
+  {
+    try {
+      result = dittoffi_presence_observer_id((dittoffi_presence_observer const *)arg1);
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return 0;
+    }
+  }
+  {
+    if ((&result)->ptr != NULL) {
+      jresult = jenv->NewByteArray((&result)->len);
+      jenv->SetByteArrayRegion(jresult, 0, (&result)->len, (jbyte *)(&result)->ptr);
+      // We do not call `ditto_c_bytes_free(result);` here since the `ret` typemap
+      // takes care of that.
+    } else {
+      jresult = jenv->NewByteArray(0);
+    }
+  }
+  {
+    if ((&result)->ptr != NULL) {
+      ditto_c_bytes_free(result);
+    }
+  }
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1presence_1observer_1is_1cancelled(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jboolean jresult = 0 ;
+  dittoffi_presence_observer_t *arg1 = (dittoffi_presence_observer_t *) 0 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(dittoffi_presence_observer_t **)&jarg1; 
+  {
+    try {
+      result = (bool)dittoffi_presence_observer_is_cancelled((dittoffi_presence_observer const *)arg1);
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return 0;
+    }
+  }
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1presence_1peer_1metadata_1json(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jbyteArray jresult = 0 ;
+  CDitto_t *arg1 = (CDitto_t *) 0 ;
+  slice_boxed_uint8_t result;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(CDitto_t **)&jarg1; 
+  {
+    try {
+      result = dittoffi_presence_peer_metadata_json((CDitto const *)arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
       return 0;
@@ -29454,6 +28926,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoff
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -30154,99 +29631,17 @@ SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1
 }
 
 
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Vec_1dittoffi_1store_1observer_1ptr_1t_1ptr_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
-  dittoffi_store_observer_t **arg2 = (dittoffi_store_observer_t **) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
-  arg2 = *(dittoffi_store_observer_t ***)&jarg2; 
-  if (arg1) (arg1)->ptr = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Vec_1dittoffi_1store_1observer_1ptr_1t_1ptr_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
-  dittoffi_store_observer_t **result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
-  result = (dittoffi_store_observer_t **) ((arg1)->ptr);
-  *(dittoffi_store_observer_t ***)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Vec_1dittoffi_1store_1observer_1ptr_1t_1len_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
-  size_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
-  arg2 = (size_t)jarg2; 
-  if (arg1) (arg1)->len = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Vec_1dittoffi_1store_1observer_1ptr_1t_1len_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
-  size_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
-  result =  ((arg1)->len);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Vec_1dittoffi_1store_1observer_1ptr_1t_1cap_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
-  size_t arg2 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
-  arg2 = (size_t)jarg2; 
-  if (arg1) (arg1)->cap = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Vec_1dittoffi_1store_1observer_1ptr_1t_1cap_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
-  size_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
-  result =  ((arg1)->cap);
-  jresult = (jlong)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_new_1Vec_1dittoffi_1store_1observer_1ptr_1t(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  Vec_dittoffi_store_observer_ptr *result = 0 ;
+SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1observer_1id(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jbyteArray jresult = 0 ;
+  dittoffi_store_observer_t *arg1 = (dittoffi_store_observer_t *) 0 ;
+  slice_boxed_uint8_t result;
   
   (void)jenv;
   (void)jcls;
+  arg1 = *(dittoffi_store_observer_t **)&jarg1; 
   {
     try {
-      result = (Vec_dittoffi_store_observer_ptr *)new Vec_dittoffi_store_observer_ptr();
+      result = dittoffi_store_observer_id((dittoffi_store_observer const *)arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
       return 0;
@@ -30258,65 +29653,53 @@ SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_new_1Vec_
       return 0;
     }
   }
-  *(Vec_dittoffi_store_observer_ptr **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_delete_1Vec_1dittoffi_1store_1observer_1ptr_1t(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
   {
-    try {
-      delete arg1;
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
+    if ((&result)->ptr != NULL) {
+      jresult = jenv->NewByteArray((&result)->len);
+      jenv->SetByteArrayRegion(jresult, 0, (&result)->len, (jbyte *)(&result)->ptr);
+      // We do not call `ditto_c_bytes_free(result);` here since the `ret` typemap
+      // takes care of that.
+    } else {
+      jresult = jenv->NewByteArray(0);
+    }
+  }
+  {
+    if ((&result)->ptr != NULL) {
+      ditto_c_bytes_free(result);
     }
   }
+  return jresult;
 }
 
 
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1observer_1free_1sparse(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  Vec_dittoffi_store_observer_ptr_t arg1 ;
-  Vec_dittoffi_store_observer_ptr_t *argp1 ;
+SWIGEXPORT jboolean JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1observer_1is_1cancelled(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jboolean jresult = 0 ;
+  dittoffi_store_observer_t *arg1 = (dittoffi_store_observer_t *) 0 ;
+  bool result;
   
   (void)jenv;
   (void)jcls;
-  (void)jarg1_;
-  argp1 = *(Vec_dittoffi_store_observer_ptr_t **)&jarg1; 
-  if (!argp1) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null Vec_dittoffi_store_observer_ptr_t");
-    return ;
-  }
-  arg1 = *argp1; 
+  arg1 = *(dittoffi_store_observer_t **)&jarg1; 
   {
     try {
-      dittoffi_store_observer_free_sparse(SWIG_STD_MOVE(arg1));
+      result = (bool)dittoffi_store_observer_is_cancelled((dittoffi_store_observer const *)arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
+      return 0;
     } catch (const std::exception &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
+      return 0;
     } catch (...) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
+      return 0;
     }
   }
+  jresult = (jboolean)result; 
+  return jresult;
 }
 
 
-SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1observer_1id(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1observer_1query_1arguments(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   jbyteArray jresult = 0 ;
   dittoffi_store_observer_t *arg1 = (dittoffi_store_observer_t *) 0 ;
   slice_boxed_uint8_t result;
@@ -30326,7 +29709,7 @@ SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditt
   arg1 = *(dittoffi_store_observer_t **)&jarg1; 
   {
     try {
-      result = dittoffi_store_observer_id((dittoffi_store_observer const *)arg1);
+      result = dittoffi_store_observer_query_arguments((dittoffi_store_observer const *)arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
       return 0;
@@ -30357,17 +29740,17 @@ SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditt
 }
 
 
-SWIGEXPORT jboolean JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1observer_1is_1cancelled(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
+SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1observer_1query_1arguments_1cbor(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jbyteArray jresult = 0 ;
   dittoffi_store_observer_t *arg1 = (dittoffi_store_observer_t *) 0 ;
-  bool result;
+  slice_boxed_uint8_t result;
   
   (void)jenv;
   (void)jcls;
   arg1 = *(dittoffi_store_observer_t **)&jarg1; 
   {
     try {
-      result = (bool)dittoffi_store_observer_is_cancelled((dittoffi_store_observer const *)arg1);
+      result = dittoffi_store_observer_query_arguments_cbor((dittoffi_store_observer const *)arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
       return 0;
@@ -30379,12 +29762,26 @@ SWIGEXPORT jboolean JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittof
       return 0;
     }
   }
-  jresult = (jboolean)result; 
+  {
+    if ((&result)->ptr != NULL) {
+      jresult = jenv->NewByteArray((&result)->len);
+      jenv->SetByteArrayRegion(jresult, 0, (&result)->len, (jbyte *)(&result)->ptr);
+      // We do not call `ditto_c_bytes_free(result);` here since the `ret` typemap
+      // takes care of that.
+    } else {
+      jresult = jenv->NewByteArray(0);
+    }
+  }
+  {
+    if ((&result)->ptr != NULL) {
+      ditto_c_bytes_free(result);
+    }
+  }
   return jresult;
 }
 
 
-SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1observer_1query_1arguments(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1observer_1query_1arguments_1json(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   jbyteArray jresult = 0 ;
   dittoffi_store_observer_t *arg1 = (dittoffi_store_observer_t *) 0 ;
   slice_boxed_uint8_t result;
@@ -30394,7 +29791,7 @@ SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditt
   arg1 = *(dittoffi_store_observer_t **)&jarg1; 
   {
     try {
-      result = dittoffi_store_observer_query_arguments((dittoffi_store_observer const *)arg1);
+      result = dittoffi_store_observer_query_arguments_json((dittoffi_store_observer const *)arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
       return 0;
@@ -30452,6 +29849,138 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoff
 }
 
 
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Vec_1dittoffi_1store_1observer_1ptr_1t_1ptr_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
+  dittoffi_store_observer_t **arg2 = (dittoffi_store_observer_t **) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
+  arg2 = *(dittoffi_store_observer_t ***)&jarg2; 
+  if (arg1) (arg1)->ptr = arg2;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Vec_1dittoffi_1store_1observer_1ptr_1t_1ptr_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
+  dittoffi_store_observer_t **result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
+  result = (dittoffi_store_observer_t **) ((arg1)->ptr);
+  *(dittoffi_store_observer_t ***)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Vec_1dittoffi_1store_1observer_1ptr_1t_1len_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
+  size_t arg2 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
+  arg2 = (size_t)jarg2; 
+  if (arg1) (arg1)->len = arg2;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Vec_1dittoffi_1store_1observer_1ptr_1t_1len_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
+  size_t result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
+  result =  ((arg1)->len);
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Vec_1dittoffi_1store_1observer_1ptr_1t_1cap_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
+  size_t arg2 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
+  arg2 = (size_t)jarg2; 
+  if (arg1) (arg1)->cap = arg2;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Vec_1dittoffi_1store_1observer_1ptr_1t_1cap_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
+  size_t result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
+  result =  ((arg1)->cap);
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_new_1Vec_1dittoffi_1store_1observer_1ptr_1t(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  Vec_dittoffi_store_observer_ptr *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (Vec_dittoffi_store_observer_ptr *)new Vec_dittoffi_store_observer_ptr();
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return 0;
+    }
+  }
+  *(Vec_dittoffi_store_observer_ptr **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_delete_1Vec_1dittoffi_1store_1observer_1ptr_1t(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  Vec_dittoffi_store_observer_ptr *arg1 = (Vec_dittoffi_store_observer_ptr *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(Vec_dittoffi_store_observer_ptr **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return ;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return ;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return ;
+    }
+  }
+}
+
+
 SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1observers(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   jlong jresult = 0 ;
   CDitto_t *arg1 = (CDitto_t *) 0 ;
@@ -30479,6 +30008,36 @@ SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_
 }
 
 
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1observers_1free_1sparse(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  Vec_dittoffi_store_observer_ptr_t arg1 ;
+  Vec_dittoffi_store_observer_ptr_t *argp1 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  argp1 = *(Vec_dittoffi_store_observer_ptr_t **)&jarg1; 
+  if (!argp1) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null Vec_dittoffi_store_observer_ptr_t");
+    return ;
+  }
+  arg1 = *argp1; 
+  {
+    try {
+      dittoffi_store_observers_free_sparse(SWIG_STD_MOVE(arg1));
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return ;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return ;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return ;
+    }
+  }
+}
+
+
 SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ArcDynFn0_1void_1t_1env_1ptr_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
   ArcDynFn0_void *arg1 = (ArcDynFn0_void *) 0 ;
   void *arg2 = (void *) 0 ;
@@ -30880,8 +30439,8 @@ SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_
   CDitto_t *arg1 = (CDitto_t *) 0 ;
   char *arg2 = (char *) 0 ;
   slice_ref_uint8_t arg3 ;
-  BoxDynFnMut2_void_dittoffi_query_result_ptr_ArcDynFn0_void_t arg4 ;
-  BoxDynFnMut2_void_dittoffi_query_result_ptr_ArcDynFn0_void_t *argp4 ;
+  dittoffi_store_observation_handler_with_signal_next_t arg4 ;
+  dittoffi_store_observation_handler_with_signal_next_t *argp4 ;
   dittoffi_result_dittoffi_store_observer_ptr_t result;
   
   (void)jenv;
@@ -30919,15 +30478,227 @@ SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_
       };
     }
   }
-  argp4 = *(BoxDynFnMut2_void_dittoffi_query_result_ptr_ArcDynFn0_void_t **)&jarg4; 
-  if (!argp4) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null BoxDynFnMut2_void_dittoffi_query_result_ptr_ArcDynFn0_void_t");
-    return 0;
-  }
-  arg4 = *argp4; 
+  argp4 = *(dittoffi_store_observation_handler_with_signal_next_t **)&jarg4; 
+  if (!argp4) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null dittoffi_store_observation_handler_with_signal_next_t");
+    return 0;
+  }
+  arg4 = *argp4; 
+  {
+    try {
+      result = dittoffi_store_register_observer_throws((CDitto const *)arg1,(char const *)arg2,SWIG_STD_MOVE(arg3),SWIG_STD_MOVE(arg4));
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return 0;
+    }
+  }
+  *(dittoffi_result_dittoffi_store_observer_ptr_t **)&jresult = new dittoffi_result_dittoffi_store_observer_ptr_t(result); 
+  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
+  {
+    // Free the allocation from `GetByteArrayElements`
+    if (jarg3 != NULL) {
+      jenv->ReleaseByteArrayElements(jarg3, (jbyte *)(&arg3)->ptr, JNI_ABORT);
+    }
+  }
+  return jresult;
+}
+
+
+SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1transactions(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jbyteArray jresult = 0 ;
+  dittoffi_store_t *arg1 = (dittoffi_store_t *) 0 ;
+  dittoffi_cbor_data_t result;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(dittoffi_store_t **)&jarg1; 
+  {
+    try {
+      result = dittoffi_store_transactions((CDitto const *)arg1);
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return 0;
+    }
+  }
+  {
+    if ((&result)->ptr != NULL) {
+      jresult = jenv->NewByteArray((&result)->len);
+      jenv->SetByteArrayRegion(jresult, 0, (&result)->len, (jbyte *)(&result)->ptr);
+      // We do not call `ditto_c_bytes_free(result);` here since the `ret` typemap
+      // takes care of that.
+    } else {
+      jresult = jenv->NewByteArray(0);
+    }
+  }
+  {
+    if ((&result)->ptr != NULL) {
+      ditto_c_bytes_free(result);
+    }
+  }
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1result_1dittoffi_1sync_1subscription_1ptr_1t_1error_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  dittoffi_result_dittoffi_sync_subscription_ptr *arg1 = (dittoffi_result_dittoffi_sync_subscription_ptr *) 0 ;
+  dittoffi_error_t *arg2 = (dittoffi_error_t *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(dittoffi_result_dittoffi_sync_subscription_ptr **)&jarg1; 
+  arg2 = *(dittoffi_error_t **)&jarg2; 
+  if (arg1) (arg1)->error = arg2;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1result_1dittoffi_1sync_1subscription_1ptr_1t_1error_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  dittoffi_result_dittoffi_sync_subscription_ptr *arg1 = (dittoffi_result_dittoffi_sync_subscription_ptr *) 0 ;
+  dittoffi_error_t *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(dittoffi_result_dittoffi_sync_subscription_ptr **)&jarg1; 
+  result = (dittoffi_error_t *) ((arg1)->error);
+  *(dittoffi_error_t **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1result_1dittoffi_1sync_1subscription_1ptr_1t_1success_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
+  dittoffi_result_dittoffi_sync_subscription_ptr *arg1 = (dittoffi_result_dittoffi_sync_subscription_ptr *) 0 ;
+  dittoffi_sync_subscription_t *arg2 = (dittoffi_sync_subscription_t *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(dittoffi_result_dittoffi_sync_subscription_ptr **)&jarg1; 
+  arg2 = *(dittoffi_sync_subscription_t **)&jarg2; 
+  if (arg1) (arg1)->success = arg2;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1result_1dittoffi_1sync_1subscription_1ptr_1t_1success_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  dittoffi_result_dittoffi_sync_subscription_ptr *arg1 = (dittoffi_result_dittoffi_sync_subscription_ptr *) 0 ;
+  dittoffi_sync_subscription_t *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(dittoffi_result_dittoffi_sync_subscription_ptr **)&jarg1; 
+  result = (dittoffi_sync_subscription_t *) ((arg1)->success);
+  *(dittoffi_sync_subscription_t **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_new_1dittoffi_1result_1dittoffi_1sync_1subscription_1ptr_1t(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  dittoffi_result_dittoffi_sync_subscription_ptr *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (dittoffi_result_dittoffi_sync_subscription_ptr *)new dittoffi_result_dittoffi_sync_subscription_ptr();
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return 0;
+    }
+  }
+  *(dittoffi_result_dittoffi_sync_subscription_ptr **)&jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_delete_1dittoffi_1result_1dittoffi_1sync_1subscription_1ptr_1t(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  dittoffi_result_dittoffi_sync_subscription_ptr *arg1 = (dittoffi_result_dittoffi_sync_subscription_ptr *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(dittoffi_result_dittoffi_sync_subscription_ptr **)&jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return ;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return ;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1register_1subscription_1throws(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2, jbyteArray jarg3) {
+  jlong jresult = 0 ;
+  CDitto_t *arg1 = (CDitto_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  slice_ref_uint8_t arg3 ;
+  dittoffi_result_dittoffi_sync_subscription_ptr_t result;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(CDitto_t **)&jarg1; 
+  arg2 = 0;
+  if (jarg2) {
+    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
+    if (!arg2) return 0;
+  }
+  {
+    if (jarg3 == NULL) {
+      arg3 = slice_ref_uint8_t {
+        .ptr = (uint8_t const *) NULL,
+        .len = (size_t) 0,
+      };
+    } else {
+      uint8_t const *ptr = (uint8_t const *) jenv->GetByteArrayElements(jarg3, NULL);
+      do {
+        if (!(ptr != NULL)) {
+          SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Failed to get byte array elements");          
+        }      
+      } while (0) ;
+      auto length = jenv->GetArrayLength(jarg3);
+      do {
+        if (!(length >= 0)) {
+          SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Failed to get byte array length");          
+        }      
+      } while (0) ;
+      
+      arg3 = slice_ref_uint8_t {
+        .ptr = ptr,
+        .len = (size_t) length,
+      };
+    }
+  }
   {
     try {
-      result = dittoffi_store_register_observer_throws((CDitto const *)arg1,(char const *)arg2,SWIG_STD_MOVE(arg3),SWIG_STD_MOVE(arg4));
+      result = dittoffi_sync_register_subscription_throws((CDitto const *)arg1,(char const *)arg2,SWIG_STD_MOVE(arg3));
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
       return 0;
@@ -30939,7 +30710,7 @@ SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_
       return 0;
     }
   }
-  *(dittoffi_result_dittoffi_store_observer_ptr_t **)&jresult = new dittoffi_result_dittoffi_store_observer_ptr_t(result); 
+  *(dittoffi_result_dittoffi_sync_subscription_ptr_t **)&jresult = new dittoffi_result_dittoffi_sync_subscription_ptr_t(result); 
   if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
   {
     // Free the allocation from `GetByteArrayElements`
@@ -30951,137 +30722,38 @@ SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_
 }
 
 
-SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1store_1transactions(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jbyteArray jresult = 0 ;
-  dittoffi_store_t *arg1 = (dittoffi_store_t *) 0 ;
-  dittoffi_cbor_data_t result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(dittoffi_store_t **)&jarg1; 
-  {
-    try {
-      result = dittoffi_store_transactions((CDitto const *)arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return 0;
-    }
-  }
-  {
-    if ((&result)->ptr != NULL) {
-      jresult = jenv->NewByteArray((&result)->len);
-      jenv->SetByteArrayRegion(jresult, 0, (&result)->len, (jbyte *)(&result)->ptr);
-      // We do not call `ditto_c_bytes_free(result);` here since the `ret` typemap
-      // takes care of that.
-    } else {
-      jresult = jenv->NewByteArray(0);
-    }
-  }
-  {
-    if ((&result)->ptr != NULL) {
-      ditto_c_bytes_free(result);
-    }
-  }
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1result_1dittoffi_1sync_1subscription_1ptr_1t_1error_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  dittoffi_result_dittoffi_sync_subscription_ptr *arg1 = (dittoffi_result_dittoffi_sync_subscription_ptr *) 0 ;
-  dittoffi_error_t *arg2 = (dittoffi_error_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(dittoffi_result_dittoffi_sync_subscription_ptr **)&jarg1; 
-  arg2 = *(dittoffi_error_t **)&jarg2; 
-  if (arg1) (arg1)->error = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1result_1dittoffi_1sync_1subscription_1ptr_1t_1error_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  dittoffi_result_dittoffi_sync_subscription_ptr *arg1 = (dittoffi_result_dittoffi_sync_subscription_ptr *) 0 ;
-  dittoffi_error_t *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(dittoffi_result_dittoffi_sync_subscription_ptr **)&jarg1; 
-  result = (dittoffi_error_t *) ((arg1)->error);
-  *(dittoffi_error_t **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1result_1dittoffi_1sync_1subscription_1ptr_1t_1success_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  dittoffi_result_dittoffi_sync_subscription_ptr *arg1 = (dittoffi_result_dittoffi_sync_subscription_ptr *) 0 ;
-  dittoffi_sync_subscription_t *arg2 = (dittoffi_sync_subscription_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(dittoffi_result_dittoffi_sync_subscription_ptr **)&jarg1; 
-  arg2 = *(dittoffi_sync_subscription_t **)&jarg2; 
-  if (arg1) (arg1)->success = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1result_1dittoffi_1sync_1subscription_1ptr_1t_1success_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  dittoffi_result_dittoffi_sync_subscription_ptr *arg1 = (dittoffi_result_dittoffi_sync_subscription_ptr *) 0 ;
-  dittoffi_sync_subscription_t *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(dittoffi_result_dittoffi_sync_subscription_ptr **)&jarg1; 
-  result = (dittoffi_sync_subscription_t *) ((arg1)->success);
-  *(dittoffi_sync_subscription_t **)&jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_new_1dittoffi_1result_1dittoffi_1sync_1subscription_1ptr_1t(JNIEnv *jenv, jclass jcls) {
-  jlong jresult = 0 ;
-  dittoffi_result_dittoffi_sync_subscription_ptr *result = 0 ;
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1subscription_1cancel(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  dittoffi_sync_subscription_t *arg1 = (dittoffi_sync_subscription_t *) 0 ;
   
   (void)jenv;
   (void)jcls;
+  arg1 = *(dittoffi_sync_subscription_t **)&jarg1; 
   {
     try {
-      result = (dittoffi_result_dittoffi_sync_subscription_ptr *)new dittoffi_result_dittoffi_sync_subscription_ptr();
+      dittoffi_sync_subscription_cancel((dittoffi_sync_subscription const *)arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
+      return ;
     } catch (const std::exception &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
+      return ;
     } catch (...) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return 0;
+      return ;
     }
   }
-  *(dittoffi_result_dittoffi_sync_subscription_ptr **)&jresult = result; 
-  return jresult;
 }
 
 
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_delete_1dittoffi_1result_1dittoffi_1sync_1subscription_1ptr_1t(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  dittoffi_result_dittoffi_sync_subscription_ptr *arg1 = (dittoffi_result_dittoffi_sync_subscription_ptr *) 0 ;
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1subscription_1free(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  dittoffi_sync_subscription_t *arg1 = (dittoffi_sync_subscription_t *) 0 ;
   
   (void)jenv;
   (void)jcls;
-  arg1 = *(dittoffi_result_dittoffi_sync_subscription_ptr **)&jarg1; 
+  arg1 = *(dittoffi_sync_subscription_t **)&jarg1; 
   {
     try {
-      delete arg1;
+      dittoffi_sync_subscription_free(arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
       return ;
@@ -31096,50 +30768,17 @@ SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_delete_1di
 }
 
 
-SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1register_1subscription_1throws(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2, jbyteArray jarg3) {
-  jlong jresult = 0 ;
-  CDitto_t *arg1 = (CDitto_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  slice_ref_uint8_t arg3 ;
-  dittoffi_result_dittoffi_sync_subscription_ptr_t result;
+SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1subscription_1id(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jbyteArray jresult = 0 ;
+  dittoffi_sync_subscription_t *arg1 = (dittoffi_sync_subscription_t *) 0 ;
+  slice_boxed_uint8_t result;
   
   (void)jenv;
   (void)jcls;
-  arg1 = *(CDitto_t **)&jarg1; 
-  arg2 = 0;
-  if (jarg2) {
-    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
-    if (!arg2) return 0;
-  }
-  {
-    if (jarg3 == NULL) {
-      arg3 = slice_ref_uint8_t {
-        .ptr = (uint8_t const *) NULL,
-        .len = (size_t) 0,
-      };
-    } else {
-      uint8_t const *ptr = (uint8_t const *) jenv->GetByteArrayElements(jarg3, NULL);
-      do {
-        if (!(ptr != NULL)) {
-          SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Failed to get byte array elements");          
-        }      
-      } while (0) ;
-      auto length = jenv->GetArrayLength(jarg3);
-      do {
-        if (!(length >= 0)) {
-          SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Failed to get byte array length");          
-        }      
-      } while (0) ;
-      
-      arg3 = slice_ref_uint8_t {
-        .ptr = ptr,
-        .len = (size_t) length,
-      };
-    }
-  }
+  arg1 = *(dittoffi_sync_subscription_t **)&jarg1; 
   {
     try {
-      result = dittoffi_sync_register_subscription_throws((CDitto const *)arg1,(char const *)arg2,SWIG_STD_MOVE(arg3));
+      result = dittoffi_sync_subscription_id((dittoffi_sync_subscription const *)arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
       return 0;
@@ -31151,65 +30790,53 @@ SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_
       return 0;
     }
   }
-  *(dittoffi_result_dittoffi_sync_subscription_ptr_t **)&jresult = new dittoffi_result_dittoffi_sync_subscription_ptr_t(result); 
-  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
   {
-    // Free the allocation from `GetByteArrayElements`
-    if (jarg3 != NULL) {
-      jenv->ReleaseByteArrayElements(jarg3, (jbyte *)(&arg3)->ptr, JNI_ABORT);
+    if ((&result)->ptr != NULL) {
+      jresult = jenv->NewByteArray((&result)->len);
+      jenv->SetByteArrayRegion(jresult, 0, (&result)->len, (jbyte *)(&result)->ptr);
+      // We do not call `ditto_c_bytes_free(result);` here since the `ret` typemap
+      // takes care of that.
+    } else {
+      jresult = jenv->NewByteArray(0);
     }
   }
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1subscription_1cancel(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  dittoffi_sync_subscription_t *arg1 = (dittoffi_sync_subscription_t *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(dittoffi_sync_subscription_t **)&jarg1; 
   {
-    try {
-      dittoffi_sync_subscription_cancel((dittoffi_sync_subscription const *)arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
+    if ((&result)->ptr != NULL) {
+      ditto_c_bytes_free(result);
     }
   }
+  return jresult;
 }
 
 
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1subscription_1free(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jboolean JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1subscription_1is_1cancelled(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jboolean jresult = 0 ;
   dittoffi_sync_subscription_t *arg1 = (dittoffi_sync_subscription_t *) 0 ;
+  bool result;
   
   (void)jenv;
   (void)jcls;
   arg1 = *(dittoffi_sync_subscription_t **)&jarg1; 
   {
     try {
-      dittoffi_sync_subscription_free(arg1);
+      result = (bool)dittoffi_sync_subscription_is_cancelled((dittoffi_sync_subscription const *)arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
+      return 0;
     } catch (const std::exception &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
+      return 0;
     } catch (...) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
+      return 0;
     }
   }
+  jresult = (jboolean)result; 
+  return jresult;
 }
 
 
-SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1subscription_1id(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1subscription_1query_1arguments_1cbor(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   jbyteArray jresult = 0 ;
   dittoffi_sync_subscription_t *arg1 = (dittoffi_sync_subscription_t *) 0 ;
   slice_boxed_uint8_t result;
@@ -31219,7 +30846,7 @@ SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditt
   arg1 = *(dittoffi_sync_subscription_t **)&jarg1; 
   {
     try {
-      result = dittoffi_sync_subscription_id((dittoffi_sync_subscription const *)arg1);
+      result = dittoffi_sync_subscription_query_arguments_cbor((dittoffi_sync_subscription const *)arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
       return 0;
@@ -31250,34 +30877,7 @@ SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditt
 }
 
 
-SWIGEXPORT jboolean JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1subscription_1is_1cancelled(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jboolean jresult = 0 ;
-  dittoffi_sync_subscription_t *arg1 = (dittoffi_sync_subscription_t *) 0 ;
-  bool result;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(dittoffi_sync_subscription_t **)&jarg1; 
-  {
-    try {
-      result = (bool)dittoffi_sync_subscription_is_cancelled((dittoffi_sync_subscription const *)arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return 0;
-    }
-  }
-  jresult = (jboolean)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1subscription_1query_1arguments(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1sync_1subscription_1query_1arguments_1json(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   jbyteArray jresult = 0 ;
   dittoffi_sync_subscription_t *arg1 = (dittoffi_sync_subscription_t *) 0 ;
   slice_boxed_uint8_t result;
@@ -31287,7 +30887,7 @@ SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditt
   arg1 = *(dittoffi_sync_subscription_t **)&jarg1; 
   {
     try {
-      result = dittoffi_sync_subscription_query_arguments((dittoffi_sync_subscription const *)arg1);
+      result = dittoffi_sync_subscription_query_arguments_json((dittoffi_sync_subscription const *)arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
       return 0;
@@ -31341,6 +30941,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoff
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -35193,7 +34798,7 @@ SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_swig_1modu
   static struct {
     const char *method;
     const char *signature;
-  } methods[125] = {
+  } methods[119] = {
     {
       "SwigDirector_Retainable_java_retain", "(Llive/ditto/internal/swig/ffi/Retainable;)V" 
     },
@@ -35527,30 +35132,12 @@ SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_swig_1modu
     {
       "SwigDirector_PresenceRust_java_release", "(Llive/ditto/internal/swig/ffi/PresenceRust;)V" 
     },
-    {
-      "SwigDirector_PresenceRust_v1Callback", "(Llive/ditto/internal/swig/ffi/PresenceRust;Ljava/lang/String;)V" 
-    },
-    {
-      "SwigDirector_PresenceRust_v2Callback", "(Llive/ditto/internal/swig/ffi/PresenceRust;Ljava/lang/String;)V" 
-    },
     {
       "SwigDirector_PresenceRust_v3Callback", "(Llive/ditto/internal/swig/ffi/PresenceRust;Ljava/lang/String;)V" 
     },
-    {
-      "SwigDirector_PresenceRust_register_v1", "(Llive/ditto/internal/swig/ffi/PresenceRust;)V" 
-    },
-    {
-      "SwigDirector_PresenceRust_register_v2", "(Llive/ditto/internal/swig/ffi/PresenceRust;)V" 
-    },
     {
       "SwigDirector_PresenceRust_register_v3", "(Llive/ditto/internal/swig/ffi/PresenceRust;)V" 
     },
-    {
-      "SwigDirector_PresenceRust_requestV1Update", "(Llive/ditto/internal/swig/ffi/PresenceRust;)V" 
-    },
-    {
-      "SwigDirector_PresenceRust_requestV2Update", "(Llive/ditto/internal/swig/ffi/PresenceRust;)V" 
-    },
     {
       "SwigDirector_PresenceRust_requestV3Update", "(Llive/ditto/internal/swig/ffi/PresenceRust;)V" 
     },