prepared to integrate this version in ASAPAndroid. Will make testing much easier.

Author: thsc42

src/net/sharksystem/asap/ASAPInternalPeerWrapper.java

@@ -16,6 +16,9 @@ public abstract class ASAPInternalPeerWrapper extends ASAPListenerManagingPeer
     protected void setInternalPeer(ASAPInternalPeer peer) {
         this.peer = peer;
         this.peer.addOnlinePeersChangedListener(this);
+
+        this.log("activate online messages on that peer");
+        this.peer.activateOnlineMessages();
     }
 
     protected ASAPInternalPeer getInternalPeer() {

src/net/sharksystem/asap/ASAPPeer.java

@@ -5,5 +5,8 @@ public interface ASAPPeer extends
         ASAPEnvironmentChangesListenerManagement,
         ASAPMessageReceivedListenerManagement
 {
+    CharSequence UNKNOWN_USER = "anon";
+    boolean ONLINE_EXCHANGE_DEFAULT = true;
+
     CharSequence getPeerName();
 }

src/net/sharksystem/asap/ASAPPeerFS.java

@@ -7,18 +7,21 @@
 import java.util.Collection;
 
 public class ASAPPeerFS extends ASAPInternalPeerWrapper implements ASAPPeerService, ASAPChunkReceivedListener {
+    public static final CharSequence DEFAULT_ROOT_FOLDER_NAME = ASAPEngineFS.DEFAULT_ROOT_FOLDER_NAME;
+
     private final String rootFolder;
-    private final ASAPInternalPeer asapInternalPeer;
+    private ASAPChunkReceivedListener chunkReceivedListener;
 
     public ASAPPeerFS(CharSequence owner, CharSequence rootFolder,
                       Collection<CharSequence> supportFormats) throws IOException, ASAPException {
-
-        this.asapInternalPeer = ASAPInternalPeerFS.createASAPPeer(owner, rootFolder, supportFormats,this);
-        super.setInternalPeer(asapInternalPeer);
-
+        super.setInternalPeer(ASAPInternalPeerFS.createASAPPeer(owner, rootFolder, supportFormats, this));
         this.rootFolder = rootFolder.toString();
     }
 
+    public void overwriteChuckReceivedListener(ASAPChunkReceivedListener listener) {
+        this.chunkReceivedListener = listener;
+    }
+
     @Override
     public void chunkReceived(String format, String sender, String uri, int era) throws IOException {
         StringBuilder sb = new StringBuilder();
@@ -27,18 +30,34 @@ public void chunkReceived(String format, String sender, String uri, int era) thr
         sb.append("\n++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
         this.log(sb.toString());
 
-        ASAPMessages receivedMessages =
-                Helper.getMessagesByChunkReceivedInfos(format, sender, uri, this.rootFolder, era);
+        if(this.chunkReceivedListener != null) {
+            this.log("chunk received listener set - call this one");
+            this.chunkReceivedListener.chunkReceived(format, sender, uri, era);
+        } else {
+            this.log("extract messages from chunk and notify listener");
+            ASAPMessages receivedMessages =
+                    Helper.getMessagesByChunkReceivedInfos(format, sender, uri, this.rootFolder, era);
 
-        this.asapMessageReceivedListenerManager.notifyReceived(format, receivedMessages, true);
+            this.asapMessageReceivedListenerManager.notifyReceived(format, receivedMessages, true);
+        }
     }
 
+    // TODO move behaviour control into this package
+
     @Override
     public void sendASAPMessage(CharSequence appName, CharSequence uri, byte[] message) throws ASAPException {
         try {
-            ASAPEngine asapEngine = this.asapInternalPeer.createEngineByFormat(appName);
-            asapEngine.activateOnlineMessages(this.getInternalPeer());
-            asapEngine.add(uri, message);
+            ASAPEngine engine = this.getInternalPeer().createEngineByFormat(appName);
+            engine.activateOnlineMessages(this.getInternalPeer());
+            engine.add(uri, message);
+            // send online
+            try {
+                this.getInternalPeer().sendOnlineASAPAssimilateMessage(appName, uri, message);
+            }
+            catch(ASAPException e) {
+                // no online peers - that's ok
+                this.log("could not send message online - that's ok.");
+            }
         } catch (IOException e) {
             this.log(e.getLocalizedMessage());
             throw new ASAPException("problems getting asap engine", e);

src/net/sharksystem/asap/ASAPPeerService.java

@@ -1,11 +1,23 @@
 package net.sharksystem.asap;
 
+import net.sharksystem.asap.internals.ASAPChunkReceivedListener;
 import net.sharksystem.asap.internals.ASAPException;
+import net.sharksystem.asap.internals.ASAPInternalPeer;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
 public interface ASAPPeerService extends ASAPPeer {
+    long DEFAULT_MAX_PROCESSING_TIME = ASAPInternalPeer.DEFAULT_MAX_PROCESSING_TIME;
+
     void handleConnection(InputStream is, OutputStream os) throws IOException, ASAPException;
+
+    /**
+     * Overwrite internal listener. This method is used e.g. in Androiud on service side. The asap peer is informed
+     * about newly received chunks. That news is broadcasted to application side which performs the actual processing.
+     *
+     * @param listener this listener is called instead - no further chunk processing is made by this object.
+     */
+    void overwriteChuckReceivedListener(ASAPChunkReceivedListener listener);
 }

src/net/sharksystem/asap/apps/testsupport/ASAPPeerWrapperMock.java

@@ -3,8 +3,10 @@
 import net.sharksystem.asap.ASAPListenerManagingPeer;
 import net.sharksystem.asap.ASAPPeerService;
 import net.sharksystem.asap.internals.ASAP;
+import net.sharksystem.asap.internals.ASAPChunkReceivedListener;
 import net.sharksystem.asap.internals.ASAPException;
 import net.sharksystem.asap.internals.ASAPMessages;
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -128,6 +130,11 @@ public void handleConnection(InputStream is, OutputStream os) throws IOException
         throw new ASAPException("that's a mock, no real peer");
     }
 
+    @Override
+    public void overwriteChuckReceivedListener(ASAPChunkReceivedListener listener) {
+        throw new RuntimeException("that's a mock, no real peer");
+    }
+
     public void stopEncounter(ASAPPeerWrapperMock otherPeer) {
         this.stopEncounter(otherPeer, true);
     }