procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix crash on precondition in PeerListBox. 

If a global search request was sent and we clear the query the
response still was being processed which caused an Expects() fail.
This commit is contained in:
John Preston 2017-04-09 23:21:14 +03:00
parent 6c4943de97
commit 2c81014188
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Telegram/SourceFiles/boxes/peer_list_box.cpp
View File

@ -948,6 +948,7 @@ void PeerListBox::Inner::searchQueryChanged(QString query) {
} }
} }
if (_searchMode == SearchMode::Global) { if (_searchMode == SearchMode::Global) {
_globalSearchRequestId = 0;
needGlobalSearch(); needGlobalSearch();
} }
refreshRows(); refreshRows();
@ -978,23 +979,27 @@ bool PeerListBox::Inner::globalSearchInCache() {
void PeerListBox::Inner::globalSearchOnServer() { void PeerListBox::Inner::globalSearchOnServer() {
_globalSearchQuery = _searchQuery; _globalSearchQuery = _searchQuery;
_globalSearchRequestId = MTP::send(MTPcontacts_Search(MTP_string(_globalSearchQuery), MTP_int(SearchPeopleLimit)), ::rpcDone(base::lambda_guarded(this, [this](const MTPcontacts_Found &result, mtpRequestId requestId) { _globalSearchRequestId = request(MTPcontacts_Search(MTP_string(_globalSearchQuery), MTP_int(SearchPeopleLimit))).done([this](const MTPcontacts_Found &result, mtpRequestId requestId) {
globalSearchDone(result, requestId); globalSearchDone(result, requestId);
})), ::rpcFail(base::lambda_guarded(this, [this](const RPCError &error, mtpRequestId requestId) { }).fail([this](const RPCError &error, mtpRequestId requestId) {
return globalSearchFail(error, requestId); if (_globalSearchRequestId == requestId) {
}))); _globalSearchRequestId = 0;
refreshRows();
}
}).send();
_globalSearchQueries.emplace(_globalSearchRequestId, _globalSearchQuery); _globalSearchQueries.emplace(_globalSearchRequestId, _globalSearchQuery);
} }
void PeerListBox::Inner::globalSearchDone(const MTPcontacts_Found &result, mtpRequestId requestId) { void PeerListBox::Inner::globalSearchDone(const MTPcontacts_Found &result, mtpRequestId requestId) {
auto query = _globalSearchQuery; auto query = _globalSearchQuery;
auto it = _globalSearchQueries.find(requestId); if (requestId) {
if (it != _globalSearchQueries.cend()) { auto it = _globalSearchQueries.find(requestId);
query = it->second; if (it != _globalSearchQueries.cend()) {
_globalSearchCache[query] = result; query = it->second;
_globalSearchQueries.erase(it); _globalSearchCache[query] = result;
_globalSearchQueries.erase(it);
}
} }
if (_globalSearchRequestId == requestId) { if (_globalSearchRequestId == requestId) {
_globalSearchRequestId = 0; _globalSearchRequestId = 0;
if (result.type() == mtpc_contacts_found) { if (result.type() == mtpc_contacts_found) {
@ -1023,16 +1028,6 @@ void PeerListBox::Inner::globalSearchDone(const MTPcontacts_Found &result, mtpRe
} }
} }
bool PeerListBox::Inner::globalSearchFail(const RPCError &error, mtpRequestId requestId) {
if (MTP::isDefaultHandledError(error)) return false;
if (_globalSearchRequestId == requestId) {
_globalSearchRequestId = 0;
refreshRows();
}
return true;
}
bool PeerListBox::Inner::globalSearchLoading() const { bool PeerListBox::Inner::globalSearchLoading() const {
return (_globalSearchTimer && _globalSearchTimer->isActive()) || _globalSearchRequestId; return (_globalSearchTimer && _globalSearchTimer->isActive()) || _globalSearchRequestId;
} }

4
Telegram/SourceFiles/boxes/peer_list_box.h
View File

@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#pragma once #pragma once
#include "boxes/abstract_box.h" #include "boxes/abstract_box.h"
#include "mtproto/sender.h"
namespace Ui { namespace Ui {
class RippleAnimation; class RippleAnimation;
@ -245,7 +246,7 @@ private:
}; };
// This class is hold in header because it requires Qt preprocessing. // This class is hold in header because it requires Qt preprocessing.
class PeerListBox::Inner : public TWidget, public RPCSender, private base::Subscriber { class PeerListBox::Inner : public TWidget, private MTP::Sender, private base::Subscriber {
Q_OBJECT Q_OBJECT
public: public:
@ -376,7 +377,6 @@ private:
bool globalSearchInCache(); bool globalSearchInCache();
void globalSearchOnServer(); void globalSearchOnServer();
void globalSearchDone(const MTPcontacts_Found &result, mtpRequestId requestId); void globalSearchDone(const MTPcontacts_Found &result, mtpRequestId requestId);
bool globalSearchFail(const RPCError &error, mtpRequestId requestId);
bool globalSearchLoading() const; bool globalSearchLoading() const;
void clearGlobalSearchRows(); void clearGlobalSearchRows();