peer id and name ist bot the same.

Author: thsc42

src/main/java/net/sharksystem/asap/ASAPPeer.java

@@ -1,5 +1,8 @@
 package net.sharksystem.asap;
 
+import net.sharksystem.SharkException;
+import net.sharksystem.fs.ExtraData;
+
 import java.io.IOException;
 
 public interface ASAPPeer extends
@@ -67,4 +70,6 @@ ASAPConnection handleConnection(InputStream is, OutputStream os, boolean encrypt
      * @throws ASAPException key never used in putExtra
      */
     byte[] getExtra(CharSequence key) throws ASAPException, IOException;
+
+    ExtraData getExtraData() throws SharkException, IOException;
 }

src/main/java/net/sharksystem/asap/ASAPPeerFS.java

@@ -1,7 +1,9 @@
 package net.sharksystem.asap;
 
+import net.sharksystem.SharkException;
 import net.sharksystem.asap.engine.*;
 import net.sharksystem.asap.utils.ASAPLogHelper;
+import net.sharksystem.fs.ExtraData;
 import net.sharksystem.utils.Log;
 
 import javax.swing.*;
@@ -159,4 +161,9 @@ public void sendTransientASAPMessage(CharSequence nextHopPeerID,
     public String toString() {
         return this.getInternalPeer().getOwner().toString();
     }
+
+    @Override
+    public ExtraData getExtraData() throws SharkException, IOException {
+        return this.getInternalPeer().getExtraData();
+    }
 }

src/main/java/net/sharksystem/asap/engine/ASAPInternalPeer.java

@@ -1,5 +1,6 @@
 package net.sharksystem.asap.engine;
 
+import net.sharksystem.SharkException;
 import net.sharksystem.asap.ASAPConnectionHandler;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPSecurityException;
@@ -155,5 +156,7 @@ void sendOnlineASAPAssimilateMessage(CharSequence format, CharSequence urlTarget
 
     ASAPKeyStore getASAPKeyStore() throws ASAPSecurityException;
 
+    ExtraData getExtraData() throws SharkException, IOException;
+
     void setSecurityAdministrator(DefaultSecurityAdministrator securityAdministrator);
 }

src/main/java/net/sharksystem/asap/engine/ASAPInternalPeerFS.java

@@ -700,7 +700,7 @@ public ASAPKeyStore getASAPKeyStore() throws ASAPSecurityException {
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////
     private ExtraData extraData = null;
 
-    private ExtraData getExtraData() throws SharkException, IOException {
+    public ExtraData getExtraData() throws SharkException, IOException {
         if(this.extraData == null) {
             this.extraData = new ExtraDataFS(this.rootFolderName);
         }

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

@@ -17,6 +17,17 @@ public class ASAPSerialization {
     public static final short BLANK_LEFT_SHORT = 0x00FF;
     public static final short BLANK_RIGHT_SHORT = (short) 0xFF00;
 
+    public static String byteArray2String(byte[] serializedString) throws IOException, ASAPException {
+        ByteArrayInputStream bais = new ByteArrayInputStream(serializedString);
+        return readCharSequenceParameter(bais);
+    }
+
+    public static byte[] string2byteArray(CharSequence charSequence2Serialize) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        writeCharSequenceParameter(charSequence2Serialize, baos);
+        return baos.toByteArray();
+    }
+
     public static void writeByteArray(byte[] bytes2Write, OutputStream os) throws IOException {
         if(bytes2Write == null) {
             writeNonNegativeIntegerParameter(0, os);

src/main/java/net/sharksystem/utils/Utils.java

@@ -123,4 +123,19 @@ public static String calendar2String(Calendar calendarObject) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS Z");
         return dateFormat.format(calendarObject.getTime());
     }
+
+    public static String getStringByStringList(List<String> list) {
+        if(list == null || list.isEmpty()) return "empty list";
+        StringBuilder sb = new StringBuilder();
+        int i = 0;
+        boolean first = true;
+        for(String o : list) {
+            if(first) first = false;
+            else sb.append(", ");
+            sb.append(i++);
+            sb.append(": ");
+            sb.append(o);
+        }
+        return sb.toString();
+    }
 }