From 7914becf61e4fbba986fab1992d6884bcec5a688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?= <leviathan@libresilicon.com>
Date: Thu, 21 Oct 2021 03:19:28 +0100
Subject: [PATCH] WIP: Adapting to API changes

---
 src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc b/src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc
index 80bcdf0..1b7498e 100644
--- a/src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc
+++ b/src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc
@@ -1,4 +1,7 @@
+#include <cassert>
+
 #include "foundation_pEp_jniadapter_AbstractEngine.h"
+#include <pEp/Adapter.hh>
 #include <pEp/keymanagement.h>
 #include <pEp/message_api.h>
 #include <pEp/sync_api.h>
@@ -257,7 +260,7 @@ JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine_init(JNIEnv
         jni_init();
         objj = env->NewGlobalRef(obj);
         callback_dispatcher.add(messageToSend, notifyHandshake, JNISync::onSyncStartup, JNISync::onSyncShutdown);
-        Adapter::_messageToSend = CallbackDispatcher::messageToSend;
+        Adapter::session._messageToSend = CallbackDispatcher::messageToSend;
     }
 
     create_engine_java_object_mutex(env, obj);  // Create a mutex per java object
@@ -270,7 +273,7 @@ JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine_release(JNI
     std::lock_guard<std::mutex> l(global_mutex);  // global mutex for write access to <unordered_map>
     pEpLog("called");
     release_engine_java_object_mutex(env, obj);
-    Adapter::session(pEp::Adapter::release);
+    Adapter::session.release();
 }
 
 JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine__1setDebugLogEnabled(
@@ -337,7 +340,7 @@ JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine__1startSync
     std::lock_guard<std::mutex> l(*mutex_local);
 
     try {
-        CallbackDispatcher::start_sync();
+        Adapter::start_sync();
     } catch (RuntimeError& ex) {
         throw_pEp_Exception(env, ex.status);
         return;
@@ -355,7 +358,7 @@ JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine__1stopSync(
     }
     std::lock_guard<std::mutex> l(*mutex_local);
 
-    CallbackDispatcher::stop_sync();
+    Adapter::stop_sync();
 }
 
 JNIEXPORT jboolean JNICALL Java_foundation_pEp_jniadapter_AbstractEngine__1isSyncRunning(JNIEnv *env,