Fix CMin use from testing

wifi-tracing · Apr 4, 2021 · 7f10858 · 7f10858
1 parent 290a493
commit 7f10858
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/src/main/java/com/prj/app/logic/RiskAnalyser.java b/app/src/main/java/com/prj/app/logic/RiskAnalyser.java
@@ -94,7 +94,7 @@ private void sendMatchingBSSIDsPOST(@NotNull String URL, @NotNull JSONObject jso
      */
     public boolean matchResult(@NotNull JSONArray matchingScans) {
         List<Scan> localScans = databaseManager.getScanData();
-        if (localScans.size() < 1) {
+        if (localScans == null || matchingScans == null || localScans.size() < 1) {
             if (resultTextView != null) {
                 resultTextView.setText("No matches found\n");
             }
@@ -178,7 +178,7 @@ public List<Pair<Date, List<Scan>>> getFirstPositiveResult(@NotNull TreeMap<Date
                 double timeDiff = Math.abs(lastTimestamp.getTime() - timestamp.getTime()) / 1000.0;
                 if (timeDiff <= preferencesManager.getTMax()) {
                     dateStorage.add(new Pair<>(timestamp, timeMap.get(timestamp)));
-                    if (dateStorage.size() >= preferencesManager.getCMin()) {
+                    if (dateStorage.size() >= preferencesManager.getCMin() - 1 ) {
                         return dateStorage;
                     }
                 } else {
@@ -188,7 +188,7 @@ public List<Pair<Date, List<Scan>>> getFirstPositiveResult(@NotNull TreeMap<Date
             }
         }
 
-        if (dateStorage.size() <= preferencesManager.getCMin()) {
+        if (dateStorage.size() <= preferencesManager.getCMin()+  1) {
             dateStorage.clear();
         }
         return dateStorage;
@@ -292,7 +292,7 @@ private List<Scan> removeNonConcurrentScans(@NotNull List<Scan> localScans) {
                         if (scanTimeDifference(lastScan, current) <= preferencesManager.getTMax()) {
                             storageList.add(current);
                         } else {
-                            if (storageList.size() >= preferencesManager.getCMin()) {
+                            if (storageList.size() >= preferencesManager.getCMin() -1 ) {
                                 validScans.addAll(storageList);
                             }
                             storageList.clear();
@@ -313,7 +313,7 @@ private List<Scan> removeNonConcurrentScans(@NotNull List<Scan> localScans) {
 
         }
         for (ArrayList<Scan> scans : storage.values()) {
-            if (scans.size() >= preferencesManager.getCMin()) {
+            if (scans.size() >= preferencesManager.getCMin() - 1) {
                 validScans.addAll(scans);
             }
         }