From 131f7ec5bb35f45c58672d1d951c7b302185c3cc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 26 Sep 2018 18:30:42 +0300
Subject: [PATCH] Add install beta toggle to Settings > Advanced.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/facades.cpp              | 22 ++++---
 Telegram/SourceFiles/facades.h                |  1 +
 .../settings/settings_advanced.cpp            | 63 +++++++++++++------
 4 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index b4f13a479..1bd0e33ed 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -294,6 +294,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_languages" = "Languages";
 "lng_sure_save_language" = "Telegram will restart in order to change language";
 "lng_settings_update_automatically" = "Update automatically";
+"lng_settings_install_beta" = "Install beta versions";
 "lng_settings_current_version_label" = "Version {version}:";
 "lng_settings_current_version" = "Version {version}";
 "lng_settings_check_now" = "Check for updates";
diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp
index 8bcc08454..7692f196f 100644
--- a/Telegram/SourceFiles/facades.cpp
+++ b/Telegram/SourceFiles/facades.cpp
@@ -439,6 +439,17 @@ bool CheckAlphaVersionDir() {
 	return true;
 }
 
+QString InstallBetaVersionsSettingPath() {
+	return cWorkingDir() + qsl("tdata/devversion");
+}
+
+void WriteInstallBetaVersionsSetting() {
+	QFile f(InstallBetaVersionsSettingPath());
+	if (f.open(QIODevice::WriteOnly)) {
+		f.write(cInstallBetaVersion() ? "1" : "0");
+	}
+}
+
 void WorkingDirReady() {
 	if (QFile(cWorkingDir() + qsl("tdata/withtestmode")).exists()) {
 		cSetTestMode(true);
@@ -447,19 +458,16 @@ void WorkingDirReady() {
 		&& QFile(cWorkingDir() + qsl("tdata/withdebug")).exists()) {
 		Logs::SetDebugEnabled(true);
 	}
-	const auto installBetaPath = cWorkingDir() + qsl("tdata/devversion");
+	const auto installBetaSettingPath = InstallBetaVersionsSettingPath();
 	if (cAlphaVersion()) {
 		cSetInstallBetaVersion(false);
-	} else if (QFile(installBetaPath).exists()) {
-		QFile f(installBetaPath);
+	} else if (QFile(installBetaSettingPath).exists()) {
+		QFile f(installBetaSettingPath);
 		if (f.open(QIODevice::ReadOnly)) {
 			cSetInstallBetaVersion(f.read(1) != "0");
 		}
 	} else if (AppBetaVersion) {
-		QFile f(installBetaPath);
-		if (f.open(QIODevice::WriteOnly)) {
-			f.write(cInstallBetaVersion() ? "1" : "0");
-		}
+		WriteInstallBetaVersionsSetting();
 	}
 
 	srand((int32)time(NULL));
diff --git a/Telegram/SourceFiles/facades.h b/Telegram/SourceFiles/facades.h
index a18287816..3e9f0de60 100644
--- a/Telegram/SourceFiles/facades.h
+++ b/Telegram/SourceFiles/facades.h
@@ -187,6 +187,7 @@ namespace Sandbox {
 
 bool CheckAlphaVersionDir();
 void WorkingDirReady();
+void WriteInstallBetaVersionsSetting();
 
 void MainThreadTaskAdded();
 
diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp
index 73b815a1d..b75c31c83 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced.cpp
@@ -95,18 +95,26 @@ void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
 		texts->events(),
 		st::settingsUpdateState);
 
-	const auto check = container->add(object_ptr<Ui::SlideWrap<Button>>(
-		container,
-		object_ptr<Button>(
+	const auto options = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			container,
-			Lang::Viewer(lng_settings_check_now),
-			st::settingsButton)));
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto inner = options->entity();
+	const auto install = cAlphaVersion() ? nullptr : AddButton(
+		inner,
+		lng_settings_install_beta,
+		st::settingsButton).get();
+
+	const auto check = AddButton(
+		inner,
+		lng_settings_check_now,
+		st::settingsButton);
 	const auto update = Ui::CreateChild<Button>(
-		check->entity(),
+		check.get(),
 		Lang::Viewer(lng_update_telegram) | Info::Profile::ToUpperValue(),
 		st::settingsUpdate);
 	update->hide();
-	check->entity()->widthValue() | rpl::start_with_next([=](int width) {
+	check->widthValue() | rpl::start_with_next([=](int width) {
 		update->resizeToWidth(width);
 		update->moveToLeft(0, 0);
 	}, update->lifetime());
@@ -161,8 +169,27 @@ void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
 		setDefaultStatus(checker);
 	}, toggle->lifetime());
 
+	if (install) {
+		install->toggleOn(rpl::single(cInstallBetaVersion()));
+		install->toggledValue(
+		) | rpl::filter([](bool toggled) {
+			return (toggled != cInstallBetaVersion());
+		}) | rpl::start_with_next([=](bool toggled) {
+			cSetInstallBetaVersion(toggled);
+			Sandbox::WriteInstallBetaVersionsSetting();
+
+			Core::UpdateChecker checker;
+			checker.stop();
+			if (toggled) {
+				cSetLastUpdateCheck(0);
+			}
+			checker.start();
+			setDefaultStatus(checker);
+		}, toggle->lifetime());
+	}
+
 	Core::UpdateChecker checker;
-	check->toggleOn(rpl::combine(
+	options->toggleOn(rpl::combine(
 		toggle->toggledValue(),
 		downloading->events_starting_with(
 			checker.state() == Core::UpdateChecker::State::Download)
@@ -171,34 +198,34 @@ void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
 	}));
 
 	checker.checking() | rpl::start_with_next([=] {
-		check->setAttribute(Qt::WA_TransparentForMouseEvents);
+		options->setAttribute(Qt::WA_TransparentForMouseEvents);
 		texts->fire(lang(lng_settings_update_checking));
 		downloading->fire(false);
-	}, check->lifetime());
+	}, options->lifetime());
 	checker.isLatest() | rpl::start_with_next([=] {
-		check->setAttribute(Qt::WA_TransparentForMouseEvents, false);
+		options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
 		texts->fire(lang(lng_settings_latest_installed));
 		downloading->fire(false);
-	}, check->lifetime());
+	}, options->lifetime());
 	checker.progress(
 	) | rpl::start_with_next([=](Core::UpdateChecker::Progress progress) {
 		showDownloadProgress(progress.already, progress.size);
-	}, check->lifetime());
+	}, options->lifetime());
 	checker.failed() | rpl::start_with_next([=] {
-		check->setAttribute(Qt::WA_TransparentForMouseEvents, false);
+		options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
 		texts->fire(lang(lng_settings_update_fail));
 		downloading->fire(false);
-	}, check->lifetime());
+	}, options->lifetime());
 	checker.ready() | rpl::start_with_next([=] {
-		check->setAttribute(Qt::WA_TransparentForMouseEvents, false);
+		options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
 		texts->fire(lang(lng_settings_update_ready));
 		update->show();
 		downloading->fire(false);
-	}, check->lifetime());
+	}, options->lifetime());
 
 	setDefaultStatus(checker);
 
-	check->entity()->addClickHandler([] {
+	check->addClickHandler([] {
 		Core::UpdateChecker checker;
 
 		cSetLastUpdateCheck(0);