root@sogo:~/SOGo-2.2.0/ActiveSync# diff NSString+ActiveSync.m /tmp/SOGo-2.2.0/ActiveSync/NSString+ActiveSync.m 156,172d155 < // This method extracts the "DeviceType" from a URI: < // < // /SOGo/Microsoft-Server-ActiveSync?Cmd=FolderSync&User=sogo10&DeviceId=SEC17CD1A3E9E3F2&DeviceType=SAMSUNGSGHI317M < // < - (NSString *) deviceType < { < NSString *s; < < s = [self _valueForParameter: @"DEVICETYPE="]; < < if (!s) < s = @"Unknown"; < < return s; < } < < // root@sogo:~/SOGo-2.2.0/ActiveSync# root@sogo:~/SOGo-2.2.0/ActiveSync# diff SOGoActiveSyncDispatcher+Sync.m /tmp/SOGo-2.2.0/ActiveSync/SOGoActiveSyncDispatcher+Sync.m 110,113d109 < //tfu < #import < < 603,618d598 < //tfu < < < NSLog(@"tfu SyncGetChanges cmd %@ - %@", command, uid ); < // if "deviceType+uid" found in cache it was saved by SOGoActiveSyncDispatcher.m (moveitem - outlook client) change the command = 'changed' < if ([[SOGoCache sharedCache] valueForKey: [NSString stringWithFormat: @"%@+%@", [context objectForKey: @"DeviceType"], uid ]]) { < NSLog(@"tfu SyncGetChanges 1 %@ - %@", [context objectForKey: @"DeviceType"], uid ); < [[SOGoCache sharedCache] removeValueForKey: [NSString stringWithFormat: @"%@+%@", [context objectForKey: @"DeviceType"], uid ]]; < NSLog(@"tfu SyncGetChanges 2 %@ - %@", [context objectForKey: @"DeviceType"], uid ); < //??? < //continue; < command = @"changed"; < } < NSLog(@"tfu SyncGetChanges cmd %@ - %@", command, uid ); < < //tfu root@sogo:~/SOGo-2.2.0/ActiveSync# diff SOGoActiveSyncDispatcher.m /tmp/SOGo-2.2.0/ActiveSync/SOGoActiveSyncDispatcher.m 117,119d116 < //tfu < #import < 930,943d926 < < //tfu < < NSLog(@"tfu MoveItem %@ - %@", [context objectForKey: @"DeviceType"], dstMessageId ); < NSLog(@"tfu MoveItem1 %@ - %@", [context objectForKey: @"DeviceId"], dstMessageId ); < // if move is initiated by an outlook client save the "deviceType+dstMessageId" to use it later to modify the sync-command from add to change (SOGoActiveSyncDispatcher+Sync.m) < if ([[context objectForKey: @"DeviceType"] isEqualToString: @"WindowsOutlook15" ] ) { < NSLog(@"tfu MoveItem 2 %@ - %@", [context objectForKey: @"DeviceType"], dstMessageId ); < < [[SOGoCache sharedCache] setValue: @"MovedItem" < forKey: [NSString stringWithFormat: @"%@+%@", [context objectForKey: @"DeviceType"], dstMessageId]]; < NSLog(@"tfu MoveItem 3 %@ - %@", [context objectForKey: @"DeviceType"], dstMessageId ); < } < //tfu