(feat) Now able to sync only default mail folders when using EAS
Conflicts: NEWS SoObjects/SOGo/SOGoUserDefaults.h SoObjects/SOGo/SOGoUserDefaults.mpull/186/head
parent
609c5aabf7
commit
6ffeba59ed
8
NEWS
8
NEWS
|
@ -1,4 +1,10 @@
|
||||||
2.3.5 (2016-01-DD)
|
2.3.6 (2016-01-XX)
|
||||||
|
------------------
|
||||||
|
|
||||||
|
New features
|
||||||
|
- Now able to sync only default mail folders when using EAS
|
||||||
|
|
||||||
|
2.3.5 (2016-01-05)
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
Enhancements
|
Enhancements
|
||||||
|
|
|
@ -714,6 +714,7 @@ static NSString *inboxFolderName = @"INBOX";
|
||||||
NSDictionary *result, *nresult, *namespaceDict;
|
NSDictionary *result, *nresult, *namespaceDict;
|
||||||
NSMutableDictionary *folders;
|
NSMutableDictionary *folders;
|
||||||
NGImap4Client *client;
|
NGImap4Client *client;
|
||||||
|
SOGoUserDefaults *ud;
|
||||||
NSArray *folderList;
|
NSArray *folderList;
|
||||||
NSEnumerator *e;
|
NSEnumerator *e;
|
||||||
NSString *guid;
|
NSString *guid;
|
||||||
|
@ -721,7 +722,17 @@ static NSString *inboxFolderName = @"INBOX";
|
||||||
|
|
||||||
BOOL hasAnnotatemore;
|
BOOL hasAnnotatemore;
|
||||||
|
|
||||||
folderList = [self allFolderPaths];
|
ud = [[context activeUser] userDefaults];
|
||||||
|
|
||||||
|
if ([ud synchronizeOnlyDefaultMailFolders])
|
||||||
|
folderList = [[NSArray arrayWithObjects:
|
||||||
|
[self inboxFolderNameInContext: context],
|
||||||
|
[self draftsFolderNameInContext: context],
|
||||||
|
[self sentFolderNameInContext: context],
|
||||||
|
[self trashFolderNameInContext: context],
|
||||||
|
nil] stringsWithFormat: @"/%@"];
|
||||||
|
else
|
||||||
|
folderList = [self allFolderPaths];
|
||||||
|
|
||||||
folders = [NSMutableDictionary dictionary];
|
folders = [NSMutableDictionary dictionary];
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* SOGoUserDefaults.h - this file is part of SOGo
|
/* SOGoUserDefaults.h - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-2015 Inverse inc.
|
* Copyright (C) 2011-2016 Inverse inc.
|
||||||
*
|
*
|
||||||
* This file is free software; you can redistribute it and/or modify
|
* This file is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -93,6 +93,9 @@ extern NSString *SOGoWeekStartFirstFullWeek;
|
||||||
- (void) setMailShowSubscribedFoldersOnly: (BOOL) newValue;
|
- (void) setMailShowSubscribedFoldersOnly: (BOOL) newValue;
|
||||||
- (BOOL) mailShowSubscribedFoldersOnly;
|
- (BOOL) mailShowSubscribedFoldersOnly;
|
||||||
|
|
||||||
|
- (void) setSynchronizeOnlyDefaultMailFolders: (BOOL) newValue;
|
||||||
|
- (BOOL) synchronizeOnlyDefaultMailFolders;
|
||||||
|
|
||||||
- (void) setMailSortByThreads: (BOOL) newValue;
|
- (void) setMailSortByThreads: (BOOL) newValue;
|
||||||
- (BOOL) mailSortByThreads;
|
- (BOOL) mailSortByThreads;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* SOGoUserDefaults.m - this file is part of SOGo
|
/* SOGoUserDefaults.m - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009-2015 Inverse inc.
|
* Copyright (C) 2009-2016 Inverse inc.
|
||||||
*
|
*
|
||||||
* This file is free software; you can redistribute it and/or modify
|
* This file is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -405,6 +405,16 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
|
||||||
return [self boolForKey: @"SOGoMailShowSubscribedFoldersOnly"];
|
return [self boolForKey: @"SOGoMailShowSubscribedFoldersOnly"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void) setSynchronizeOnlyDefaultMailFolders: (BOOL) newValue
|
||||||
|
{
|
||||||
|
[self setBool: newValue forKey: @"SOGoMailSynchronizeOnlyDefaultFolders"];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (BOOL) synchronizeOnlyDefaultMailFolders
|
||||||
|
{
|
||||||
|
return [self boolForKey: @"SOGoMailSynchronizeOnlyDefaultFolders"];
|
||||||
|
}
|
||||||
|
|
||||||
- (void) setMailSortByThreads: (BOOL) newValue
|
- (void) setMailSortByThreads: (BOOL) newValue
|
||||||
{
|
{
|
||||||
[self setBool: newValue forKey: @"SOGoMailSortByThreads"];
|
[self setBool: newValue forKey: @"SOGoMailSortByThreads"];
|
||||||
|
|
Loading…
Reference in New Issue