(fix) EAS yearly rrule generation + small EAS MoveItems fix
parent
b626fbf178
commit
557936f7fd
|
@ -2048,9 +2048,8 @@ void handle_eas_terminate(int signum)
|
||||||
dstUidCache = [dstFolderMetadata objectForKey: @"UidCache"];
|
dstUidCache = [dstFolderMetadata objectForKey: @"UidCache"];
|
||||||
dstSyncCache = [dstFolderMetadata objectForKey: @"SyncCache"];
|
dstSyncCache = [dstFolderMetadata objectForKey: @"SyncCache"];
|
||||||
|
|
||||||
if (srcUidCache)
|
if (srcUidCache && (srcMessageId = [[srcUidCache allKeysForObject: origSrcMessageId] objectAtIndex: 0]))
|
||||||
{
|
{
|
||||||
srcMessageId = [[srcUidCache allKeysForObject: origSrcMessageId] objectAtIndex: 0];
|
|
||||||
if (debugOn)
|
if (debugOn)
|
||||||
[self logWithFormat: @"EAS - Found serverId: %@ for easId: %@", srcMessageId, origSrcMessageId];
|
[self logWithFormat: @"EAS - Found serverId: %@ for easId: %@", srcMessageId, origSrcMessageId];
|
||||||
}
|
}
|
||||||
|
|
|
@ -176,7 +176,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
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];
|
[s appendFormat: @"<Recurrence_Type xmlns=\"Calendar:\">%d</Recurrence_Type>", type];
|
||||||
|
|
Loading…
Reference in New Issue