Merge remote-tracking branch 'upstream/master'

2 files changed, 14 insertions, 1 deletions

diff --git a/src/async/smtp/MCSMTPAsyncSession.cc b/src/async/smtp/MCSMTPAsyncSession.cc
index fafc2e82..f670894a 100644
--- a/src/async/smtp/MCSMTPAsyncSession.cc
+++ b/src/async/smtp/MCSMTPAsyncSession.cc
@@ -41,7 +41,7 @@ namespace mailcore {
         virtual ~SMTPConnectionLogger() {
         }
         
-        virtual void log(void * context, void * sender, ConnectionLogType logType, Data * buffer)
+        virtual void log(void * sender, ConnectionLogType logType, Data * buffer)
         {
             mSession->logConnection(logType, buffer);
         }
@@ -113,6 +113,16 @@ String * SMTPAsyncSession::password()
     return mSession->password();
 }
 
+void SMTPAsyncSession::setOAuth2Token(String * token)
+{
+    mSession->setOAuth2Token(token);
+}
+
+String * SMTPAsyncSession::OAuth2Token()
+{
+    return mSession->OAuth2Token();
+}
+
 void SMTPAsyncSession::setAuthType(AuthType authType)
 {
     mSession->setAuthType(authType);
diff --git a/src/async/smtp/MCSMTPAsyncSession.h b/src/async/smtp/MCSMTPAsyncSession.h
index 9fa6dbdf..bbb81737 100644
--- a/src/async/smtp/MCSMTPAsyncSession.h
+++ b/src/async/smtp/MCSMTPAsyncSession.h
@@ -33,6 +33,9 @@ namespace mailcore {
 		virtual void setPassword(String * password);
 		virtual String * password();
 
+        virtual void setOAuth2Token(String * token);
+        virtual String * OAuth2Token();
+        
 		virtual void setAuthType(AuthType authType);
 		virtual AuthType authType();