Prepare SharkNetMessage to be used in SN2 Android App

Author: thsc42

src/net/sharksystem/asap/sharknet/SharkNetMessage.java

@@ -165,7 +165,7 @@ static byte[] serializeMessage(byte[] content, CharSequence topic, Set<CharSeque
         return baos.toByteArray();
     }
 
-    static SharkNetMessage parseMessage(byte[] message, String sender, String uri,
+    public static SharkNetMessage parseMessage(byte[] message, String uri,
                 CharSequence ownerID, BasicKeyStore basicKeyStore) throws IOException, ASAPException {
 
         ByteArrayInputStream bais = new ByteArrayInputStream(message);

src/net/sharksystem/asap/sharknet/SharkNetPeerFS.java

@@ -72,7 +72,7 @@ public void chunkReceived(String format, String sender, String uri, int era) thr
                 // deserialize SNMessage
                 try {
                     SharkNetMessage snMessage =
-                        SharkNetMessage.parseMessage(message, sender, uri, this.getOwnerID(), this.basicKeyStore);
+                        SharkNetMessage.parseMessage(message, uri, this.getOwnerID(), this.basicKeyStore);
 
                     // we have anything - tell listeners
                     for(SharkNetMessageListener l : this.snListenerSet) {

test/net/sharksystem/asap/sharknet/SharkNetMessageASAPSerializationTests.java

@@ -25,7 +25,7 @@ public void serializationTestPlain() throws ASAPException, IOException {
                 MESSAGE.getBytes(), URI, BOB_ID, false, false, ALICE_ID, null);
 
         SharkNetMessage sharkNetMessage =
-                SharkNetMessage.parseMessage(serializedSNMessage, ALICE_ID, URI, BOB_ID, null);
+                SharkNetMessage.parseMessage(serializedSNMessage, URI, BOB_ID, null);
 
         Assert.assertEquals(MESSAGE, new String(sharkNetMessage.getContent()));
         Assert.assertEquals(ALICE_ID, sharkNetMessage.getSender());
@@ -45,7 +45,7 @@ public void serializationTestSigned() throws ASAPException, IOException {
                 MESSAGE.getBytes(), URI, BOB_ID, true, false, ALICE_ID, keyStorageAlice);
 
         SharkNetMessage sharkNetMessage =
-                SharkNetMessage.parseMessage(serializedSNMessage, ALICE_ID, URI, BOB_ID, keyStorageBob);
+                SharkNetMessage.parseMessage(serializedSNMessage, URI, BOB_ID, keyStorageBob);
 
         Assert.assertEquals(MESSAGE, new String(sharkNetMessage.getContent()));
         Assert.assertEquals(ALICE_ID, sharkNetMessage.getSender());
@@ -64,7 +64,7 @@ public void serializationTestSignedNotVerified() throws ASAPException, IOExcepti
                 MESSAGE.getBytes(), URI, BOB_ID, true, false, ALICE_ID, keyStorageAlice);
 
         SharkNetMessage sharkNetMessage =
-                SharkNetMessage.parseMessage(serializedSNMessage, ALICE_ID, URI, BOB_ID, keyStorageBob);
+                SharkNetMessage.parseMessage(serializedSNMessage, URI, BOB_ID, keyStorageBob);
 
         Assert.assertEquals(MESSAGE, new String(sharkNetMessage.getContent()));
         Assert.assertEquals(ALICE_ID, sharkNetMessage.getSender());
@@ -84,7 +84,7 @@ public void serializationTestEncrypted() throws ASAPException, IOException {
                 MESSAGE.getBytes(), URI, BOB_ID, false, true, ALICE_ID, keyStorageAlice);
 
         SharkNetMessage sharkNetMessage =
-                SharkNetMessage.parseMessage(serializedSNMessage, ALICE_ID, URI, BOB_ID, keyStorageBob);
+                SharkNetMessage.parseMessage(serializedSNMessage, URI, BOB_ID, keyStorageBob);
 
         Assert.assertEquals(MESSAGE, new String(sharkNetMessage.getContent()));
         Assert.assertEquals(ALICE_ID, sharkNetMessage.getSender());
@@ -104,7 +104,7 @@ public void serializationTestEncryptedAndSigned() throws ASAPException, IOExcept
                 MESSAGE.getBytes(), URI, BOB_ID, true, true, ALICE_ID, keyStorageAlice);
 
         SharkNetMessage sharkNetMessage =
-                SharkNetMessage.parseMessage(serializedSNMessage, ALICE_ID, URI, BOB_ID, keyStorageBob);
+                SharkNetMessage.parseMessage(serializedSNMessage, URI, BOB_ID, keyStorageBob);
 
         Assert.assertEquals(MESSAGE, new String(sharkNetMessage.getContent()));
         Assert.assertEquals(ALICE_ID, sharkNetMessage.getSender());
@@ -135,7 +135,7 @@ public void snTestSignedMultipleRecipients() throws ASAPException, IOException,
 
         // parse
         SharkNetMessage receivedMessage =
-                SharkNetMessage.parseMessage(asapMessage, ALICE_ID, URI, ALICE_ID, keyStorageBob);
+                SharkNetMessage.parseMessage(asapMessage, URI, ALICE_ID, keyStorageBob);
 
         Assert.assertEquals(MESSAGE, new String(receivedMessage.getContent()));
         Assert.assertEquals(2, receivedMessage.getRecipients().size());