RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove ToS and Privacy Policy footer.

This commit is contained in:
John Preston 2022-06-12 16:51:55 +04:00
parent ff3bfd3fba
commit 333b986098
4 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/Resources/langs/lang.strings
View File

@ -1700,9 +1700,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_premium_summary_bottom_subtitle" = "About Telegram Premium";
"lng_premium_summary_bottom_about" = "While the free version of Telegram already gives its users more than any other messaging application, **Telegram Premium** pushes its capabilities even further.\n\n**Telegram Premium** is a paid option, because most Premium Features require additional expenses from Telegram to third parties such as data center providers and server manufacturers. Contributions from **Telegram Premium** users allow us to cover such costs and also help Telegram stay free for everyone.";
"lng_premium_summary_button" = "Subscribe for {cost} per month";
"lng_premium_summary_terms" = "Our Terms of Service";
"lng_premium_summary_policy" = "Privacy Policy";
"lng_premium_summary_agree" = "By purchasing a Premium subscription, you agree to {terms} and {policy}.";
"lng_premium_success" = "You've successfully subscribed to Telegram Premium!";
"lng_premium_unavailable" = "This feature requires subscription to **Telegram Premium**.\n\nUnfortunately, **Telegram Premium** is not available in your region.";

2
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View File

@ -4741,7 +4741,7 @@ Window::SessionController *OverlayWidget::findWindow(bool switchTo) const {
if (anyWindow) {
anyWindow->invokeForSessionController(
&_session->account(),
_history ? _history->peer : nullptr,
_history ? _history->peer.get() : nullptr,
[&](not_null<Window::SessionController*> newController) {
controllerPtr = newController;
});

1
Telegram/SourceFiles/settings/settings.style
View File

@ -456,4 +456,3 @@ settingsPremiumAboutTextStyle: TextStyle(defaultTextStyle) {
lineHeight: 18px;
}
settingsPremiumStatusPadding: margins(22px, 8px, 22px, 2px);
settingsPremiumPolicyPadding: margins(22px, 8px, 22px, 8px);

27
Telegram/SourceFiles/settings/settings_premium.cpp
View File

@ -888,24 +888,6 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
not_null<Ui::RpWidget*> parent) {
const auto content = Ui::CreateChild<Ui::RpWidget>(parent.get());
constexpr auto TosLink = [](const QString &text) {
return Ui::Text::Link(text, "https://telegram.org/tos");
};
constexpr auto PolicyLink = [](const QString &text) {
return Ui::Text::Link(text, "https://telegram.org/privacy");
};
const auto terms = Ui::CreateChild<Ui::DividerLabel>(
content,
object_ptr<Ui::FlatLabel>(
content,
tr::lng_premium_summary_agree(
lt_terms,
tr::lng_premium_summary_terms() | rpl::map(TosLink),
lt_policy,
tr::lng_premium_summary_policy() | rpl::map(PolicyLink),
Ui::Text::WithEntities),
st::boxDividerLabel),
st::settingsPremiumPolicyPadding);
const auto button = CreateSubscribeButton(_controller, content, [=] {
SendScreenAccept(_controller);
StartPremiumPayment(_controller, _ref);
@ -923,7 +905,6 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
) | rpl::start_with_next([=](int width) {
const auto padding = st::settingsPremiumButtonPadding;
status->resizeToWidth(width);
terms->resizeToWidth(width);
button->resizeToWidth(width - padding.left() - padding.right());
}, status->lifetime());
@ -943,14 +924,12 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
const auto session = &_controller->session();
rpl::combine(
terms->heightValue(),
button->heightValue(),
status->heightValue(),
std::move(text),
Data::AmPremiumValue(session),
session->premiumPossibleValue()
) | rpl::start_with_next([=](
int termsHeight,
int buttonHeight,
int statusHeight,
const TextWithEntities &text,
@ -960,15 +939,13 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
const auto finalHeight = !premiumPossible
? 0
: !premium
? (termsHeight + padding.top() + buttonHeight + padding.bottom())
? (padding.top() + buttonHeight + padding.bottom())
: text.text.isEmpty()
? 0
: statusHeight;
content->resize(content->width(), finalHeight);
terms->moveToLeft(0, 0);
button->moveToLeft(padding.left(), termsHeight + padding.top());
button->moveToLeft(padding.left(), padding.top());
status->moveToLeft(0, 0);
terms->setVisible(!premium && premiumPossible);
button->setVisible(!premium && premiumPossible);
status->setVisible(premium && !text.text.isEmpty());
if (!premium || text.text.isEmpty()) {