diff --git a/Telegram/Resources/langs/rewrites/en.json b/Telegram/Resources/langs/rewrites/en.json index a59a429a1..d78c2efc0 100644 --- a/Telegram/Resources/langs/rewrites/en.json +++ b/Telegram/Resources/langs/rewrites/en.json @@ -126,6 +126,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 7e15614da..582b9d03a 100644 --- a/Telegram/SourceFiles/core/ui_integration.cpp +++ b/Telegram/SourceFiles/core/ui_integration.cpp @@ -58,7 +58,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 eed63f249..ddb6abc2a 100644 --- a/Telegram/SourceFiles/kotato/kotato_settings.cpp +++ b/Telegram/SourceFiles/kotato/kotato_settings.cpp @@ -369,6 +369,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 c4f035c0b..d5fc13f62 100644 --- a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp +++ b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp @@ -339,6 +339,8 @@ void SetupKotatoNetwork(not_null container) { }, true)); }); + SettingsMenuJsonSwitch(ktg_settings_telegram_sites_autologin, telegram_sites_autologin); + Ui::AddSkip(container); }