From efb2972d28b70eb00bea0e7bae0022beee639397 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 27 Mar 2019 12:37:25 +0400
Subject: [PATCH] Move delete-from-ToS to AuthSession.

---
 Telegram/SourceFiles/auth_session.cpp       | 6 ++++++
 Telegram/SourceFiles/auth_session.h         | 1 +
 Telegram/SourceFiles/core/application.cpp   | 4 ----
 Telegram/SourceFiles/core/application.h     | 6 +-----
 Telegram/SourceFiles/window/main_window.cpp | 9 ++++++++-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/auth_session.cpp b/Telegram/SourceFiles/auth_session.cpp
index 305c674865..cd2388deb6 100644
--- a/Telegram/SourceFiles/auth_session.cpp
+++ b/Telegram/SourceFiles/auth_session.cpp
@@ -480,6 +480,12 @@ void AuthSession::localPasscodeChanged() {
 	checkAutoLock();
 }
 
+void AuthSession::termsDeleteNow() {
+	api().request(MTPaccount_DeleteAccount(
+		MTP_string("Decline ToS update")
+	)).send();
+}
+
 void AuthSession::checkAutoLock() {
 	if (!Global::LocalPasscode()
 		|| Core::App().passcodeLocked()) {
diff --git a/Telegram/SourceFiles/auth_session.h b/Telegram/SourceFiles/auth_session.h
index aa7fc789ff..2a589f8ecc 100644
--- a/Telegram/SourceFiles/auth_session.h
+++ b/Telegram/SourceFiles/auth_session.h
@@ -317,6 +317,7 @@ public:
 	void checkAutoLock();
 	void checkAutoLockIn(crl::time time);
 	void localPasscodeChanged();
+	void termsDeleteNow();
 
 	rpl::lifetime &lifetime() {
 		return _lifetime;
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index ff9745db82..66687edaa0 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -898,10 +898,6 @@ rpl::producer<bool> Application::termsLockValue() const {
 	) | rpl::then(termsLockChanges());
 }
 
-void Application::termsDeleteNow() {
-	MTP::send(MTPaccount_DeleteAccount(MTP_string("Decline ToS update")));
-}
-
 bool Application::locked() const {
 	return passcodeLocked() || termsLocked();
 }
diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h
index 7492c48d4f..9ab7579e12 100644
--- a/Telegram/SourceFiles/core/application.h
+++ b/Telegram/SourceFiles/core/application.h
@@ -64,10 +64,7 @@ namespace Core {
 class Launcher;
 struct LocalUrlHandler;
 
-class Application final
-	: public QObject
-	, public RPCSender
-	, private base::Subscriber {
+class Application final : public QObject, private base::Subscriber {
 public:
 	Application(not_null<Launcher*> launcher);
 
@@ -188,7 +185,6 @@ public:
 	[[nodiscard]] std::optional<Window::TermsLock> termsLocked() const;
 	rpl::producer<bool> termsLockChanges() const;
 	rpl::producer<bool> termsLockValue() const;
-	void termsDeleteNow();
 
 	[[nodiscard]] bool locked() const;
 	rpl::producer<bool> lockChanges() const;
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index e69b78a803..af296e3c16 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -202,12 +202,19 @@ void MainWindow::showTermsDecline() {
 
 void MainWindow::showTermsDelete() {
 	const auto box = std::make_shared<QPointer<BoxContent>>();
+	const auto deleteByTerms = [=] {
+		if (AuthSession::Exists()) {
+			Auth().termsDeleteNow();
+		} else {
+			Ui::hideLayer();
+		}
+	};
 	*box = Ui::show(
 		Box<ConfirmBox>(
 			lang(lng_terms_delete_warning),
 			lang(lng_terms_delete_now),
 			st::attentionBoxButton,
-			[=] { Core::App().termsDeleteNow(); },
+			deleteByTerms,
 			[=] { if (*box) (*box)->closeBox(); }),
 		LayerOption::KeepOther);
 }