online credential exchange worked in a very first test.

Author: thsc42

app/libs/ASAP_Engine_0.5.0.jar

@@ -64,7 +64,8 @@ public void sendASAPMessage(CharSequence appName, CharSequence uri,
                 || message == null || message.length == 0
         ) throw new ASAPException("parameter must not be null");
 
-        // ensure that any format is supporter by an engine
+        /*
+        // ensure that any format is supported by an engine
         Collection<CharSequence> supportedFormats = asapApplication.getSupportFormats();
         if(supportedFormats != null && supportedFormats.size() > 0) {
             Log.d(this.getLogStart(), "use Util.getASAPRootDirectory()");
@@ -76,6 +77,7 @@ public void sendASAPMessage(CharSequence appName, CharSequence uri,
                 multiEngine.createEngineByFormat(supportedFormat);
             }
         }
+         */
 
         // prepare message
         Message msg = Message.obtain(null, ASAPServiceMethods.SEND_MESSAGE, 0, 0);

app/src/main/java/net/sharksystem/asap/android/apps/ASAPActivity.java

@@ -11,7 +11,11 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import net.sharksystem.Utils;
+import net.sharksystem.asap.ASAPChannel;
+import net.sharksystem.asap.ASAPChunk;
 import net.sharksystem.asap.ASAPChunkReceivedListener;
+import net.sharksystem.asap.ASAPChunkStorage;
 import net.sharksystem.asap.ASAPEngine;
 import net.sharksystem.asap.ASAPEngineFS;
 import net.sharksystem.asap.ASAPException;
@@ -340,26 +344,41 @@ public void onReceive(Context context, Intent intent) {
             = new HashMap<>();
 
     public void chunkReceived(String format, String sender, String uri, String foldername, int era) {
-        Log.d(this.getLogStart(), "got chunk received message: "
+        Log.d(this.getLogStart(), "got chunkReceived message: "
                 + format + " | "+ sender + " | " + uri  + " | " + foldername + " | " + era);
 
-        Log.d(this.getLogStart(), "going to inform listener about it");
+        Log.d(this.getLogStart(), "going to inform (deprecated) ASAPChunkReceivedListener");
         ASAPChunkReceivedListener listener = this.chunkReceivedListener.get(uri);
         if(listener != null) {
+            Log.d(this.getLogStart(), "informed: " + listener.toString());
             listener.chunkReceived(format, sender, uri, era);
+        } else {
+            Log.d(this.getLogStart(),
+                    "no ASAPChunkReceivedListener but maybe ASAPMessageReceivedListener");
         }
 
         try {
-            ASAPEngine existingASAPEngineFS = ASAPEngineFS.getExistingASAPEngineFS(foldername);
-            ASAPMessages messages = existingASAPEngineFS.getChannel(uri).getMessages();
+            String rootIncomingStorage = foldername + "/" + Utils.url2FileName(format);
+            Log.d(this.getLogStart(), "try getting storage in folder " + rootIncomingStorage);
+            ASAPEngine existingASAPEngineFS =
+                    ASAPEngineFS.getExistingASAPEngineFS(rootIncomingStorage);
+            Log.d(this.getLogStart(), "got existing asap engine");
+
+            ASAPChunkStorage chunkStorage = existingASAPEngineFS.getIncomingChunkStorage(sender);
+            Log.d(this.getLogStart(), "got incoming channel of " + sender);
+
+            ASAPMessages asapMessages = chunkStorage.getASAPChunkCache(uri, era, era);
+            Log.d(this.getLogStart(), "got messages uri: " + uri + " / era: " + era);
 
             Collection<ASAPMessageReceivedListener> messageListeners =
                     this.messageReceivedListener.get(uri);
 
-            Log.d(this.getLogStart(), "going to inform message listener about it");
+            Log.d(this.getLogStart(), "going to inform message listener about it: "
+                    + messageListeners);
+
             if(messageListeners != null) {
                 for(ASAPMessageReceivedListener messageListener : messageListeners) {
-                    messageListener.asapMessagesReceived(messages);
+                    messageListener.asapMessagesReceived(asapMessages);
                 }
             }
 
@@ -379,14 +398,14 @@ public void addChunkReceivedListener(CharSequence uri, ASAPChunkReceivedListener
         this.chunkReceivedListener.put(uri, listener);
     }
 
-    public void addASAPMessageReceivedListener(CharSequence uri,
+    public void addASAPMessageReceivedListener(CharSequence format,
                                                ASAPMessageReceivedListener listener) {
         Collection<ASAPMessageReceivedListener> messageListeners =
-                this.messageReceivedListener.get(uri);
+                this.messageReceivedListener.get(format);
 
         if(messageListeners == null) {
-            this.messageReceivedListener.put(uri, new HashSet());
-            this.addASAPMessageReceivedListener(uri, listener);
+            this.messageReceivedListener.put(format, new HashSet());
+            this.addASAPMessageReceivedListener(format, listener);
         } else {
             messageListeners.add(listener);
         }

app/src/main/java/net/sharksystem/asap/android/apps/ASAPApplication.java

@@ -294,6 +294,7 @@ void deviceFound(BluetoothDevice btDevice, BluetoothClass btClass) throws ASAPEx
         sb.append(macAddress);
         sb.append(" | ");
         sb.append(btDevice.getName());
+        sb.append(" | ");
         sb.append("my address: ");
         sb.append(this.getBTAdapter().getAddress());
         Log.d(this.getLogStart(), sb.toString());

app/src/main/java/net/sharksystem/asap/android/bluetooth/BluetoothEngine.java

@@ -242,7 +242,7 @@ public void onRemoveAddOnlineSenderClick(View view) {
             return;
         }
 
-        this.asapStorage.detachASAPMessageAddListener(this.asapOnlineSender);
+        this.asapStorage.detachASAPMessageAddListener();
     }
 
     private void checkStorage() throws IOException, ASAPException {

app/src/main/java/net/sharksystem/asap/android/example/ASAPExampleActivity.java

@@ -57,11 +57,9 @@ String getASAPRootFolderName() {
     }
 
     public MultiASAPEngineFS getMultiASAPEngine() {
-        Log.d(LOGSTART, "TODO: setup multi engine each time to keep in sync with external changes.");
-        // TODO: setup multi engine each time to keep in sync with external changes.
-        this.asapMultiEngine = null;
+        Log.d(LOGSTART, "asap multi engine is a singleton.");
         if(this.asapMultiEngine == null) {
-            Log.d(LOGSTART, "try to get asapMultiEngine");
+            Log.d(LOGSTART, "going to set up asapMultiEngine");
 
             // check write permissions
             if (ContextCompat.checkSelfPermission(this,
@@ -88,11 +86,16 @@ public MultiASAPEngineFS getMultiASAPEngine() {
                         this.owner, this.asapEngineRootFolderName,
                         this.maxExecutionTime, this.supportedFormats, this);
 
-                Log.d(LOGSTART,"engine created");
+                Log.d(LOGSTART,"engines created");
 
+                // listener for radar app
                 this.asapMultiEngine.addOnlinePeersChangedListener(this);
                 Log.d(LOGSTART,"added online peer changed listener");
 
+                // add online feature to each engine
+                this.asapMultiEngine.activateOnlineMessages();
+                Log.d(LOGSTART,"online messages activated");
+
             } catch (IOException e) {
                 Log.d(LOGSTART,"IOException");
                 Log.d(LOGSTART,e.getLocalizedMessage());
@@ -102,6 +105,8 @@ public MultiASAPEngineFS getMultiASAPEngine() {
                 Log.d(LOGSTART,e.getLocalizedMessage());
                 e.printStackTrace();
             }
+        } else {
+            Log.d(LOGSTART, "multi engine was already created");
         }
 
         return this.asapMultiEngine;