Fixed selecting messages of a week

10 months ago · d30538ae13
parent 3fbff12889
commit d30538ae13
1 changed files with 7 additions and 1 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@ -1230,7 +1230,13 @@ public class FragmentMessages extends FragmentBase
                                cal.set(Calendar.SECOND, 0);
                                cal.set(Calendar.MILLISECOND, 0);

-                                cal.add(Calendar.DATE, 1);
+                                if (date_week) {
+                                    cal.setMinimalDaysInFirstWeek(4); // ISO 8601
+                                    cal.setFirstDayOfWeek(Calendar.MONDAY);
+                                    cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+                                    cal.add(Calendar.DATE, 7);
+                                } else
+                                    cal.add(Calendar.DATE, 1);
                                long to = cal.getTimeInMillis();

                                cal.add(Calendar.DATE, date_week ? -7 : -1);