certificates are nearly exchanged with online connection stuff.

Author: thsc42

src/net/sharksystem/asap/ASAPAbstractOnlineMessageSender.java

@@ -17,7 +17,7 @@ public void attachToSource(ASAPStorage source) {
 
     public void detachFromStorage() {
         if(this.source != null) {
-            this.source.detachASAPMessageAddListener(this);
+            this.source.detachASAPMessageAddListener();
         }
     }
 

src/net/sharksystem/asap/ASAPChunk.java

@@ -92,7 +92,7 @@ public interface ASAPChunk {
      * @throws IOException
      * @deprecated
      */
-    void addMessage(CharSequence message) throws IOException;
+    //void addMessage(CharSequence message) throws IOException;
 
     void addMessage(byte[] messageAsBytes) throws IOException;
 

src/net/sharksystem/asap/ASAPChunkFS.java

@@ -143,11 +143,12 @@ public String getUri() {
         return (String) this.uri;
     }
 
+    /*
     @Override
     public void addMessage(CharSequence message) throws IOException {
         this.addMessage(message.toString().getBytes());
     }
-
+*/
     @Override
     public void addMessage(byte[] messageAsBytes) throws IOException {
         if(messageAsBytes.length > Integer.MAX_VALUE) {

src/net/sharksystem/asap/ASAPChunkStorageFS.java

@@ -2,6 +2,7 @@
 
 import net.sharksystem.Utils;
 import net.sharksystem.asap.apps.ASAPMessages;
+import net.sharksystem.asap.util.Log;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -26,7 +27,11 @@ class ASAPChunkStorageFS implements ASAPChunkStorage {
     }
 
     public String getFormat() {
-        return format;
+        return this.format;
+    }
+
+    public String getRootDirectory() {
+        return this.rootDirectory;
     }
 
     @Override
@@ -38,7 +43,8 @@ public ASAPChunk getChunk(CharSequence uriTarget, int era) throws IOException {
     public boolean existsChunk(CharSequence uri, int era) throws IOException {
         String fullContentFileName = this.getChunkContentFilename(era, uri);
 
-        return(new File(fullContentFileName).exists());
+        boolean exists = (new File(fullContentFileName).exists());
+        return exists;
     }
 
     String getChunkContentFilename(int era, CharSequence uri) {
@@ -128,6 +134,8 @@ public ASAPMessages getASAPChunkCache(CharSequence uri, int toEra) throws IOExce
             fromEra = ASAPEngine.previousEra(fromEra);
         }
 
+        Log.writeLog(this, "create ASAPInMemoMessages");
+
         return new ASAPInMemoMessages(this,
                 this.getFormat(),
                 uri,

src/net/sharksystem/asap/ASAPEngine.java

@@ -68,7 +68,7 @@ public void attachASAPMessageAddListener(ASAPOnlineMessageSender asapOnlineMessa
         this.asapOnlineMessageSender = asapOnlineMessageSender;
     }
 
-    public void detachASAPMessageAddListener(ASAPOnlineMessageSender asapOnlineMessageSender) {
+    public void detachASAPMessageAddListener() {
         this.asapOnlineMessageSender = null;
     }
 
@@ -213,7 +213,7 @@ private ASAPChannelImpl getASAPChannelImpl(CharSequence uri) throws ASAPExceptio
             return new ASAPChannelImpl(this, uri);
         }
 
-        throw new ASAPException("channel with does not exist: " + uri);
+        throw new ASAPException("channel with this uri does not exist: " + uri);
     }
 
     @Override
@@ -264,13 +264,15 @@ private String getLogStart() {
         StringBuilder b = new StringBuilder();
         b.append("ASAPEngine (");
         b.append(this.owner);
+        b.append(", format: ");
+        b.append(this.format);
         b.append(", era: ");
         b.append(this.era);
         b.append("): ");
 
         return b.toString();
     }
-
+/*
     public void handleConnection(InputStream is, OutputStream os,
                                  ASAPChunkReceivedListener listener) {
 
@@ -291,17 +293,17 @@ public void handleConnection(InputStream is, OutputStream os,
 
             this.handleASAPInterest((ASAP_Interest_PDU_1_0) asapPDU, protocol, os);
         }
-        catch(Exception ioe) {
+        catch(Exception e) {
             //<<<<<<<<<<<<<<<<<<debug
             StringBuilder b = new StringBuilder();
             b.append(this.getLogStart());
-            b.append("IOEXception: ");
-            b.append(ioe.getLocalizedMessage());
+            b.append("Exception: ");
+            b.append(e.getLocalizedMessage());
             System.out.println(b.toString());
             //>>>>>>>>>>>>>>>>>>>debug
         }
     }
-
+*/
     public void handleASAPOffer(ASAP_OfferPDU_1_0 asapOffer, ASAP_1_0 protocol, OutputStream os)
             throws ASAPException, IOException {
 

src/net/sharksystem/asap/ASAPInMemoMessages.java

@@ -1,6 +1,7 @@
 package net.sharksystem.asap;
 
 import net.sharksystem.asap.apps.ASAPMessages;
+import net.sharksystem.asap.util.Log;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import java.io.IOException;
@@ -39,6 +40,10 @@ public ASAPInMemoMessages(ASAPChunkStorageFS chunkStorage,
         this.fromEra = fromEra;
         this.toEra = toEra;
         this.maxCacheLen = maxCacheLen;
+
+        Log.writeLog(this, "format: " + format + "uri: " + uri
+                + "rootDir: " + chunkStorage.getRootDirectory()
+                + "fromEra: " + fromEra+ "toEra: " + toEra+ "maxCacheLen: " + maxCacheLen);
     }
 
     public ASAPInMemoMessages(ASAPChunkStorageFS chunkStorage,

src/net/sharksystem/asap/ASAPOnlineMessageSenderEngineSide.java

@@ -49,6 +49,7 @@ public void sendASAPAssimilate(CharSequence format, CharSequence uri, Set<CharSe
                                    byte[] messageAsBytes, int era) throws IOException, ASAPException {
 
         if(recipients == null || recipients.size() < 1) {
+            // replace empty recipient list with list of online peers.
             this.sendASAPAssimilate(format, uri, messageAsBytes, era);
         }
 
@@ -109,7 +110,7 @@ public void sendASAPAssimilate(CharSequence format, CharSequence uri, Set<CharSe
     }
 
     private String getLogStart() {
-        return this.getClass().getSimpleName();
+        return this.getClass().getSimpleName() + ": ";
     }
 
     @Override

src/net/sharksystem/asap/ASAPSingleProcessOnlineMessageSender.java

@@ -21,7 +21,8 @@ public ASAPSingleProcessOnlineMessageSender(MultiASAPEngineFS multiEngine, ASAPS
     public void sendASAPAssimilate(CharSequence format, CharSequence uri, Set<CharSequence> recipients,
                                    byte[] messageAsBytes, int era) throws IOException, ASAPException {
 
-        this.asapOnlineMessageSenderEngineSide.sendASAPAssimilate(format, uri, recipients, messageAsBytes, era);
+        this.asapOnlineMessageSenderEngineSide.sendASAPAssimilate(
+                format, uri, recipients, messageAsBytes, era);
     }
 
     @Override

src/net/sharksystem/asap/ASAPStorage.java

@@ -10,15 +10,15 @@
 
 /**
  *
- * Communication break down in ad-hoc networks is normal and no failure.
+ * Break down of a communication channel in ad-hoc networks is normal and barely failure.
  * That chunk storage is meant to keep messages which are produced by an
  * app for later transmission.
  * 
  * Messages which cannot be sent to their recipients can be stored in ASAP chunks.
  * Each chunk is addressed with an URI (comparable to URIs e.g. in Android
  * Content Provider)
  * 
- * Applications can easlily store their messages by calling add(URI, message).
+ * Applications can easily store their messages by calling add(URI, message).
  * That message is stored in a chunk addressed by the URI. 
  * 
  * Each chunk has a recipient list which can be changed anytime. The ASAPEngine
@@ -33,7 +33,7 @@
  * ASAPStorage myStorage = ASAPEngineFS.getASAPEngine("EngineName", "ChunkStorageRootFolder", reader);
  * </pre>
  * 
- * An AASPReader must be implemented prior using that framework. Objects of
+ * An ASAPReader must be implemented prior using that framework. Objects of
  * that class are called whenever another peer transmits messages to the
  * local peer. @see AASPReader
  * 
@@ -43,7 +43,7 @@
  * current era is declared to be finished and an new era is opened. 
  * Any new message is now tagged as message from that new era. The ASAPEngine
  * transmits all message to the peer which are stored after the final
- * encounter. If no encounter ever happened - all availablee messages are
+ * encounter. If no encounter ever happened - all available messages are
  * transmitted. 
  *
  * @see ASAPEngine
@@ -177,7 +177,7 @@ public interface ASAPStorage {
 
     void attachASAPMessageAddListener(ASAPOnlineMessageSender asapOnlineMessageSender);
 
-    void detachASAPMessageAddListener(ASAPOnlineMessageSender asapOnlineMessageSender);
+    void detachASAPMessageAddListener();
 
     void setASAPManagementStorage(ASAPManagementStorage asapManagementStorage);
 

src/net/sharksystem/asap/MultiASAPEngineFS.java

@@ -87,4 +87,7 @@ public interface MultiASAPEngineFS {
      * @return all formats currently supported by this mulit engine
      */
     Set<CharSequence> getFormats();
+
+    void activateOnlineMessages();
+    void deactivateOnlineMessages();
 }