From 82d293155943379a7a4242a52eee2145c63466b5 Mon Sep 17 00:00:00 2001 From: Denis Date: Fri, 29 Jul 2016 23:25:29 +0200 Subject: [PATCH] fix code duplication --- app/src/main/java/org/isoron/uhabits/models/RepetitionList.java | 2 +- app/src/main/java/org/isoron/uhabits/utils/DateUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/isoron/uhabits/models/RepetitionList.java b/app/src/main/java/org/isoron/uhabits/models/RepetitionList.java index 23866b939..e527048f5 100644 --- a/app/src/main/java/org/isoron/uhabits/models/RepetitionList.java +++ b/app/src/main/java/org/isoron/uhabits/models/RepetitionList.java @@ -130,7 +130,7 @@ public abstract class RepetitionList for (Repetition r : reps) { Calendar date = DateUtils.getCalendar(r.getTimestamp()); - int weekday = date.get(Calendar.DAY_OF_WEEK) % 7; + int weekday = DateUtils.getWeekday(r.getTimestamp()); date.set(Calendar.DAY_OF_MONTH, 1); long timestamp = date.getTimeInMillis(); diff --git a/app/src/main/java/org/isoron/uhabits/utils/DateUtils.java b/app/src/main/java/org/isoron/uhabits/utils/DateUtils.java index 67d5f8033..5684f5302 100644 --- a/app/src/main/java/org/isoron/uhabits/utils/DateUtils.java +++ b/app/src/main/java/org/isoron/uhabits/utils/DateUtils.java @@ -206,7 +206,7 @@ public abstract class DateUtils public static int getWeekday(long timestamp) { GregorianCalendar day = getCalendar(timestamp); - return day.get(DAY_OF_WEEK) % 7; + return javaWeekdayToLoopWeekday(day.get(DAY_OF_WEEK)); } /**