Merge branch 'master' of https://github.com/SharedKnowledge/ASAPHub

# Conflicts:
#	libs/ASAPJava.jar

Author: thsc42

Dockerfile

@@ -0,0 +1,4 @@
+cd out/production/main/
+jar -cvf ASAPHub.jar net
+mv ASAPHub.jar ../../../ASAPHub.jar
+cd ../../../

Dockerfile.HubCLI

@@ -36,9 +36,9 @@ public abstract class BasicHubConnectionManager implements HubConnectionManager
      * accurate. We can keep track of failed attempts. And we do.
      */
     protected void syncLists() {
-        // avoid calls within milliseconds
+        // wait a few millis for a new sync
         long now = System.currentTimeMillis();
-        if (now - this.lastSync <= 100) return;
+        if (now - this.lastSync <= 100L) return;
         this.lastSync = now;
 
         // ask for current list from hub

Dockerfile.HubTester

@@ -11,6 +11,18 @@
  * Interface for applications. It allows connection management with hubs.
  */
 public interface HubConnectionManager extends NewHubConnectionListenerManagement {
+    /**
+     *
+     * @return time when last sync with hubs happened. Is -1 if never synced
+     */
+    long getLastSyncTime();
+
+    /**
+     * Force a new synchronization with all connected hubs. Use this method carefully. We do not want
+     * to produce unnecessary traffic.
+     */
+    void forceSync();
+
     /**
      * Connect a hub
      * @param hcd Hub description

README.md

@@ -67,6 +67,17 @@ public void removeNewConnectedHubListener(NewHubConnectedListener connectedHubLi
         }
     }
 
+    public long getLastSyncTime() {
+        if(this.hubManager == null) return -1;
+        return this.hubManager.getLastSynchedWithConnectedHubs();
+    }
+
+    public void forceSync() {
+        if(this.hubManager != null) {
+            this.hubManager.forceSyncWithHubs();
+        }
+    }
+
     public HubConnectionManagerImpl(
             ASAPEncounterManager encounterManager, ASAPPeer asapPeer, int waitIntervalInSeconds) {
         this.asapPeer = asapPeer;