Browse Source

Formatting only

JNI-106
heck 5 years ago
parent
commit
50abf8f827
  1. 20
      src/foundation/pEp/jniadapter/AbstractEngine.java
  2. 15
      src/foundation/pEp/jniadapter/Blob.java
  3. 13
      src/foundation/pEp/jniadapter/Identity.java
  4. 3
      src/foundation/pEp/jniadapter/Sync.java

20
src/foundation/pEp/jniadapter/AbstractEngine.java

@ -37,48 +37,52 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AbstractEn
} }
} }
private native String _getVersion();
public String getVersion() { public String getVersion() {
return _getVersion(); return _getVersion();
} }
private native String _getProtocolVersion(); private native String _getVersion();
public String getProtocolVersion() { public String getProtocolVersion() {
return _getProtocolVersion(); return _getProtocolVersion();
} }
private native void _startKeyserverLookup(); private native String _getProtocolVersion();
public void startKeyserverLookup() { public void startKeyserverLookup() {
_startKeyserverLookup(); _startKeyserverLookup();
} }
private native void _stopKeyserverLookup(); private native void _startKeyserverLookup();
public void stopKeyserverLookup() { public void stopKeyserverLookup() {
_startKeyserverLookup(); _startKeyserverLookup();
} }
private native void _startSync(); private native void _stopKeyserverLookup();
public void startSync() { public void startSync() {
_startSync(); _startSync();
} }
private native void _stopSync(); private native void _startSync();
public void stopSync() { public void stopSync() {
_stopSync(); _stopSync();
} }
private native boolean _isSyncRunning(); private native void _stopSync();
public boolean isSyncRunning() { public boolean isSyncRunning() {
return _isSyncRunning(); return _isSyncRunning();
} }
private native boolean _isSyncRunning();
// Callbacks
public void setMessageToSendCallback(Sync.MessageToSendCallback messageToSendCallback) { public void setMessageToSendCallback(Sync.MessageToSendCallback messageToSendCallback) {
this.messageToSendCallback = messageToSendCallback; this.messageToSendCallback = messageToSendCallback;
} }

15
src/foundation/pEp/jniadapter/Blob.java

@ -11,10 +11,18 @@ public class Blob implements BlobInterface, Serializable {
mime_type = "application/octet-stream"; mime_type = "application/octet-stream";
} }
/** Human readable string representation of Blob. Blob(_Blob b) {
data = b.data;
mime_type = Utils.toUTF16(b.mime_type);
filename = Utils.toUTF16(b.filename);
}
/**
* Human readable string representation of Blob.
* The data field is ASN.1 XER decoded for mime_types: * The data field is ASN.1 XER decoded for mime_types:
* "application/pEp.sync" * "application/pEp.sync"
* "application/pEp.keyreset" * "application/pEp.keyreset"
*
* @return String Blob as String * @return String Blob as String
*/ */
public String toString() { public String toString() {
@ -27,10 +35,5 @@ public class Blob implements BlobInterface, Serializable {
return ret; return ret;
} }
Blob(_Blob b) {
data = b.data;
mime_type = Utils.toUTF16(b.mime_type);
filename = Utils.toUTF16(b.filename);
}
} }

13
src/foundation/pEp/jniadapter/Identity.java

@ -33,17 +33,16 @@ public class Identity implements IdentityInterface, Serializable {
flags = i.flags; flags = i.flags;
} }
@Override public Rating getRating() {
public String toString() { return Rating.getByInt(_getRating(comm_type.value));
return address + "::" + username + "\n" +
user_id + "::" + fpr;
} }
// Native
private native int _getRating(int commType); private native int _getRating(int commType);
public Rating getRating() { @Override
return Rating.getByInt(_getRating(comm_type.value)); public String toString() {
return address + "::" + username + "\n" +
user_id + "::" + fpr;
} }
} }

3
src/foundation/pEp/jniadapter/Sync.java

@ -20,8 +20,7 @@ public interface Sync {
} }
public class DefaultCallback public class DefaultCallback implements Sync.MessageToSendCallback, Sync.NotifyHandshakeCallback, Sync.NeedsFastPollCallback {
implements Sync.MessageToSendCallback, Sync.NotifyHandshakeCallback, Sync.NeedsFastPollCallback {
@Override @Override
public void needsFastPollCallFromC(Boolean fast_poll_needed) { public void needsFastPollCallFromC(Boolean fast_poll_needed) {
System.out.println("Need fast Poll"); System.out.println("Need fast Poll");

Loading…
Cancel
Save