From fb38830afac8851fcfaf62182a5495c0eb21dd82 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Tue, 7 Jul 2020 17:53:32 +0200 Subject: [PATCH 1/3] JNI-111 Add missing sync signal --- src/pEp.yml2 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pEp.yml2 b/src/pEp.yml2 index ca00095..8810026 100644 --- a/src/pEp.yml2 +++ b/src/pEp.yml2 @@ -68,6 +68,7 @@ namespace pEp { sync_notify_accepted_device_accepted > 8 // sync_notify_overtaken > 9 // sync_notify_forming_group > 10 + sync_passphrase_required > 128 sync_notify_sole > 254 sync_notify_in_group > 255 }; From 921d77cad3fa24432548eb9c3285180dc1cf770c Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Tue, 7 Jul 2020 17:59:34 +0200 Subject: [PATCH 2/3] JNI-111 Rethrow Java exceptions to the JVM during notifyHandshake. --- src/foundation_pEp_jniadapter_AbstractEngine.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/foundation_pEp_jniadapter_AbstractEngine.cc b/src/foundation_pEp_jniadapter_AbstractEngine.cc index 3db137c..93ee0b1 100644 --- a/src/foundation_pEp_jniadapter_AbstractEngine.cc +++ b/src/foundation_pEp_jniadapter_AbstractEngine.cc @@ -164,6 +164,7 @@ PEP_STATUS notifyHandshake(pEp_identity *me, pEp_identity *partner, sync_handsha PEP_STATUS status = (PEP_STATUS) JNISync::env()->CallIntMethod(objj, notifyHandShakeMethodID, me_, partner_, signal_); if (JNISync::env()->ExceptionCheck()) { + JNISync::env()->Throw(JNISync::env()->ExceptionOccurred()); JNISync::env()->ExceptionClear(); return PEP_UNKNOWN_ERROR; } From 8bb506c94c4db3d92180fa4b15f6d61ee66f61bd Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Tue, 7 Jul 2020 18:05:43 +0200 Subject: [PATCH 3/3] JNI-111 Accept null partner during notifyHandshake --- src/foundation/pEp/jniadapter/AbstractEngine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/foundation/pEp/jniadapter/AbstractEngine.java b/src/foundation/pEp/jniadapter/AbstractEngine.java index f492ccb..323461a 100644 --- a/src/foundation/pEp/jniadapter/AbstractEngine.java +++ b/src/foundation/pEp/jniadapter/AbstractEngine.java @@ -175,7 +175,8 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AutoClosea public int notifyHandshakeCallFromC(_Identity _myself, _Identity _partner, SyncHandshakeSignal _signal) { Identity myself = new Identity(_myself); - Identity partner = new Identity(_partner); + Identity partner = (_partner != null) ? new Identity(_partner) : null; + System.out.println("pEpSync" +"notifyHandshakeCallFromC: " + notifyHandshakeCallback); if (notifyHandshakeCallback != null) { notifyHandshakeCallback.notifyHandshake(myself, partner, _signal);