mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 22:55:11 +00:00
Code Issues Releases Wiki Activity

Remove some activeAccount() calls.

Browse Source
This commit is contained in:
John Preston
2020-06-10 18:52:44 +04:00
parent 598fb67cdf
commit ea86433be5
28 changed files with 132 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/boxes/connection_box.cpp
View File

@@ -978,8 +978,9 @@ void ProxyBox::addLabel(
} // namespace
ProxiesBoxController::ProxiesBoxController()
: _saveTimer([] { Local::writeSettings(); }) {
ProxiesBoxController::ProxiesBoxController(not_null<Main::Account*> account)
: _account(account)
, _saveTimer([] { Local::writeSettings(); }) {
_list = ranges::view::all(
Global::ProxiesList()
) | ranges::view::transform([&](const ProxyData &proxy) {
@@ -1058,7 +1059,9 @@ void ProxiesBoxController::refreshChecker(Item &item) {
const auto type = (item.data.type == Type::Http)
? Variants::Http
: Variants::Tcp;
const auto mtproto = Core::App().activeAccount().mtp();
const auto mtproto = _account->mtp();
Assert(mtproto != nullptr);
const auto dcId = mtproto->mainDcId();
item.state = ItemState::Checking;
@@ -1142,8 +1145,9 @@ void ProxiesBoxController::setupChecker(int id, const Checker &checker) {
pointer->connect(pointer, &Connection::error, failed);
}
object_ptr<Ui::BoxContent> ProxiesBoxController::CreateOwningBox() {
auto controller = std::make_unique<ProxiesBoxController>();
object_ptr<Ui::BoxContent> ProxiesBoxController::CreateOwningBox(
not_null<Main::Account*> account) {
auto controller = std::make_unique<ProxiesBoxController>(account);
auto box = controller->create();
Ui::AttachAsChild(box, std::move(controller));
return box;