introduced ASAPHop - makes SharkMessenger API easier to understand. Makes difference between E2E and Point2Point more obvious. At least I hope so.

Author: thsc42

src/net/sharksystem/ASAPHopImpl.java

@@ -35,4 +35,27 @@ public boolean verified() {
     public boolean encrypted() {
         return this.encrypted;
     }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("sender: ");
+        sb.append(this.sender);
+        sb.append(" | ");
+        sb.append("verified: ");
+        sb.append(this.verified);
+        sb.append(" | ");
+        sb.append("encrypted: ");
+        sb.append(this.encrypted);
+        sb.append(" | ");
+        sb.append("connectionType: ");
+        switch (this.connectionType) {
+            case ONION_NETWORK: sb.append("onionNetwork"); break;
+            case ASAP_HUB: sb.append("ASAP Hub"); break;
+            case AD_HOC_LAYER_2_NETWORK: sb.append("Ad-hoc protocol"); break;
+            case INTERNET: sb.append("Internet"); break;
+            default: sb.append("unknown"); break;
+        }
+
+        return sb.toString();
+    }
 }

src/net/sharksystem/asap/utils/ASAPSerialization.java

@@ -1,10 +1,13 @@
 package net.sharksystem.asap.utils;
 
+import net.sharksystem.ASAPHopImpl;
 import net.sharksystem.asap.ASAPException;
+import net.sharksystem.asap.ASAPHop;
+import net.sharksystem.asap.ASAPPeer;
+import net.sharksystem.asap.EncounterConnectionType;
+import net.sharksystem.utils.Log;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -223,4 +226,57 @@ public static Set<CharSequence> readCharSequenceSetParameter(InputStream is) thr
 
         return charSet;
     }
+
+    public static EncounterConnectionType readEncounterConnectionType(InputStream is) throws IOException, ASAPException {
+        byte readByte = ASAPSerialization.readByte(is);
+        switch(readByte) {
+            case 1: return EncounterConnectionType.ASAP_HUB;
+            case 2: return EncounterConnectionType.AD_HOC_LAYER_2_NETWORK;
+            case 3: return EncounterConnectionType.ONION_NETWORK;
+            case 4: return EncounterConnectionType.INTERNET;
+            default:
+                Log.writeLogErr(ASAPSerialization.class, "unknown encounter connection type: " + readByte);
+        }
+        // default
+        return EncounterConnectionType.UNKNOWN;
+    }
+
+    public static void writeEncounterConnectionType(EncounterConnectionType connectionType, OutputStream os) throws IOException {
+        switch(connectionType) {
+            case ASAP_HUB: ASAPSerialization.writeByteParameter((byte) 1, os); break;
+            case AD_HOC_LAYER_2_NETWORK: ASAPSerialization.writeByteParameter((byte) 2, os); break;
+            case ONION_NETWORK: ASAPSerialization.writeByteParameter((byte) 3, os); break;
+            case INTERNET: ASAPSerialization.writeByteParameter((byte) 4, os); break;
+            case UNKNOWN:
+            default: ASAPSerialization.writeByteParameter((byte) 0, os);
+        }
+    }
+
+    public static void writeBooleanParameter(boolean value, OutputStream os) throws IOException {
+        if(value) ASAPSerialization.writeByteParameter((byte) 1, os);
+        ASAPSerialization.writeByteParameter((byte) 0, os);
+    }
+
+    public static boolean readBooleanParameter(InputStream is) throws IOException, ASAPException {
+        return ASAPSerialization.readByte(is) == 1;
+    }
+
+    public static byte[] asapHop2ByteArray(ASAPHop asapHop) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ASAPSerialization.writeCharSequenceParameter(asapHop.sender(), baos);
+        ASAPSerialization.writeBooleanParameter(asapHop.verified(), baos);
+        ASAPSerialization.writeBooleanParameter(asapHop.encrypted(), baos);
+        ASAPSerialization.writeEncounterConnectionType(asapHop.getConnectionType(), baos);
+        return baos.toByteArray();
+    }
+
+    public static ASAPHop byteArray2ASAPHop(byte[] bytes) throws IOException, ASAPException {
+        ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+        return new ASAPHopImpl(
+            ASAPSerialization.readCharSequenceParameter(bais),
+            ASAPSerialization.readBooleanParameter(bais),
+            ASAPSerialization.readBooleanParameter(bais),
+            ASAPSerialization.readEncounterConnectionType(bais)
+        );
+    }
 }