mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-01 06:55:58 +00:00
Code Issues Releases Wiki Activity

Don't change dc after qr request / phone submit.

Browse Source
This commit is contained in:
John Preston
2020-06-26 15:28:06 +04:00
parent 793e8c102e
commit 6960e4808a
7 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/intro/intro_widget.cpp
View File

@@ -65,6 +65,8 @@ Widget::Widget(
rpl::single(true))) {
Core::App().setDefaultFloatPlayerDelegate(floatPlayerDelegate());
getNearestDC();
switch (point) {
case EnterPoint::Start:
appendStep(new StartWidget(this, _account, getData()));
@@ -104,8 +106,6 @@ Widget::Widget(
_settings->entity()->setClickedCallback([] { App::wnd()->showSettings(); });
getNearestDC();
if (_changeLanguage) {
_changeLanguage->finishAnimating();
}
@@ -378,9 +378,14 @@ void Widget::appendStep(Step *step) {
step->setShowResetCallback([=] {
showResetButton();
});
step->setShowTermsCallback([=]() {
step->setShowTermsCallback([=] {
showTerms();
});
step->setCancelNearestDcCallback([=] {
if (_api) {
_api->request(base::take(_nearestDcRequestId)).cancel();
}
});
step->setAcceptTermsCallback([=](Fn<void()> callback) {
acceptTerms(callback);
});
@@ -519,8 +524,9 @@ void Widget::getNearestDC() {
if (!_api) {
return;
}
_api->request(MTPhelp_GetNearestDc(
_nearestDcRequestId = _api->request(MTPhelp_GetNearestDc(
)).done([=](const MTPNearestDc &result) {
_nearestDcRequestId = 0;
const auto &nearest = result.c_nearestDc();
DEBUG_LOG(("Got nearest dc, country: %1, nearest: %2, this: %3"
).arg(qs(nearest.vcountry())