From 333b986098925251e944a4ed79808b825eb59491 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 12 Jun 2022 16:51:55 +0400
Subject: [PATCH] Remove ToS and Privacy Policy footer.

---
 Telegram/Resources/langs/lang.strings         |  3 ---
 .../media/view/media_view_overlay_widget.cpp  |  2 +-
 Telegram/SourceFiles/settings/settings.style  |  1 -
 .../SourceFiles/settings/settings_premium.cpp | 27 ++-----------------
 4 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 19e7031c21..73cce357f0 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -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.";
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index e3920a701e..1a20b8fc7c 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -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;
 				});
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index a285d58665..4b50a7a215 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -456,4 +456,3 @@ settingsPremiumAboutTextStyle: TextStyle(defaultTextStyle) {
 	lineHeight: 18px;
 }
 settingsPremiumStatusPadding: margins(22px, 8px, 22px, 2px);
-settingsPremiumPolicyPadding: margins(22px, 8px, 22px, 8px);
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 0f5a3d29ac..793a5faf45 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -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()) {