From 9381ff4e2c0e77973a37105516961fe4c4cae1ba Mon Sep 17 00:00:00 2001 From: Conrad Kramer Date: Mon, 23 Jan 2017 18:32:58 -0800 Subject: [PATCH] Fix MCOAccountValidator to work with arbitrary services --- src/objc/provider/MCOAccountValidator.h | 6 +++--- src/objc/provider/MCOAccountValidator.mm | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/objc/provider/MCOAccountValidator.h b/src/objc/provider/MCOAccountValidator.h index 8d6676b18..1d1d42318 100644 --- a/src/objc/provider/MCOAccountValidator.h +++ b/src/objc/provider/MCOAccountValidator.h @@ -27,9 +27,9 @@ @property (nonatomic, copy) NSString * password; @property (nonatomic, copy) NSString * OAuth2Token; -@property (nonatomic, retain) NSArray * /* MCONetService */ imapServers; -@property (nonatomic, retain) NSArray * /* MCONetService */ popServers; -@property (nonatomic, retain) NSArray * /* MCONetService */ smtpServers; +@property (nonatomic, retain) NSArray * /* MCONetService */ imapServices; +@property (nonatomic, retain) NSArray * /* MCONetService */ popServices; +@property (nonatomic, retain) NSArray * /* MCONetService */ smtpServices; @property (nonatomic, assign, getter=isImapEnabled) BOOL imapEnabled; @property (nonatomic, assign, getter=isPopEnabled) BOOL popEnabled; diff --git a/src/objc/provider/MCOAccountValidator.mm b/src/objc/provider/MCOAccountValidator.mm index ab240bf56..ae2844812 100644 --- a/src/objc/provider/MCOAccountValidator.mm +++ b/src/objc/provider/MCOAccountValidator.mm @@ -74,6 +74,9 @@ + (NSObject *) mco_objectWithMCObject:(mailcore::Object *)object MCO_OBJC_SYNTHESIZE_STRING(setUsername, username) MCO_OBJC_SYNTHESIZE_STRING(setPassword, password) MCO_OBJC_SYNTHESIZE_STRING(setOAuth2Token, OAuth2Token) +MCO_OBJC_SYNTHESIZE_ARRAY(setImapServices, imapServices) +MCO_OBJC_SYNTHESIZE_ARRAY(setPopServices, popServices) +MCO_OBJC_SYNTHESIZE_ARRAY(setSmtpServices, smtpServices) MCO_OBJC_SYNTHESIZE_BOOL(setImapEnabled, isImapEnabled) MCO_OBJC_SYNTHESIZE_BOOL(setPopEnabled, isPopEnabled) MCO_OBJC_SYNTHESIZE_BOOL(setSmtpEnabled, isSmtpEnabled)