(fix) handle Dovecot's mail_shared_explicit_inbox when using EAS

Conflicts:

	ActiveSync/SOGoActiveSyncDispatcher.m
	SoObjects/Mailer/SOGoMailAccount.m
This commit is contained in:
Ludovic Marcotte committed 2016-03-28 11:18:35 -04:00
1 parent c885aaeb88
commit 663c4a44a2
2 files changed
+53 -30

No files matched your search

+21 -1
View File
@@ -172,6 +172,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[super dealloc];
}
- (void) _ensureFolder: (SOGoMailFolder *) mailFolder
{
BOOL rc;
if (![mailFolder isKindOfClass: [NSException class]])
{
rc = [mailFolder exists];
if (!rc)
rc = [mailFolder create];
}
}
- (void) _setFolderSyncKey: (NSString *) theSyncKey
{
SOGoCacheGCSObject *o;
@@ -773,7 +785,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
accountsFolder = [userFolder lookupName: @"Mail" inContext: context acquire: NO];
accountFolder = [accountsFolder lookupName: @"0" inContext: context acquire: NO];
allFoldersMetadata = [accountFolder allFoldersMetadata];
if (first_sync)
{
[self _ensureFolder: (SOGoMailFolder *)[accountFolder draftsFolderInContext: context]];
[self _ensureFolder: [accountFolder sentFolderInContext: context]];
[self _ensureFolder: (SOGoMailFolder *)[accountFolder trashFolderInContext: context]];
}
allFoldersMetadata = [NSMutableArray array];
[self _flattenFolders: [accountFolder allFoldersMetadata] into: allFoldersMetadata parent: nil];
// Get GUIDs of folder (IMAP)
// e.g. {folderINBOX = folder6b93c528176f1151c7260000aef6df92}