Merge pull request #265 from scireum/phu/SIRI-46_correctIntervalCalcu…

…lation SIRI-46 Calculates the interval to the last external login correctly.
scireum · Feb 22, 2019 · 04d5bf9 · 04d5bf9
2 parents e0a2c0c + d6ecc9f
commit 04d5bf9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/sirius/biz/tenants/TenantUserManager.java b/src/main/java/sirius/biz/tenants/TenantUserManager.java
@@ -653,7 +653,7 @@ private boolean isWithinInterval(LocalDateTime dateTime, Integer requiredInterva
             return false;
         }
 
-        long actualInterval = Duration.between(LocalDateTime.now(), dateTime).toDays();
+        long actualInterval = Duration.between(dateTime, LocalDateTime.now()).toDays();
         return actualInterval < requiredInterval;
     }
 

diff --git a/src/main/java/sirius/biz/tenants/UserAccountData.java b/src/main/java/sirius/biz/tenants/UserAccountData.java
@@ -231,7 +231,7 @@ private boolean isNearInterval(LocalDateTime dateTime, Integer requiredInterval)
             return true;
         }
 
-        long actualInterval = Duration.between(LocalDateTime.now(), dateTime).toDays();
+        long actualInterval = Duration.between(dateTime, LocalDateTime.now()).toDays();
         return actualInterval >= requiredInterval - 3;
     }