Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 22:26:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed day range check

Browse Source
This commit is contained in:
M66B
2019-08-21 13:32:25 +02:00
parent 722f94cb8a
commit 7ca5178c8a
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/eu/faircode/email/EntityRule.java
View File

@@ -180,17 +180,31 @@ public class EntityRule {
int start = jschedule.optInt("start", 0);
int end = jschedule.optInt("end", 0);
if (end <= start)
end += 7 * 24 * 60;
int dstart = start / (24 * 60);
int hstart = start / 60 % 24;
int mstart = start % 60;
Calendar cal = Calendar.getInstance();
cal.setTime(new Date(message.received));
int mday = cal.get(Calendar.DAY_OF_WEEK) - Calendar.SUNDAY;
int mhour = cal.get(Calendar.HOUR_OF_DAY);
int mminute = cal.get(Calendar.MINUTE);
int minutes = mday * 24 * 60 + mhour * 60 + mminute;
int dend = end / (24 * 60);
int hend = end / 60 % 24;
int mend = end % 60;
if (minutes < start || minutes > end)
Calendar cal_start = Calendar.getInstance();
cal_start.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY + dstart);
cal_start.set(Calendar.HOUR_OF_DAY, hstart);
cal_start.set(Calendar.MINUTE, mstart);
cal_start.set(Calendar.SECOND, 0);
Calendar cal_end = Calendar.getInstance();
cal_end.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY + dend);
cal_end.set(Calendar.HOUR_OF_DAY, hend);
cal_end.set(Calendar.MINUTE, mend);
cal_end.set(Calendar.SECOND, 0);
if (cal_start.getTimeInMillis() > cal_end.getTimeInMillis())
cal_start.add(Calendar.HOUR_OF_DAY, -7 * 24);
if (message.received < cal_start.getTimeInMillis() ||
message.received > cal_end.getTimeInMillis())
return false;
}