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

Merge remote-tracking branch 'tdesktop/dev' into dev

Browse Source
This commit is contained in:
RadRussianRus
2020-01-18 18:26:29 +03:00
parent 182d315609 f1b0e81b60
commit 2b77ec69f0
435 changed files with 19946 additions and 7255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
View File

@@ -180,7 +180,8 @@ AdminLog::OwnedItem GenerateForwardedItem(
BlockedBoxController::BlockedBoxController(
not_null<Window::SessionController*> window)
: _window(window) {
: _window(window)
, _api(_window->session().api().instance()) {
}
Main::Session &BlockedBoxController::session() const {
@@ -220,7 +221,7 @@ void BlockedBoxController::loadMoreRows() {
return;
}
_loadRequestId = request(MTPcontacts_GetBlocked(
_loadRequestId = _api.request(MTPcontacts_GetBlocked(
MTP_int(_offset),
MTP_int(kBlockedPerPage)
)).done([=](const MTPcontacts_Blocked &result) {
@@ -336,7 +337,7 @@ std::unique_ptr<PeerListRow> BlockedBoxController::createRow(
return tr::lng_blocked_list_unknown_phone(tr::now);
}();
row->setCustomStatus(status);
return std::move(row);
return row;
}
ApiWrap::Privacy::Key PhoneNumberPrivacyController::key() {
@@ -446,7 +447,7 @@ object_ptr<Ui::RpWidget> PhoneNumberPrivacyController::setupMiddleWidget(
QVector<MTPInputPrivacyRule>(1, value));
};
return std::move(widget);
return widget;
}
void PhoneNumberPrivacyController::saveAdditional() {