HabitMatcher: only compute today's value if needed

9 years ago · f3b9fc825a
parent 50da14022f
commit f3b9fc825a
1 changed files with 6 additions and 2 deletions
--- a/app/src/main/java/org/isoron/uhabits/models/HabitMatcher.java
+++ b/app/src/main/java/org/isoron/uhabits/models/HabitMatcher.java
@ -76,8 +76,12 @@ public class HabitMatcher
        if (!isArchivedAllowed() && habit.isArchived()) return false;
        if (isReminderRequired() && !habit.hasReminder()) return false;

-        int todayCheckmark = habit.getCheckmarks().getTodayValue();
-        if (todayCheckmark != UNCHECKED && !isCompletedAllowed()) return false;
+        if(!isCompletedAllowed())
+        {
+            int todayCheckmark = habit.getCheckmarks().getTodayValue();
+            if (todayCheckmark != UNCHECKED) return false;
+        }
+
        if(!allowedColors.contains(habit.getColor())) return false;
        return true;
    }