auto-detection enable

auto-detection enable

Author: Lin

src/async/imap/MCIMAPAsyncConnection.cpp

@@ -225,16 +225,6 @@ bool IMAPAsyncConnection::isVoIPEnabled()
     return mSession->isVoIPEnabled();
 }
 
-void IMAPAsyncConnection::setNetEaseWorkaroundEnabled(bool enabled)
-{
-    mSession->setNetEaseWorkaroundEnabled(enabled);
-}
-
-bool IMAPAsyncConnection::isNetEaseWorkaroundEnabled()
-{
-    return mSession->isNetEaseWorkaroundEnabled();
-}
-
 void IMAPAsyncConnection::setDefaultNamespace(IMAPNamespace * ns)
 {
     mSession->setDefaultNamespace(ns);

src/async/imap/MCIMAPAsyncConnection.h

@@ -69,9 +69,6 @@ namespace mailcore {
         virtual void setVoIPEnabled(bool enabled);
         virtual bool isVoIPEnabled();
 
-        virtual void setNetEaseWorkaroundEnabled(bool enabled);
-        virtual bool isNetEaseWorkaroundEnabled();
-        
         virtual void setAutomaticConfigurationEnabled(bool enabled);
         virtual bool isAutomaticConfigurationEnabled();
 

src/async/imap/MCIMAPAsyncSession.cpp

@@ -62,7 +62,6 @@ IMAPAsyncSession::IMAPAsyncSession()
     mConnectionType = ConnectionTypeClear;
     mCheckCertificateEnabled = true;
     mVoIPEnabled = true;
-    mNetEaseWorkaroundEnabled = false;
     mDefaultNamespace = NULL;
     mTimeout = 30.;
     mConnectionLogger = NULL;
@@ -97,15 +96,6 @@ IMAPAsyncSession::~IMAPAsyncSession()
 void IMAPAsyncSession::setHostname(String * hostname)
 {
     MC_SAFE_REPLACE_COPY(String, mHostname, hostname);
-    
-    
-    if(!mNetEaseWorkaroundEnabled && hostname
-       && (hostname->hasSuffix(String::stringWithUTF8Characters((char *) ".163.com"))
-           || hostname->hasSuffix(String::stringWithUTF8Characters((char *) ".126.com"))
-           || hostname->hasSuffix(String::stringWithUTF8Characters((char *) ".yeah.net"))
-           )) {
-           mNetEaseWorkaroundEnabled = true;
-    }
 }
 
 String * IMAPAsyncSession::hostname()
@@ -203,21 +193,6 @@ bool IMAPAsyncSession::isVoIPEnabled()
     return mVoIPEnabled;
 }
 
-void IMAPAsyncSession::setNetEaseWorkaroundEnabled(bool enabled)
-{
-    mNetEaseWorkaroundEnabled = enabled;
-}
-
-bool IMAPAsyncSession::isNetEaseWorkaroundEnabled()
-{
-    return mNetEaseWorkaroundEnabled;
-}
-
-IMAPNamespace * IMAPAsyncSession::defaultNamespace()
-{
-    return mDefaultNamespace;
-}
-
 void IMAPAsyncSession::setDefaultNamespace(IMAPNamespace * ns)
 {
     MC_SAFE_REPLACE_RETAIN(IMAPNamespace, mDefaultNamespace, ns);
@@ -275,7 +250,6 @@ IMAPAsyncConnection * IMAPAsyncSession::session()
     session->setTimeout(mTimeout);
     session->setCheckCertificateEnabled(mCheckCertificateEnabled);
     session->setVoIPEnabled(mVoIPEnabled);
-    session->setNetEaseWorkaroundEnabled(mNetEaseWorkaroundEnabled);
     session->setDefaultNamespace(mDefaultNamespace);
     session->setClientIdentity(mClientIdentity);
 #if __APPLE__

src/async/imap/MCIMAPAsyncSession.h

@@ -78,9 +78,6 @@ namespace mailcore {
         virtual void setVoIPEnabled(bool enabled);
         virtual bool isVoIPEnabled();
 
-        virtual void setNetEaseWorkaroundEnabled(bool enabled);
-        virtual bool isNetEaseWorkaroundEnabled();
-        
         virtual void setDefaultNamespace(IMAPNamespace * ns);
         virtual IMAPNamespace * defaultNamespace();
 
@@ -189,7 +186,6 @@ namespace mailcore {
         ConnectionType mConnectionType;
         bool mCheckCertificateEnabled;
         bool mVoIPEnabled;
-        bool mNetEaseWorkaroundEnabled;
         IMAPNamespace * mDefaultNamespace;
         time_t mTimeout;
         bool mAllowsFolderConcurrentAccessEnabled;

src/core/imap/MCIMAPSession.cpp

@@ -316,7 +316,6 @@ void IMAPSession::init()
     mConnectionType = ConnectionTypeClear;
     mCheckCertificateEnabled = true;
     mVoIPEnabled = true;
-    mNetEaseWorkaroundEnabled = false;
     mDelimiter = 0;
 
     mBodyProgressEnabled = true;
@@ -478,16 +477,6 @@ bool IMAPSession::isVoIPEnabled()
     return mVoIPEnabled;
 }
 
-void IMAPSession::setNetEaseWorkaroundEnabled(bool enabled) 
-{
-    mNetEaseWorkaroundEnabled = enabled;
-}
-
-bool IMAPSession::isNetEaseWorkaroundEnabled() 
-{
-    return mNetEaseWorkaroundEnabled;
-}
-
 static bool hasError(int errorCode)
 {
     return ((errorCode != MAILIMAP_NO_ERROR) && (errorCode != MAILIMAP_NO_ERROR_AUTHENTICATED) &&
@@ -547,9 +536,6 @@ void IMAPSession::setup()
     mailimap_set_timeout(mImap, timeout());
     mailimap_set_progress_callback(mImap, body_progress, IMAPSession::items_progress, this);
     mailimap_set_logger(mImap, logger, this);
-#ifdef LIBETPAN_HAS_MAILIMAP_163_WORKAROUND
-    mailimap_set_163_workaround_enabled(mImap, mNetEaseWorkaroundEnabled);
-#endif
 }
 
 void IMAPSession::unsetup()
@@ -641,6 +627,11 @@ void IMAPSession::connect(ErrorCode * pError)
     if (mImap->imap_response != NULL) {
         MC_SAFE_REPLACE_RETAIN(String, mWelcomeString, String::stringWithUTF8Characters(mImap->imap_response));
         mYahooServer = (mWelcomeString->locationOfString(MCSTR("yahoo.com")) != -1);
+#ifdef LIBETPAN_HAS_MAILIMAP_163_WORKAROUND
+        if(mWelcomeString->locationOfString(MCSTR("* OK Coremail System IMap Server Ready")) != -1) {
+            mailimap_set_163_workaround_enabled(mImap, 1);
+        }
+#endif
     }
 
     mState = STATE_CONNECTED;

src/core/imap/MCIMAPSession.h

@@ -59,9 +59,6 @@ namespace mailcore {
         virtual void setVoIPEnabled(bool enabled);
         virtual bool isVoIPEnabled();
 
-        virtual void setNetEaseWorkaroundEnabled(bool enabled);
-        virtual bool isNetEaseWorkaroundEnabled();
-        
         // Needed for fetchSubscribedFolders() and fetchAllFolders().
         virtual void setDefaultNamespace(IMAPNamespace * ns);
         virtual IMAPNamespace * defaultNamespace();
@@ -223,7 +220,6 @@ namespace mailcore {
         ConnectionType mConnectionType;
         bool mCheckCertificateEnabled;
         bool mVoIPEnabled;
-        bool mNetEaseWorkaroundEnabled;
         char mDelimiter;
         IMAPNamespace * mDefaultNamespace;
         IMAPIdentity * mServerIdentity;

src/objc/imap/MCOIMAPSession.h

@@ -81,9 +81,6 @@
 /** When set to YES, VoIP capability will be enabled on the IMAP connection on iOS */
 @property (nonatomic, assign, getter=isVoIPEnabled) BOOL voIPEnabled;
 
-/** When set to YES, the workaround for NetEase's imap server will be enabled on the IMAP connection on iOS */
-@property (nonatomic, assign, getter=isNetEaseWorkaroundEnabled) BOOL netEaseWorkaroundEnabled;
-
 /** The default namespace. */
 @property (nonatomic, strong) MCOIMAPNamespace * defaultNamespace;
 

src/objc/imap/MCOIMAPSession.mm

@@ -103,7 +103,6 @@ - (void)dealloc {
 MCO_OBJC_SYNTHESIZE_SCALAR(NSTimeInterval, time_t, setTimeout, timeout)
 MCO_OBJC_SYNTHESIZE_BOOL(setCheckCertificateEnabled, isCheckCertificateEnabled)
 MCO_OBJC_SYNTHESIZE_BOOL(setVoIPEnabled, isVoIPEnabled)
-MCO_OBJC_SYNTHESIZE_BOOL(setNetEaseWorkaroundEnabled, isNetEaseWorkaroundEnabled)
 MCO_OBJC_SYNTHESIZE_SCALAR(BOOL, BOOL, setAllowsFolderConcurrentAccessEnabled, allowsFolderConcurrentAccessEnabled)
 MCO_OBJC_SYNTHESIZE_SCALAR(unsigned int, unsigned int, setMaximumConnections, maximumConnections)
 MCO_OBJC_SYNTHESIZE_SCALAR(dispatch_queue_t, dispatch_queue_t, setDispatchQueue, dispatchQueue);