diff --git a/Telegram/Resources/langs/rewrites/en.json b/Telegram/Resources/langs/rewrites/en.json index 00d0ff1e2..6d2a6e786 100644 --- a/Telegram/Resources/langs/rewrites/en.json +++ b/Telegram/Resources/langs/rewrites/en.json @@ -139,6 +139,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 d5ec84bac..cc28a06bb 100644 --- a/Telegram/SourceFiles/core/ui_integration.cpp +++ b/Telegram/SourceFiles/core/ui_integration.cpp @@ -53,7 +53,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 59d72a637..f03a87083 100644 --- a/Telegram/SourceFiles/kotato/kotato_settings.cpp +++ b/Telegram/SourceFiles/kotato/kotato_settings.cpp @@ -412,6 +412,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 20e68fe52..e5bd06de3 100644 --- a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp +++ b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp @@ -423,6 +423,8 @@ void SetupKotatoNetwork(not_null container) { }, true)); }); + SettingsMenuJsonSwitch(ktg_settings_telegram_sites_autologin, telegram_sites_autologin); + AddSkip(container); }