ready to start debugging sn channels

Author: thsc42

.idea/caches/build_file_checksums.ser

@@ -11,7 +11,8 @@
 import net.sharksystem.SharkException;
 import net.sharksystem.android.ASAPChannelIntent;
 import net.sharksystem.asap.ASAPException;
-import net.sharksystem.asap.sharknet.SharkNetMessage;
+import net.sharksystem.asap.sharknet.InMemoSNMessage;
+import net.sharksystem.asap.sharknet.SNMessage;
 import net.sharksystem.crypto.BasicKeyStore;
 
 import java.io.IOException;
@@ -58,7 +59,7 @@ public void onAddClick(View view) {
         } else {
             try {
 
-                // let's sort the things out.
+                // let's sort things out.
                 CharSequence topic = this.uri;
                 CharSequence sender =
                         SNChannelsComponent.getSharkNetChannelComponent().getOwnerID();
@@ -71,20 +72,9 @@ public void onAddClick(View view) {
 
                 byte[] content = "TestContent".getBytes();  // TODO must come from GUI
 
-                // create sn message
-                SharkNetMessage snMessage;
-
-                if(recipients.size() < 2) {
-                    snMessage = new SharkNetMessage(
-                            content, topic, sender, recipients.iterator().next(),
-                            sign, encrypt, basicKeyStore);
-                } else { // more recipients
-                    snMessage = new SharkNetMessage(
-                            content, topic, sender, recipients, sign, basicKeyStore);
-                }
-
-                // serialize
-                byte[] serializedMessage = snMessage.getSerializedMessage();
+                byte[] serializedMessage = null;
+                    serializedMessage = InMemoSNMessage.serializeMessage(
+                            content, sender, recipients, sign, encrypt, basicKeyStore);
 
                 // deliver as asap message
                 this.sendASAPMessage(SNChannelsComponent.APP_NAME, this.uri,

.idea/codeStyles/Project.xml

@@ -11,7 +11,8 @@
 import net.sharksystem.R;
 import net.sharksystem.asap.ASAPChannel;
 import net.sharksystem.asap.ASAPException;
-import net.sharksystem.asap.sharknet.SharkNetMessage;
+import net.sharksystem.asap.sharknet.InMemoSNMessage;
+import net.sharksystem.asap.sharknet.SNMessage;
 import net.sharksystem.crypto.BasicKeyStore;
 import net.sharksystem.makan.Makan;
 import net.sharksystem.makan.android.MakanApp;
@@ -75,14 +76,11 @@ public static SharkNetMessage parseMessage(byte[] message, String sender, String
                 CharSequence ownerID, BasicKeyStore basicKeyStore) throws IOException, ASAPException {
  */
             CharSequence sender;
-            String uri = this.asapChannel.getUri().toString();
-            CharSequence ownerID = SNChannelsComponent.getSharkNetChannelComponent().getOwnerID();
-
             BasicKeyStore basicKeyStore =
                     SNChannelsComponent.getSharkNetChannelComponent().getBasicKeyStore();
 
-            SharkNetMessage snMessage =
-                    SharkNetMessage.parseMessage(asapMessage, uri, ownerID, basicKeyStore);
+            SNMessage snMessage =
+                    InMemoSNMessage.parseMessage(asapMessage, basicKeyStore);
 
             // produce SNMessage
             String date = "dummy Date";