amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-22 11:55:24 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: d730814de50b7c4fd0fa165b4b6e02e968ff60ef

Browse Source 
Monotone-Revision: 148caf2ae66d2024b6008a2633e9145890921239

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-09-01T20:27:45
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-09-01 20:27:45 +00:00
parent 5ae619bea4
commit 4d5c0ff6f4
28 changed files with 770 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/PreferencesUI/UIxPreferences.m
+44 -2
View File
@@ -1096,6 +1096,45 @@
}
}
- (BOOL) _validateReceiptAction: (NSString *) action
{
return ([action isKindOfClass: [NSString class]]
&& ([action isEqualToString: @"ignore"]
|| [action isEqualToString: @"send"]
|| [action isEqualToString: @"ask"]));
}
- (void) _extractMainReceiptsPreferences: (NSDictionary *) account
{
/* We perform some validation here as we have no guaranty on the input
validity. */
NSDictionary *receipts;
NSString *action;
if ([account isKindOfClass: [NSDictionary class]])
{
receipts = [account objectForKey: @"receipts"];
if ([receipts isKindOfClass: [NSDictionary class]])
{
action = [receipts objectForKey: @"receiptAction"];
[userDefaults
setAllowUserReceipt: [action isEqualToString: @"allow"]];
action = [receipts objectForKey: @"receiptNonRecipientAction"];
if ([self _validateReceiptAction: action])
[userDefaults setUserReceiptNonRecipientAction: action];
action = [receipts objectForKey: @"receiptOutsideDomainAction"];
if ([self _validateReceiptAction: action])
[userDefaults setUserReceiptOutsideDomainAction: action];
action = [receipts objectForKey: @"receiptAnyAction"];
if ([self _validateReceiptAction: action])
[userDefaults setUserReceiptAnyAction: action];
}
}
}
- (BOOL) _validateAccountIdentities: (NSArray *) identities
{
static NSString *identityKeys[] = { @"fullName", @"email", nil };
@@ -1160,9 +1199,11 @@
if (!knownKeys)
{
knownKeys = [NSArray arrayWithObjects: @"name", @"serverName",
knownKeys = [NSArray arrayWithObjects: @"name", @"serverName", @"port",
@"userName", @"password", @"encryption",
@"identities", @"mailboxes", @"port", nil];
@"identities", @"mailboxes",
@"receipts",
nil];
[knownKeys retain];
}
@@ -1254,6 +1295,7 @@
if (max > 0)
{
[self _extractMainSignature: [accounts objectAtIndex: 0]];
[self _extractMainReceiptsPreferences: [accounts objectAtIndex: 0]];
if ([self mailAuxiliaryUserAccountsEnabled])
[self _extractAuxiliaryAccounts: accounts];