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

Remove some more Auth() calls.

Browse Source
This commit is contained in:
John Preston
2019-08-06 17:40:08 +01:00
parent f48732f813
commit 4bad642190
36 changed files with 280 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Telegram/SourceFiles/calls/calls_instance.cpp
View File

@@ -30,7 +30,8 @@ constexpr auto kServerConfigUpdateTimeoutMs = 24 * 3600 * crl::time(1000);
} // namespace
Instance::Instance() = default;
Instance::Instance(not_null<Main::Session*> session) : _session(session) {
}
void Instance::startOutgoingCall(not_null<UserData*> user) {
if (alreadyInCall()) { // Already in a call.
@@ -39,7 +40,7 @@ void Instance::startOutgoingCall(not_null<UserData*> user) {
}
if (user->callsStatus() == UserData::CallsStatus::Private) {
// Request full user once more to refresh the setting in case it was changed.
Auth().api().requestFullPeer(user);
_session->api().requestFullPeer(user);
Ui::show(Box<InformBox>(tr::lng_call_error_not_available(tr::now, lt_user, App::peerName(user))));
return;
}
@@ -68,7 +69,7 @@ void Instance::playSound(Sound sound) {
if (!_callBusyTrack) {
_callBusyTrack = Media::Audio::Current().createTrack();
_callBusyTrack->fillFromFile(
Auth().settings().getSoundPath(qsl("call_busy")));
_session->settings().getSoundPath(qsl("call_busy")));
}
_callBusyTrack->playOnce();
} break;
@@ -77,7 +78,7 @@ void Instance::playSound(Sound sound) {
if (!_callEndedTrack) {
_callEndedTrack = Media::Audio::Current().createTrack();
_callEndedTrack->fillFromFile(
Auth().settings().getSoundPath(qsl("call_end")));
_session->settings().getSoundPath(qsl("call_end")));
}
_callEndedTrack->playOnce();
} break;
@@ -86,7 +87,7 @@ void Instance::playSound(Sound sound) {
if (!_callConnectingTrack) {
_callConnectingTrack = Media::Audio::Current().createTrack();
_callConnectingTrack->fillFromFile(
Auth().settings().getSoundPath(qsl("call_connect")));
_session->settings().getSoundPath(qsl("call_connect")));
}
_callConnectingTrack->playOnce();
} break;
@@ -236,7 +237,7 @@ bool Instance::isQuitPrevent() {
void Instance::handleCallUpdate(const MTPPhoneCall &call) {
if (call.type() == mtpc_phoneCallRequested) {
auto &phoneCall = call.c_phoneCallRequested();
auto user = Auth().data().userLoaded(phoneCall.vadmin_id().v);
auto user = _session->data().userLoaded(phoneCall.vadmin_id().v);
if (!user) {
LOG(("API Error: User not loaded for phoneCallRequested."));
} else if (user->isSelf()) {
@@ -303,8 +304,4 @@ Instance::~Instance() {
}
}
Instance &Current() {
return Auth().calls();
}
} // namespace Calls