From eec451c94905c7ef736084e9ca69fdc888277fbb Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Fri, 9 Sep 2022 20:59:23 +0300 Subject: [PATCH] [Option][GUI] Telegram sites autologin --- Telegram/Resources/langs/rewrites/en.json | 1 + Telegram/SourceFiles/core/ui_integration.cpp | 3 ++- Telegram/SourceFiles/kotato/kotato_settings.cpp | 3 +++ Telegram/SourceFiles/kotato/kotato_settings_menu.cpp | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Telegram/Resources/langs/rewrites/en.json b/Telegram/Resources/langs/rewrites/en.json index 256e6919c..3b2dfa8d5 100644 --- a/Telegram/Resources/langs/rewrites/en.json +++ b/Telegram/Resources/langs/rewrites/en.json @@ -143,6 +143,7 @@ "ktg_filters_hide_button": "Hide button", "ktg_filters_hide_all_chats_toast": "\"All Chats\" folder is hidden.\nYou can enable it back in Kotatogram Settings.", "ktg_filters_hide_edit_toast": "Edit button is hidden.\nYou can enable it back in Kotatogram Settings.", + "ktg_settings_telegram_sites_autologin": "Auto-login on Telegram sites", "ktg_in_app_update_disabled": "In-app updater is disabled.", "dummy_last_string": "" } diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp index 6e3fc0536..d6a2c8aa9 100644 --- a/Telegram/SourceFiles/core/ui_integration.cpp +++ b/Telegram/SourceFiles/core/ui_integration.cpp @@ -50,7 +50,8 @@ const auto kBadPrefix = u"http://"_q; const auto domains = config.get>( "autologin_domains", {}); - if (token.isEmpty() + if (!::Kotato::JsonSettings::GetBool("telegram_sites_autologin") + || token.isEmpty() || domain.isEmpty() || !ranges::contains(domains, domain)) { return url; diff --git a/Telegram/SourceFiles/kotato/kotato_settings.cpp b/Telegram/SourceFiles/kotato/kotato_settings.cpp index b28fa0c36..5df2b6109 100644 --- a/Telegram/SourceFiles/kotato/kotato_settings.cpp +++ b/Telegram/SourceFiles/kotato/kotato_settings.cpp @@ -433,6 +433,9 @@ const std::map> DefinitionMap { { "folders/local", { .scope = SettingScope::Account, .type = SettingType::QJsonArraySetting, }}, + { "telegram_sites_autologin", { + .type = SettingType::BoolSetting, + .defaultValue = true, }}, }; using OldOptionKey = QString; diff --git a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp index 6989a97d0..ce8ee49dd 100644 --- a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp +++ b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp @@ -435,6 +435,8 @@ void SetupKotatoNetwork(not_null container) { }, true)); }); + SettingsMenuJsonSwitch(ktg_settings_telegram_sites_autologin, telegram_sites_autologin); + AddSkip(container); }