From ae40ea93368c02b0a2a7fd2166f531299ad176ff Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Aug 2021 20:01:39 +0300
Subject: [PATCH] Always start with QR-code login.

---
 Telegram/SourceFiles/intro/intro_phone.cpp    | 46 +++++++------------
 Telegram/SourceFiles/intro/intro_start.cpp    | 10 +---
 .../SourceFiles/window/window_controller.cpp  | 14 ++----
 3 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/Telegram/SourceFiles/intro/intro_phone.cpp b/Telegram/SourceFiles/intro/intro_phone.cpp
index 0d9dffd44..665ee26bc 100644
--- a/Telegram/SourceFiles/intro/intro_phone.cpp
+++ b/Telegram/SourceFiles/intro/intro_phone.cpp
@@ -83,39 +83,25 @@ PhoneWidget::PhoneWidget(
 }
 
 void PhoneWidget::setupQrLogin() {
-	rpl::single(
-		rpl::empty_value()
-	) | rpl::then(
-		account().appConfig().refreshed()
-	) | rpl::map([=] {
-		const auto result = account().appConfig().get<QString>(
-			"qr_login_code",
-			"[not-set]");
-		DEBUG_LOG(("PhoneWidget.qr_login_code: %1").arg(result));
-		return result;
-	}) | rpl::filter([](const QString &value) {
-		return (value != "disabled");
-	}) | rpl::take(1) | rpl::start_with_next([=] {
-		const auto qrLogin = Ui::CreateChild<Ui::LinkButton>(
-			this,
-			tr::lng_phone_to_qr(tr::now));
-		qrLogin->show();
+	const auto qrLogin = Ui::CreateChild<Ui::LinkButton>(
+		this,
+		tr::lng_phone_to_qr(tr::now));
+	qrLogin->show();
 
-		DEBUG_LOG(("PhoneWidget.qrLogin link created and shown."));
+	DEBUG_LOG(("PhoneWidget.qrLogin link created and shown."));
 
-		rpl::combine(
-			sizeValue(),
-			qrLogin->widthValue()
-		) | rpl::start_with_next([=](QSize size, int qrLoginWidth) {
-			qrLogin->moveToLeft(
-				(size.width() - qrLoginWidth) / 2,
-				contentTop() + st::introQrLoginLinkTop);
-		}, qrLogin->lifetime());
+	rpl::combine(
+		sizeValue(),
+		qrLogin->widthValue()
+	) | rpl::start_with_next([=](QSize size, int qrLoginWidth) {
+		qrLogin->moveToLeft(
+			(size.width() - qrLoginWidth) / 2,
+			contentTop() + st::introQrLoginLinkTop);
+	}, qrLogin->lifetime());
 
-		qrLogin->setClickedCallback([=] {
-			goReplace<QrWidget>(Animate::Forward);
-		});
-	}, lifetime());
+	qrLogin->setClickedCallback([=] {
+		goReplace<QrWidget>(Animate::Forward);
+	});
 }
 
 void PhoneWidget::resizeEvent(QResizeEvent *e) {
diff --git a/Telegram/SourceFiles/intro/intro_start.cpp b/Telegram/SourceFiles/intro/intro_start.cpp
index 0fe3cb61b..c3b5c1e54 100644
--- a/Telegram/SourceFiles/intro/intro_start.cpp
+++ b/Telegram/SourceFiles/intro/intro_start.cpp
@@ -31,15 +31,7 @@ StartWidget::StartWidget(
 
 void StartWidget::submit() {
 	account().destroyStaleAuthorizationKeys();
-	const auto qrLogin = account().appConfig().get<QString>(
-		"qr_login_code",
-		"[not-set]");
-	DEBUG_LOG(("qr_login_code: %1").arg(qrLogin));
-	if (qrLogin == "primary") {
-		goNext<QrWidget>();
-	} else {
-		goNext<PhoneWidget>();
-	}
+	goNext<QrWidget>();
 }
 
 rpl::producer<QString> StartWidget::nextButtonText() const {
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index bde206d3e..fff293534 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -238,17 +238,9 @@ void Controller::clearPasscodeLock() {
 }
 
 void Controller::setupIntro() {
-	const auto parent = Core::App().domain().maybeLastOrSomeAuthedAccount();
-	if (!parent) {
-		_widget.setupIntro(Intro::EnterPoint::Start);
-		return;
-	}
-	const auto qrLogin = parent->appConfig().get<QString>(
-		"qr_login_code",
-		"[not-set]");
-	DEBUG_LOG(("qr_login_code in setup: %1").arg(qrLogin));
-	const auto qr = (qrLogin == "primary");
-	_widget.setupIntro(qr ? Intro::EnterPoint::Qr : Intro::EnterPoint::Phone);
+	_widget.setupIntro(Core::App().domain().maybeLastOrSomeAuthedAccount()
+		? Intro::EnterPoint::Qr
+		: Intro::EnterPoint::Start);
 }
 
 void Controller::setupMain() {