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

(fix) EAS yearly rrule generation + small EAS MoveItems fix

pull/221/head
Ludovic Marcotte 2016-09-14 09:19:30 -04:00
parent b626fbf178
commit 557936f7fd
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ActiveSync/SOGoActiveSyncDispatcher.m
View File

@ -2048,9 +2048,8 @@ void handle_eas_terminate(int signum)
dstUidCache = [dstFolderMetadata objectForKey: @"UidCache"];
dstSyncCache = [dstFolderMetadata objectForKey: @"SyncCache"];
if (srcUidCache)
if (srcUidCache && (srcMessageId = [[srcUidCache allKeysForObject: origSrcMessageId] objectAtIndex: 0]))
{
srcMessageId = [[srcUidCache allKeysForObject: origSrcMessageId] objectAtIndex: 0];
if (debugOn)
[self logWithFormat: @"EAS - Found serverId: %@ for easId: %@", srcMessageId, origSrcMessageId];
}

9
ActiveSync/iCalRecurrenceRule+ActiveSync.m
View File

@ -176,7 +176,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
}
}
else
type = 5;
{
type = 5;
[s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"Calendar:\">%d</Recurrence_DayOfMonth>",
(int)[[[self parent] startDate] dayOfMonth]];
[s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"Calendar:\">%d</Recurrence_MonthOfYear>",
(int)[[[self parent] startDate] monthOfYear]];
}
}
[s appendFormat: @"<Recurrence_Type xmlns=\"Calendar:\">%d</Recurrence_Type>", type];