diff --git a/Telegram/Resources/langs/rewrites/en.json b/Telegram/Resources/langs/rewrites/en.json index 2e3800f65..df2898d48 100644 --- a/Telegram/Resources/langs/rewrites/en.json +++ b/Telegram/Resources/langs/rewrites/en.json @@ -115,6 +115,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 c1ef63e1b..c091881ee 100644 --- a/Telegram/SourceFiles/core/ui_integration.cpp +++ b/Telegram/SourceFiles/core/ui_integration.cpp @@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "core/ui_integration.h" +#include "kotato/kotato_settings.h" #include "api/api_text_entities.h" #include "core/local_url_handlers.h" #include "core/file_utilities.h" @@ -62,7 +63,8 @@ const auto kBadPrefix = u"http://"_q; const auto domains = active.appConfig().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 9361d9f8e..0028c40e8 100644 --- a/Telegram/SourceFiles/kotato/kotato_settings.cpp +++ b/Telegram/SourceFiles/kotato/kotato_settings.cpp @@ -329,6 +329,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 215ce652e..75e1b3448 100644 --- a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp +++ b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp @@ -287,6 +287,8 @@ void SetupKotatoNetwork(not_null container) { Ui::AddSubsectionTitle(container, rktr("ktg_settings_network")); + SettingsMenuJsonSwitch(ktg_settings_telegram_sites_autologin, telegram_sites_autologin); + Ui::AddSkip(container); }