diff --git a/src/foundation/pEp/jniadapter/AbstractEngine.java b/src/foundation/pEp/jniadapter/AbstractEngine.java index fa45755..9b14e52 100644 --- a/src/foundation/pEp/jniadapter/AbstractEngine.java +++ b/src/foundation/pEp/jniadapter/AbstractEngine.java @@ -22,6 +22,9 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AbstractEn private native void init(); private native void release(); + private long keyserverThread; + private long keyserverQueue; + public AbstractEngine() throws pEpException { synchronized (AbstractEngine.class) { init(); @@ -46,9 +49,6 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AbstractEn return _getProtocolVersion(); } - private long keyserverThread; - private long keyserverQueue; - private native void _startKeyserverLookup(); public void startKeyserverLookup() { @@ -79,7 +79,6 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AbstractEn return _isSyncRunning(); } - public void setMessageToSendCallback(Sync.MessageToSendCallback messageToSendCallback) { this.messageToSendCallback = messageToSendCallback; } @@ -92,7 +91,7 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AbstractEn this.needsFastPollCallback = needsFastPollCallback; } - public int needsFastPollCallFromC(boolean fast_poll_needed) { + private int needsFastPollCallFromC(boolean fast_poll_needed) { if (needsFastPollCallback != null) { needsFastPollCallback.needsFastPollCallFromC(fast_poll_needed); } else { @@ -101,7 +100,7 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AbstractEn return 0; } - public int notifyHandshakeCallFromC(_Identity _myself, _Identity _partner, SyncHandshakeSignal _signal) { + private int notifyHandshakeCallFromC(_Identity _myself, _Identity _partner, SyncHandshakeSignal _signal) { Identity myself = new Identity(_myself); Identity partner = new Identity(_partner); System.out.println("pEpSync" + "notifyHandshakeCallFromC: " + notifyHandshakeCallback); @@ -113,7 +112,7 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AbstractEn return 0; } - public int messageToSendCallFromC(Message message) { + private int messageToSendCallFromC(Message message) { System.out.println("pEpSync" + "messageToSendCallFromC: " + messageToSendCallback); if (messageToSendCallback != null) { messageToSendCallback.messageToSend(message); diff --git a/src/foundation/pEp/jniadapter/AbstractEngineInterface.java b/src/foundation/pEp/jniadapter/AbstractEngineInterface.java index 9b13206..7ad20f0 100644 --- a/src/foundation/pEp/jniadapter/AbstractEngineInterface.java +++ b/src/foundation/pEp/jniadapter/AbstractEngineInterface.java @@ -21,11 +21,5 @@ public interface AbstractEngineInterface { public void setNeedsFastPollCallback(Sync.NeedsFastPollCallback needsFastPollCallback); - public int needsFastPollCallFromC(boolean fast_poll_needed); - - public int notifyHandshakeCallFromC(_Identity _myself, _Identity _partner, SyncHandshakeSignal _signal); - - public int messageToSendCallFromC(Message message); - public Message incomingMessageFromPGPText(String pgpText, Message.EncFormat encFormat); }