isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into pull/austil

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-06-04 12:59:15 -04:00
parent c34f9f9e9f 7652d71c94
commit cf25229fbc
20 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
View File

@@ -30,6 +30,7 @@ import java.util.*;
import javax.annotation.concurrent.*;
import static java.lang.Math.min;
import static org.isoron.uhabits.core.models.Checkmark.CHECKED_EXPLICITLY;
import static org.isoron.uhabits.core.models.Checkmark.CHECKED_IMPLICITLY;
import static org.isoron.uhabits.core.models.Checkmark.UNCHECKED;
@@ -60,8 +61,7 @@ public abstract class CheckmarkList
long today = DateUtils.getStartOfToday();
long begin = reps[0].getTimestamp();
if (intervals.size() > 0)
begin = Long.min(begin, intervals.get(0).begin);
if (intervals.size() > 0) begin = min(begin, intervals.get(0).begin);
int nDays = (int) ((today - begin) / day) + 1;
@@ -295,7 +295,7 @@ public abstract class CheckmarkList
final long today = DateUtils.getStartOfToday();
Checkmark newest = getNewestComputed();
if(newest != null && newest.getTimestamp() == today) return;
if (newest != null && newest.getTimestamp() == today) return;
invalidateNewerThan(0);
Repetition oldestRep = habit.getRepetitions().getOldest();