Compiles with hub integration. Requires testing.

Author: thsc42

app/build.gradle

@@ -31,6 +31,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation files('libs\\ASAPJava.jar')
+    implementation files('libs\\ASAPHub.jar')
     testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'

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

@@ -680,6 +680,16 @@ public boolean samePeer(CharSequence otherPeerID) {
         return PeerIDHelper.sameID(this.getPeerID(), otherPeerID);
     }
 
+    @Override
+    public void putExtra(CharSequence key, byte[] bytes) throws IOException, ASAPException {
+        this.asapPeerApplicationSide.putExtra(key, bytes);
+    }
+
+    @Override
+    public byte[] getExtra(CharSequence key) throws ASAPException, IOException {
+        return this.asapPeerApplicationSide.getExtra(key);
+    }
+
     ///////////////////////////////////////////////////////////////////////////////////////////////
     //                          ASAP messages are sent with the service                          //
     ///////////////////////////////////////////////////////////////////////////////////////////////

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

@@ -9,16 +9,17 @@
 import android.content.IntentFilter;
 import android.util.Log;
 
+import net.sharksystem.asap.ASAPEncounterManager;
 import net.sharksystem.asap.ASAPException;
+import net.sharksystem.asap.EncounterConnectionType;
 import net.sharksystem.asap.android.service.MacLayerEngine;
 import net.sharksystem.asap.android.service.ASAPService;
 import net.sharksystem.asap.android.Util;
 import net.sharksystem.asap.android.service2AppMessaging.ASAPServiceRequestNotifyIntent;
+import net.sharksystem.streams.StreamPair;
+import net.sharksystem.streams.StreamPairImpl;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
-import java.net.Socket;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -44,10 +45,10 @@ public class BluetoothEngine extends MacLayerEngine {
     private boolean btEnvironmentOn = false;
     private BluetoothServerSocketThread btServerSocketThread;
 
-    public static BluetoothEngine getASAPBluetoothEngine(ASAPService ASAPService,
+    public static BluetoothEngine getASAPBluetoothEngine(ASAPService asapService,
                                                          Context context) {
         if(BluetoothEngine.engine == null) {
-            BluetoothEngine.engine = new BluetoothEngine(ASAPService, context);
+            BluetoothEngine.engine = new BluetoothEngine(asapService, context);
         }
 
         return BluetoothEngine.engine;
@@ -445,43 +446,17 @@ public void checkConnectionStatus() {
     /**
      * Both client and server sockets
      * @param socket
-     * @param isClient for debugging: who is calling client socket / server socket?
+     * @param initiator for debugging: who is calling client socket / server socket?
      * @throws IOException
      */
-    void handleBTSocket(BluetoothSocket socket, boolean isClient) throws IOException {
+    void handleBTSocket(BluetoothSocket socket, boolean initiator) throws IOException {
         String remoteMacAddress = socket.getRemoteDevice().getAddress();
 
-        String logMessage = isClient ? "Client" : "Server";
-        logMessage += "socket called: handle new BT connection" + socket;
+        StreamPair streamPair = StreamPairImpl.getStreamPairWithEndpointAddress(
+                socket.getInputStream(), socket.getOutputStream(), remoteMacAddress);
 
-        Log.d(this.getLogStart(), logMessage + remoteMacAddress);
-
-        // already an open connection?
-        if (this.checkAlreadyConnectedWithDevice(remoteMacAddress)) {
-            socket.close();
-            return;
-        }
-
-        // avoid the nasty race condition
-        boolean waited = this.waitBeforeASAPSessionLaunch(
-                socket.getInputStream(),
-                socket.getOutputStream(),
-                isClient, 500);
-
-        // ask again?
-        if(waited) {
-            if (this.checkAlreadyConnectedWithDevice(remoteMacAddress)) {
-                socket.close();
-                return;
-            }
-        }
-
-        // remember that new connection
-        Log.d(this.getLogStart(), "remember socket: " + socket);
-        this.openSockets.put(remoteMacAddress, socket);
-
-        Log.d(this.getLogStart(), "launch asap session");
-        this.launchASAPConnection(remoteMacAddress, socket.getInputStream(), socket.getOutputStream());
+        this.getAsapService().getASAPEncounterManager().handleEncounter(
+                streamPair, EncounterConnectionType.AD_HOC_LAYER_2_NETWORK, initiator);
     }
 
     public void propagateStatus(Context ctx) throws ASAPException {

app/src/main/java/net/sharksystem/asap/android/service/ASAPService.java

@@ -11,6 +11,8 @@
 import androidx.core.content.ContextCompat;
 import android.util.Log;
 
+import net.sharksystem.asap.ASAPEncounterManager;
+import net.sharksystem.asap.ASAPEncounterManagerImpl;
 import net.sharksystem.asap.ASAPEnvironmentChangesListener;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPHop;
@@ -26,6 +28,8 @@
 import net.sharksystem.asap.android.wifidirect.WifiP2PEngine;
 import net.sharksystem.asap.engine.ASAPChunkReceivedListener;
 import net.sharksystem.asap.utils.Helper;
+import net.sharksystem.hub.peerside.ASAPHubManager;
+import net.sharksystem.hub.peerside.ASAPHubManagerImpl;
 
 import java.io.File;
 import java.io.IOException;
@@ -47,11 +51,13 @@ public class ASAPService extends Service
     private String asapEngineRootFolderName;
 
     private ASAPPeerFS asapPeer;
+    private ASAPEncounterManager asapEncounterManager;
     private CharSequence owner;
     private CharSequence rootFolder;
     private boolean onlineExchange;
     private long maxExecutionTime;
     private ArrayList<CharSequence> supportedFormats;
+    private ASAPHubManager asapASAPHubManager;
 
     String getASAPRootFolderName() {
         return this.asapEngineRootFolderName;
@@ -116,6 +122,27 @@ public ASAPPeerFS getASAPPeer() {
         return this.asapPeer;
     }
 
+    public ASAPEncounterManager getASAPEncounterManager() {
+        if(this.asapEncounterManager == null) {
+            try {
+                this.asapEncounterManager = new ASAPEncounterManagerImpl(this.getASAPPeer());
+            } catch (ASAPException e) {
+                Log.e(this.getLogStart(), "cannot create encounter manager: "
+                        + e.getLocalizedMessage());
+            }
+        }
+
+        return this.asapEncounterManager;
+    }
+
+    public ASAPHubManager getASAPHubManager() {
+        if(this.asapASAPHubManager == null) {
+            this.asapASAPHubManager = new ASAPHubManagerImpl(this.getASAPEncounterManager());
+        }
+
+        return this.asapASAPHubManager;
+    }
+
     //////////////////////////////////////////////////////////////////////////////////////
     //                                 live cycle methods                               //
     //////////////////////////////////////////////////////////////////////////////////////

app/src/main/java/net/sharksystem/asap/android/service/MacLayerEngine.java

@@ -66,6 +66,17 @@ public void restart() {
         this.start();
     }
 
+    private String getLogStart() {
+        return "ASAPMacLayerEngine";
+    }
+
+    /**
+     * TODO: do we need this? I doubt it (thsc)
+     * It can be called to check whether open connection are still running. It's a good idea for
+     * all connection oriented protocols but useless with connectionless.
+     */
+    public abstract void checkConnectionStatus();
+
     /** keeps info about device we have tried (!!) recently to connect
      * <MAC address, connection time>
      */
@@ -114,25 +125,8 @@ public boolean shouldConnectToMACPeer(String macAddress) {
         return false;
     }
 
-    private String getLogStart() {
-        return "ASAPMacLayerEngine";
-    }
-
     private Map<String, ASAPConnection> asapConnections = new HashMap<>();
 
-    private String localMacAddress = null;
-    public String getLocalMacAddress() {
-        if(localMacAddress == null) {
-            WifiManager wifiManager = (WifiManager)
-                    asapService.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-
-            WifiInfo wInfo = wifiManager.getConnectionInfo();
-            this.localMacAddress = wInfo.getMacAddress();
-        }
-
-        return this.localMacAddress;
-    }
-
     /**
      * kill connection to address
      * @param address
@@ -222,7 +216,7 @@ public boolean waitBeforeASAPSessionLaunch(InputStream is, OutputStream os,
         Log.d(this.getLogStart(), sb.toString());
 
         /* Here comes the bias: An initiator with a smaller value waits a moment */
-        if(connectionInitiator & initiatorValue < nonInitiatorValue) {
+        if(connectionInitiator && initiatorValue < nonInitiatorValue) {
             try {
                 sb = new StringBuilder();
                 sb.append("wait ");
@@ -238,11 +232,4 @@ public boolean waitBeforeASAPSessionLaunch(InputStream is, OutputStream os,
 
         return false;
     }
-
-    /**
-     * TODO: do we need this? I doubt it (thsc)
-     * It can be called to check whether open connection are still running. It's a good idea for
-     * all connection oriented protocols but useless with connectionless.
-     */
-    public abstract void checkConnectionStatus();
 }