From 427c9ddf6b92e487f80b9856dbca6b71da5d8af7 Mon Sep 17 00:00:00 2001 From: Sergey Bolhovskoy Date: Fri, 27 Feb 2015 03:11:57 +0000 Subject: VKontakte: fix restart connect process when network error on authorization git-svn-id: http://svn.miranda-ng.org/main/trunk@12276 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/src/vk_queue.cpp | 13 ++++++++----- protocols/VKontakte/src/vk_thread.cpp | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'protocols/VKontakte') diff --git a/protocols/VKontakte/src/vk_queue.cpp b/protocols/VKontakte/src/vk_queue.cpp index a022562d4e..64b9bc7c47 100644 --- a/protocols/VKontakte/src/vk_queue.cpp +++ b/protocols/VKontakte/src/vk_queue.cpp @@ -101,13 +101,16 @@ void CVkProto::WorkerThread(void*) else { // Initialize new OAuth session extern char szBlankUrl[]; - Push(new AsyncHttpRequest(this, REQUEST_GET, "https://oauth.vk.com/authorize", false, &CVkProto::OnOAuthAuthorize) - << INT_PARAM("client_id", VK_APP_ID) + AsyncHttpRequest *pReq = new AsyncHttpRequest(this, REQUEST_GET, "https://oauth.vk.com/authorize", false, &CVkProto::OnOAuthAuthorize) + << INT_PARAM("client_id", VK_APP_ID) << CHAR_PARAM("scope", "friends,photos,audio,docs,video,wall,messages,offline,status,notifications") - << CHAR_PARAM("redirect_uri", szBlankUrl) - << CHAR_PARAM("display", "mobile") + << CHAR_PARAM("redirect_uri", szBlankUrl) + << CHAR_PARAM("display", "mobile") << CHAR_PARAM("response_type", "token") - << VER_API)->m_bApiReq = false; + << VER_API; + pReq->m_bApiReq = false; + pReq->bIsMainConn = true; + Push(pReq); } while (true) { diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp index 99b9685001..306fda8600 100644 --- a/protocols/VKontakte/src/vk_thread.cpp +++ b/protocols/VKontakte/src/vk_thread.cpp @@ -147,6 +147,7 @@ void CVkProto::OnOAuthAuthorize(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq m_prevUrl = pReq->m_szUrl; } pReq->m_bApiReq = false; + pReq->bIsMainConn = true; Push(pReq); } } @@ -189,6 +190,7 @@ void CVkProto::OnOAuthAuthorize(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq pReq->Redirect(reply); ApplyCookies(pReq); pReq->m_bApiReq = false; + pReq->bIsMainConn = true; Push(pReq); } -- cgit v1.2.3