better ui support by encounter manager

Author: thsc42

src/main/java/net/sharksystem/asap/ASAPEncounterConnectionType.java

@@ -1,5 +1,21 @@
 package net.sharksystem.asap;
 
 public enum ASAPEncounterConnectionType {
-    UNKNOWN, AD_HOC_LAYER_2_NETWORK, ASAP_HUB, INTERNET, ONION_NETWORK
+    UNKNOWN (0), AD_HOC_LAYER_2_NETWORK (1), ASAP_HUB (2), INTERNET (3), ONION_NETWORK (4);
+
+    private final int type;
+
+    ASAPEncounterConnectionType(int type) {
+        this.type = type;
+    }
+    public String toString() {
+        switch(this.type) {
+            case 0: return "unknown";
+            case 1: return "ad-hoc";
+            case 2: return "hub";
+            case 3: return "internet";
+            case 4: return "onion";
+            default: return "<there is no type " + this.type;
+        }
+    }
 }

src/main/java/net/sharksystem/asap/ASAPEncounterManagerAdmin.java

@@ -19,6 +19,14 @@ public interface ASAPEncounterManagerAdmin {
      */
     Set<CharSequence> getConnectedPeerIDs();
 
+    /**
+     *
+     * @param peerID peerID
+     * @return connection type of existing connection with given peer
+     * @throws ASAPException if no connection to that peer exists
+     */
+    ASAPEncounterConnectionType getConnectionType(CharSequence peerID) throws ASAPException;
+
     /**
      * Add a peerID to what no connection should be established.
      * Note: Adding a peer to the deny list does not necessarily terminate an

src/main/java/net/sharksystem/asap/ASAPEncounterManagerImpl.java

@@ -13,8 +13,8 @@
 import java.io.*;
 import java.util.*;
 
-public class ASAPEncounterManagerImpl implements ASAPEncounterManager, ASAPEncounterManagerAdmin,
-        ASAPConnectionListener {
+public class ASAPEncounterManagerImpl implements
+        ASAPEncounterManager, ASAPEncounterManagerAdmin, ASAPConnectionListener {
     public static final long DEFAULT_WAIT_BEFORE_RECONNECT_TIME = 60000; // 60 seconds == 1 minute
     public static final long DEFAULT_WAIT_TO_AVOID_RACE_CONDITION = 500; // milliseconds - worked fine with BT.
     public static final String DATASTORAGE_FILE_EXTENSION = "em";
@@ -221,9 +221,6 @@ private void handleEncounter(StreamPair streamPair, ASAPEncounterConnectionType
         this.openStreamPairs.put(connectionID, streamPair);
         Log.writeLog(this, this.toString(), "remember encounter: " + streamPair.getEndpointID());
         this.encounterDate.put(streamPair.getEndpointID(), new Date());
-
-        Log.writeLog(this, this.toString(), "going to launch a new asap connection");
-
         try {
             Log.writeLog(this, this.toString(), "call asap peer to handle connection");
             ASAPConnection asapConnection =
@@ -232,6 +229,8 @@ private void handleEncounter(StreamPair streamPair, ASAPEncounterConnectionType
 
             asapConnection.addASAPConnectionListener(this);
 
+            Log.writeLog(this, this.toString(),
+                    "asap peers is handling session: " + asapConnection.toString());
             this.openASAPConnections.put(asapConnection, connectionID);
 
         } catch (IOException | ASAPException e) {
@@ -315,7 +314,7 @@ private boolean solveRaceCondition(StreamPair streamPair, boolean connectionInit
     @Override
     public synchronized void asapConnectionStarted(String remotePeerName, ASAPConnection connection) {
         CharSequence peerID = connection.getEncounteredPeer();
-        Log.writeLog(this, this.toString(), "new ASAP session started with peerID " + peerID);
+        Log.writeLog(this, this.toString(), "new ASAP session: " + connection);
 
         CharSequence streamPairID = this.openASAPConnections.get(connection);
         if(PeerIDHelper.sameID(streamPairID, peerID)) {
@@ -336,6 +335,7 @@ public synchronized void asapConnectionStarted(String remotePeerName, ASAPConnec
 
     @Override
     public synchronized void asapConnectionTerminated(Exception terminatingException, ASAPConnection connection) {
+        Log.writeLog(this, this.toString(), "terminated: " + connection);
         CharSequence peerID = connection.getEncounteredPeer();
 
         CharSequence peerIDOrAddress = this.openASAPConnections.get(connection);
@@ -434,6 +434,17 @@ public Set<CharSequence> getDenyList() {
     public Set<CharSequence> getConnectedPeerIDs() {
         return this.openStreamPairs.keySet();
     }
+
+    public ASAPEncounterConnectionType getConnectionType(CharSequence peerID) throws ASAPException {
+        for(ASAPConnection connection : this.openASAPConnections.keySet()) {
+            if(PeerIDHelper.sameID(connection.getEncounteredPeer(), peerID)) {
+                // found our connection
+                return connection.getASAPEncounterConnectionType();
+            }
+        }
+        throw new ASAPException("there is no connection to peer " + peerID);
+    }
+
     @Override
     public void cancelConnection(CharSequence peerID) {
         StreamPair stream2Close = this.openStreamPairs.get(peerID);

src/main/java/net/sharksystem/asap/apps/testsupport/TestASAPConnectionHandler.java

@@ -67,6 +67,11 @@ public boolean isSigned() {
                 return false;
             }
 
+            @Override
+            public ASAPEncounterConnectionType getASAPEncounterConnectionType() {
+                return ASAPEncounterConnectionType.UNKNOWN;
+            }
+
             @Override
             public void kill() {
 

src/main/java/net/sharksystem/asap/protocol/ASAPConnection.java

@@ -1,5 +1,7 @@
 package net.sharksystem.asap.protocol;
 
+import net.sharksystem.asap.ASAPEncounterConnectionType;
+
 public interface ASAPConnection {
     CharSequence getEncounteredPeer();
 
@@ -12,6 +14,8 @@ public interface ASAPConnection {
 
     boolean isSigned();
 
+    ASAPEncounterConnectionType getASAPEncounterConnectionType();
+
     // terminate that connection - does not effect the underlying connections established e.g. with Bluetooth
     void kill();
 }

src/main/java/net/sharksystem/asap/protocol/ASAPSessionImpl.java

@@ -98,6 +98,11 @@ public boolean isSigned() {
         return false;
     }
 
+    @Override
+    public ASAPEncounterConnectionType getASAPEncounterConnectionType() {
+        return this.connectionType;
+    }
+
     @Override
     public void kill() {
         this.kill(new ASAPException("kill called from outside asap connection"));
@@ -533,4 +538,18 @@ public void run() {
             }
         }
     }
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(this.asapInternalPeer.getOwner());
+        sb.append(" <--> ");
+        if(this.encounteredPeer == null) sb.append("<unkown yet>");
+        else sb.append(this.encounteredPeer);
+        sb.append(" | type: ");
+        sb.append(this.connectionType);
+        sb.append(" | encrypted: ");
+        sb.append(this.encrypt);
+        sb.append(" | sign: ");
+        sb.append(this.sign);
+        return sb.toString();
+    }
 }