Merge branch 'master' of https://gitlab.mpi-sws.org/encounters/ebc

ebclibrary/src/main/java/org/mpisws/encounters/EncounterBasedCommunication.java

@@ -43,7 +43,7 @@ import java.util.List;
  *
  **/
 public class EncounterBasedCommunication {
-    public static final long CHANGE_EPOCH_TIME = 2*60000;
+    public static final long CHANGE_EPOCH_TIME = 15*60000;
     public static final long SCAN_BATCH_INTERVAL = (long) (2 * 60000);
     public static final int REQUEST_ENABLE_BT = 1;
     public static final int REQUEST_ACCESS_FINE_LOCATION = 2;

ebclibrary/src/main/java/org/mpisws/encounters/encounterformation/EncounterFormationCore.java

@@ -11,7 +11,6 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Handler;
 import android.os.Looper;
-import android.os.StrictMode;
 import android.util.Log;
 
 import org.apache.commons.lang3.tuple.Pair;
@@ -19,7 +18,6 @@ import org.mpisws.embeddedsocial.ESClient;
 import org.mpisws.helpers.Identifier;
 import org.mpisws.encounters.encounterhistory.bridges.EncounterEntriesBridge;
 import org.mpisws.encounters.encounterhistory.events.EncounterConfirmEvent;
-import org.mpisws.helpers.ThreadPoolManager;
 
 import java.util.HashMap;
 import java.util.Map;