mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Allow several accounts in Core::App.

Browse Source
This commit is contained in:
John Preston
2020-06-15 20:25:02 +04:00
parent 815e26eea5
commit 6fc5e22882
36 changed files with 834 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Telegram/SourceFiles/main/main_account.cpp
View File

@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/launcher.h"
#include "core/shortcuts.h"
#include "storage/storage_account.h"
#include "storage/storage_accounts.h" // Storage::StartResult.
#include "storage/serialize_common.h"
#include "storage/localstorage.h"
#include "data/data_session.h"
@@ -26,16 +27,49 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "facades.h"
namespace Main {
namespace {
Account::Account(const QString &dataName)
: _local(std::make_unique<Storage::Account>(this, dataName))
, _appConfig(std::make_unique<AppConfig>(this)) {
watchProxyChanges();
watchSessionChanges();
[[nodiscard]] QString ComposeDataString(const QString &dataName, int index) {
auto result = dataName;
result.replace('#', QString());
if (index > 0) {
result += '#' + QString::number(index + 1);
}
return result;
}
} // namespace
Account::Account(const QString &dataName, int index)
: _local(std::make_unique<Storage::Account>(
this,
ComposeDataString(dataName, index))) {
}
Account::~Account() = default;
[[nodiscard]] Storage::StartResult Account::legacyStart(
const QByteArray &passcode) {
Expects(!_appConfig);
const auto result = _local->legacyStart(passcode);
if (result == Storage::StartResult::Success) {
finishStarting();
}
return result;
}
void Account::start(std::shared_ptr<MTP::AuthKey> localKey) {
_local->start(std::move(localKey));
finishStarting();
}
void Account::finishStarting() {
_appConfig = std::make_unique<AppConfig>(this);
watchProxyChanges();
watchSessionChanges();
}
void Account::watchProxyChanges() {
using ProxyChange = Core::Application::ProxyChange;
@@ -60,28 +94,17 @@ void Account::watchProxyChanges() {
void Account::watchSessionChanges() {
sessionChanges(
) | rpl::start_with_next([=] {
crl::on_main(this, [=] {
const auto phone = sessionExists()
? session().user()->phone()
: QString();
const auto support = sessionExists() && session().supportMode();
if (cLoggedPhoneNumber() != phone) {
cSetLoggedPhoneNumber(phone);
if (_mtp) {
_mtp->setUserPhone(phone);
}
Local::writeSettings();
}
if (_mtp) {
_mtp->requestConfig();
}
Shortcuts::ToggleSupportShortcuts(support);
Platform::SetApplicationIcon(Window::CreateIcon(this));
});
) | rpl::start_with_next([=](Session *session) {
if (!session && _mtp) {
_mtp->setUserPhone(QString());
}
}, _lifetime);
}
UserId Account::willHaveUserId() const {
return _sessionUserId;
}
void Account::createSession(const MTPUser &user) {
createSession(user, QByteArray(), 0, Settings());
}
@@ -330,7 +353,6 @@ void Account::startMtp() {
Core::App().dcOptions(),
MTP::Instance::Mode::Normal,
std::move(config));
_mtp->setUserPhone(cLoggedPhoneNumber());
_mtp->writeKeysRequests(
) | rpl::start_with_next([=] {
local().writeMtpData();