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

fix(eas): gcc v10 compat fixes (fixes #5029)

pull/275/head
Ludovic Marcotte 2020-06-23 13:02:49 -04:00
parent b3dd794515
commit e469f52dd1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ActiveSync/SOGoActiveSyncDispatcher+Sync.m
View File

@ -2211,7 +2211,7 @@ FIXME
// Cache-entry still exists but folder doesn't exists or synchronize flag is not set. // Cache-entry still exists but folder doesn't exists or synchronize flag is not set.
// We ignore the folder and wait for foldersync to do the cleanup. // We ignore the folder and wait for foldersync to do the cleanup.
if (!(mfCollection && [mfCollection synchronize])) if (!(mfCollection && [(SOGoGCSFolder*)mfCollection synchronize]))
{ {
if (debugOn) if (debugOn)
[self logWithFormat: @"EAS - Folder %@ not found. Ignoring ...", folderName]; [self logWithFormat: @"EAS - Folder %@ not found. Ignoring ...", folderName];
@ -2245,7 +2245,7 @@ FIXME
realCollectionId = [folderName realCollectionIdWithFolderType: &mergedFolderType]; realCollectionId = [folderName realCollectionIdWithFolderType: &mergedFolderType];
mfCollection = [self collectionFromId: realCollectionId type: mergedFolderType]; mfCollection = [self collectionFromId: realCollectionId type: mergedFolderType];
if (!(mfCollection && [mfCollection synchronize])) if (!(mfCollection && [(SOGoGCSFolder*)mfCollection synchronize]))
{ {
if (debugOn) if (debugOn)
[self logWithFormat: @"EAS - Folder %@ not found. Reset personal folder to cleanup", folderName]; [self logWithFormat: @"EAS - Folder %@ not found. Reset personal folder to cleanup", folderName];

4
ActiveSync/SOGoActiveSyncDispatcher.m
View File

@ -977,7 +977,7 @@ void handle_eas_terminate(int signum)
} }
// Remove the folder from device if it doesn't exist, or don't want to sync it. // Remove the folder from device if it doesn't exist, or don't want to sync it.
if (!currentFolder || !([currentFolder synchronize])) if (!currentFolder || !([(SOGoGCSFolder*)currentFolder synchronize]))
{ {
// Don't send a delete when MergedFoler is set, we have done it above. // Don't send a delete when MergedFoler is set, we have done it above.
// Windows Phones don't like when a <Delete>-folder is sent twice. // Windows Phones don't like when a <Delete>-folder is sent twice.
@ -1135,7 +1135,7 @@ void handle_eas_terminate(int signum)
continue; continue;
if (![currentFolder isKindOfClass: [SOGoGCSFolder class]] || if (![currentFolder isKindOfClass: [SOGoGCSFolder class]] ||
![currentFolder synchronize]) ![(SOGoGCSFolder*)currentFolder synchronize])
{ {
[folders removeObjectAtIndex: count]; [folders removeObjectAtIndex: count];
continue; continue;