From f708ce74e23b61ec6e5ae958eba0b8bcd8831a1e Mon Sep 17 00:00:00 2001 From: serjepatoff Date: Tue, 13 Sep 2016 23:29:21 +0400 Subject: MCIMAPCheckAccountOperation: connectIfNeeded() then login() sequence of calls is error-prone. Single loginIfNeeded() is better. (#1509) --- src/async/imap/MCIMAPCheckAccountOperation.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/async/imap/MCIMAPCheckAccountOperation.cpp b/src/async/imap/MCIMAPCheckAccountOperation.cpp index 64e9a51a..87e6a705 100644 --- a/src/async/imap/MCIMAPCheckAccountOperation.cpp +++ b/src/async/imap/MCIMAPCheckAccountOperation.cpp @@ -28,13 +28,10 @@ IMAPCheckAccountOperation::~IMAPCheckAccountOperation() void IMAPCheckAccountOperation::main() { ErrorCode error; - session()->session()->connectIfNeeded(&error); - if (error == ErrorNone) { - session()->session()->login(&error); - if (error != ErrorNone) { - MC_SAFE_REPLACE_COPY(String, mLoginResponse, session()->session()->loginResponse()); - MC_SAFE_REPLACE_COPY(Data, mLoginUnparsedResponseData, session()->session()->unparsedResponseData()); - } + session()->session()->loginIfNeeded(&error); + if (error != ErrorNone) { + MC_SAFE_REPLACE_COPY(String, mLoginResponse, session()->session()->loginResponse()); + MC_SAFE_REPLACE_COPY(Data, mLoginUnparsedResponseData, session()->session()->unparsedResponseData()); } setError(error); } -- cgit v1.2.3