Add check for currently active connection to shouldConnect

Author: fealXX

app/src/main/java/net/sharksystem/asap/android/lora/LoRaBTInputOutputStream.java

@@ -113,6 +113,15 @@ public LoRaASAPInputStream getASAPInputStream(String mac) {
         return this.getASAPInputStream(mac);
     }
 
+    /**
+     * Checks if there is an active {@link LoRaASAPInputStream} for this mac
+     * @param macAddress
+     * @return
+     */
+    public boolean hasASAPInputStream(String macAddress) {
+        return this.loRaASAPInputStreams.containsKey(macAddress);
+    }
+
     public LoRaBTInputStream getInputStream() {
         return is;
     }

app/src/main/java/net/sharksystem/asap/android/lora/LoRaCommunicationManager.java

@@ -24,7 +24,7 @@
 public class LoRaCommunicationManager extends Thread {
     private static final String CLASS_LOG_TAG = "ASAPLoRaCommManager";
     private static final long FLUSH_BUFFER_TIMEOUT = 250;
-    private static final long DISCOVER_MESSAGE_TIMEOUT = 60 * 1000; //60s in ms
+    private static final long DISCOVER_MESSAGE_TIMEOUT = 5 * 60 * 1000; //5 minutes in ms
     private static final long CONNECTION_ACTIVE_TIMEOUT = DISCOVER_MESSAGE_TIMEOUT * 10; //60s in ms
     private static LoRaBTInputOutputStream ioStream = null;
     private BluetoothDevice btDevice;
@@ -68,6 +68,10 @@ public OutputStream getASAPOutputStream(String mac) {
         return this.ioStream.getASAPOutputStream(mac);
     }
 
+    public boolean hasASAPInputStream(String macAddress) {
+        return this.ioStream.hasASAPInputStream(macAddress);
+    }
+
     public InputStream getASAPInputStream(String mac) {
         return this.ioStream.getASAPInputStream(mac);
     }

app/src/main/java/net/sharksystem/asap/android/lora/LoRaEngine.java

@@ -99,11 +99,24 @@ public void checkConnectionStatus() {
      * @param macAddress
      */
     void tryConnect(String macAddress) {
-        if (this.shouldConnectToMACPeer(macAddress)) {
+        if (this.shouldConnectToMACPeer(macAddress) && !this.hasActiveConnectionToMACPeer(macAddress)) {
+            Log.d(this.CLASS_LOG_TAG, "Connection to "
+                    + macAddress + " not yet established. Trying to start an ASAPSession.");
             this.launchASAPConnection(macAddress, this.loRaCommunicationManager.getASAPInputStream(macAddress), this.loRaCommunicationManager.getASAPOutputStream(macAddress));
         } else {
             Log.d(this.CLASS_LOG_TAG, "Connection to "
                     + macAddress + " not needed.");
         }
     }
+
+    /**
+     * Test if there is a currently active Connection to a macAddress.
+     * @param macAddress
+     * @return
+     */
+    private boolean hasActiveConnectionToMACPeer(String macAddress) {
+        if(this.loRaCommunicationManager != null && this.loRaCommunicationManager.isAlive())
+            return this.loRaCommunicationManager.hasASAPInputStream(macAddress);
+        return false;
+    }
 }