amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-21 06:33:18 +00:00
Code Issues Projects Releases Wiki Activity

applied comments

Browse Source
This commit is contained in:
Alexandre Cloutier
2014-09-09 13:51:02 -04:00
parent 0c88edc61b
commit e6002c9b2a
3 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MailerUI/UIxMailFolderActions.m
+9 -11
View File
@@ -92,7 +92,7 @@
SOGoUserSettings *us;
WOResponse *response;
NSException *error;
NSString *newFolderName, *oldFolderName, *currentMailbox, *currentAccount, *keyForMsgUIDs, *newKeyForMsgUIDs;
NSString *newFolderName, *currentMailbox, *currentAccount, *keyForMsgUIDs, *newKeyForMsgUIDs;
NSMutableDictionary *moduleSettings, *threadsCollapsed;
NSArray *values;
@@ -116,9 +116,9 @@
else
{
// Verify if the current folder have any collapsed threads save under it old name and adjust the folderName
if ([threadsCollapsed boolValue])
if (threadsCollapsed)
{
if ([[threadsCollapsed objectForKey:keyForMsgUIDs] boolValue])
if ([threadsCollapsed objectForKey:keyForMsgUIDs])
{
values = [NSArray arrayWithArray:[threadsCollapsed objectForKey:keyForMsgUIDs]];
[threadsCollapsed setObject:values forKey:newKeyForMsgUIDs];
@@ -209,9 +209,9 @@
currentAccount = [[co container] nameInContainer];
keyForMsgUIDs = [NSString stringWithFormat:@"/%@/%@", currentAccount, currentMailbox];
if ([threadsCollapsed boolValue])
if (threadsCollapsed)
{
if ([[threadsCollapsed objectForKey:keyForMsgUIDs] boolValue])
if ([threadsCollapsed objectForKey:keyForMsgUIDs])
{
[threadsCollapsed removeObjectForKey:keyForMsgUIDs];
[us synchronize];
@@ -273,11 +273,10 @@
currentAccount = [[co container] nameInContainer];
keyForMsgUIDs = [NSString stringWithFormat:@"/%@/%@", currentAccount, currentMailbox];
if ([threadsCollapsed boolValue])
if (threadsCollapsed)
{
if ([[threadsCollapsed objectForKey:keyForMsgUIDs] boolValue])
if ((mailboxThreadsCollapsed = [threadsCollapsed objectForKey:keyForMsgUIDs]))
{
mailboxThreadsCollapsed = [threadsCollapsed objectForKey:keyForMsgUIDs];
for (i = 0; i < [uids count]; i++)
[mailboxThreadsCollapsed removeObject:[uids objectAtIndex:i]];
[us synchronize];
@@ -411,11 +410,10 @@
currentAccount = [[co container] nameInContainer];
keyForMsgUIDs = [NSString stringWithFormat:@"/%@/%@", currentAccount, currentMailbox];
if ([threadsCollapsed boolValue])
if (threadsCollapsed)
{
if ([[threadsCollapsed objectForKey:keyForMsgUIDs] boolValue])
if ((mailboxThreadsCollapsed = [threadsCollapsed objectForKey:keyForMsgUIDs]))
{
mailboxThreadsCollapsed = [threadsCollapsed objectForKey:keyForMsgUIDs];
for (i = 0; i < [uids count]; i++)
[mailboxThreadsCollapsed removeObject:[uids objectAtIndex:i]];
[us synchronize];