LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix condition in weekly recurrence calculator

pull/225/head
Francis Lachapelle 2016-11-03 15:26:38 -04:00
parent 70f5d748f2
commit e6b129c8eb
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -9,6 +9,7 @@ Enhancements
Bug fixes
- [web] fixed mail settings persistence when sorting by arrival date
- [core] fixed condition in weekly recurrence calculator
3.2.1 (2016-11-02)
------------------

3
SOPE/NGCards/iCalDailyRecurrenceCalculator.m
View File

@ -160,8 +160,7 @@
{
r = [NGCalendarDateRange calendarDateRangeWithStartDate: currentStartDate
endDate: currentEndDate];
if ([_r containsDateRange: r] || [_r doesIntersectWithDateRange: r])
[ranges addObject: r];
[ranges addObject: r];
}
}
}

8
SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
View File

@ -125,16 +125,16 @@
while ([currentStartDate compare: endDate] == NSOrderedAscending ||
[currentStartDate compare: endDate] == NSOrderedSame)
{
currentEndDate = [currentStartDate addTimeInterval: [firstRange duration]];
if ([startDate compare: currentStartDate] == NSOrderedAscending ||
[startDate compare: currentStartDate] == NSOrderedSame)
[startDate compare: currentStartDate] == NSOrderedSame ||
[startDate compare: currentEndDate] == NSOrderedAscending)
{
NGCalendarDateRange *r;
currentEndDate = [currentStartDate addTimeInterval: [firstRange duration]];
r = [NGCalendarDateRange calendarDateRangeWithStartDate: currentStartDate
endDate: currentEndDate];
if ([_r containsDateRange: r])
[ranges addObject: r];
[ranges addObject: r];
}
i++;
currentStartDate = [firStart dateByAddingYears: 0