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

Correctly get the collection/key IDs (fixes #3775)

pull/218/head
Ludovic Marcotte 2016-07-25 06:17:17 -04:00
parent 63bdf77847
commit 4ed1063296
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ActiveSync/SOGoActiveSyncDispatcher+Sync.m
View File

@ -81,7 +81,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{
SOGoCacheGCSObject *o;
NSNumber *processIdentifier;
NSString *key;
NSString *key, *collectionId;;
int i;
processIdentifier = [NSNumber numberWithInt: [[NSProcessInfo processInfo] processIdentifier]];
@ -101,7 +101,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
for (i = 0; i < [collections count]; i++)
{
key = [NSString stringWithFormat: @"SyncRequest+%@", [[[(id)[[collections objectAtIndex: i] getElementsByTagName: @"CollectionId"] lastObject] textValue] stringByUnescapingURL]];
if ([[collections objectAtIndex: i] isKindOfClass: [NSString class]])
collectionId = [collections objectAtIndex: i];
else
collectionId = [[[(id)[[collections objectAtIndex: i] getElementsByTagName: @"CollectionId"] lastObject] textValue] stringByUnescapingURL];
key = [NSString stringWithFormat: @"SyncRequest+%@", collectionId];
[[o properties] setObject: processIdentifier forKey: key];
}
}
@ -110,7 +116,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[[o properties] removeObjectForKey: @"SyncRequest"];
for (i = 0; i < [collections count]; i++)
{
key = [NSString stringWithFormat: @"SyncRequest+%@", [[[(id)[[collections objectAtIndex: i] getElementsByTagName: @"CollectionId"] lastObject] textValue] stringByUnescapingURL]];
if ([[collections objectAtIndex: i] isKindOfClass: [NSString class]])
collectionId = [collections objectAtIndex: i];
else
collectionId = [[[(id)[[collections objectAtIndex: i] getElementsByTagName: @"CollectionId"] lastObject] textValue] stringByUnescapingURL];
key = [NSString stringWithFormat: @"SyncRequest+%@", collectionId];
[[o properties] removeObjectForKey: key];
}
}