diff options
author | 2015-04-02 23:49:47 -0700 | |
---|---|---|
committer | 2015-04-02 23:50:04 -0700 | |
commit | 4f5458d374227507b0c6d4dc04478ad76e943689 (patch) | |
tree | aff7fd172a05ab32dc7a437677a3e7d6ce2fa295 /src/objc | |
parent | cbee27cd693ceed2738d88a39e71d7a599b9e28f (diff) |
Improve account validation: fail on first error, validation of services can be disabled/enabled, no need to provide a list of servers when a provider is detected
Diffstat (limited to 'src/objc')
-rw-r--r-- | src/objc/provider/MCOAccountValidator.h | 4 | ||||
-rw-r--r-- | src/objc/provider/MCOAccountValidator.mm | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/objc/provider/MCOAccountValidator.h b/src/objc/provider/MCOAccountValidator.h index 0cdc25aa..b5f09bc2 100644 --- a/src/objc/provider/MCOAccountValidator.h +++ b/src/objc/provider/MCOAccountValidator.h @@ -30,6 +30,10 @@ @property (nonatomic, retain) NSArray * /* MCONetService */ popServers; @property (nonatomic, retain) NSArray * /* MCONetService */ smtpServers; +@property (nonatomic, assign, getter=isImapEnabled) BOOL imapEnabled; +@property (nonatomic, assign, getter=isPopEnabled) BOOL popEnabled; +@property (nonatomic, assign, getter=isSmtpEnabled) BOOL smtpEnabled; + // result @property (nonatomic, retain, readonly) NSString * identifier; @property (nonatomic, retain, readonly) MCONetService * imapServer; diff --git a/src/objc/provider/MCOAccountValidator.mm b/src/objc/provider/MCOAccountValidator.mm index b8260486..34d8992b 100644 --- a/src/objc/provider/MCOAccountValidator.mm +++ b/src/objc/provider/MCOAccountValidator.mm @@ -19,11 +19,7 @@ typedef void (^CompletionType)(void); @interface MCOAccountValidator () -@property (nonatomic, retain) NSError * imapError; -@property (nonatomic, retain) NSError * popError; -@property (nonatomic, retain) NSError * smtpError; - -- (void) operationCompleted; +- (void) _operationCompleted; @end @@ -36,7 +32,7 @@ public: void operationFinished(mailcore::Operation * op) { - [mOperation operationCompleted]; + [mOperation _operationCompleted]; } private: @@ -71,6 +67,9 @@ MCO_OBJC_SYNTHESIZE_STRING(setEmail, email) MCO_OBJC_SYNTHESIZE_STRING(setUsername, username) MCO_OBJC_SYNTHESIZE_STRING(setPassword, password) MCO_OBJC_SYNTHESIZE_STRING(setOAuth2Token, OAuth2Token) +MCO_OBJC_SYNTHESIZE_BOOL(setImapEnabled, isImapEnabled) +MCO_OBJC_SYNTHESIZE_BOOL(setPopEnabled, isPopEnabled) +MCO_OBJC_SYNTHESIZE_BOOL(setSmtpEnabled, isSmtpEnabled) - (id) init { @@ -106,7 +105,7 @@ MCO_OBJC_SYNTHESIZE_STRING(setOAuth2Token, OAuth2Token) [super cancel]; } -- (void) operationCompleted +- (void) _operationCompleted { if (_completionBlock == NULL) return; |