mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-08-12 14:43:54 +00:00
Merge tag 'v6.7.8' into dev
# Conflicts: # .github/workflows/mac_packaged.yml # Telegram/Resources/winrc/Telegram.rc # Telegram/Resources/winrc/Updater.rc # Telegram/SourceFiles/api/api_chat_invite.h # Telegram/SourceFiles/boxes/language_box.cpp # Telegram/SourceFiles/boxes/send_files_box.h # Telegram/SourceFiles/boxes/sticker_set_box.cpp # Telegram/SourceFiles/core/version.h # Telegram/SourceFiles/data/data_types.h # Telegram/SourceFiles/history/history_item.cpp # Telegram/SourceFiles/history/history_widget.cpp # Telegram/SourceFiles/history/view/history_view_chat_section.cpp # Telegram/SourceFiles/history/view/history_view_message.cpp # Telegram/SourceFiles/history/view/history_view_translate_bar.cpp # Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp # Telegram/SourceFiles/platform/mac/main_window_mac.mm # Telegram/SourceFiles/settings/sections/settings_main.cpp # Telegram/lib_ui # snap/snapcraft.yaml
This commit is contained in:
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include "core/sandbox.h"
|
||||
#include "core/local_url_handlers.h"
|
||||
#include "core/launcher.h"
|
||||
#include "core/proxy_rotation_manager.h"
|
||||
#include "core/ui_integration.h"
|
||||
#include "chat_helpers/emoji_keywords.h"
|
||||
#include "chat_helpers/stickers_emoji_image_loader.h"
|
||||
@@ -151,6 +152,7 @@ struct Application::Private {
|
||||
base::Timer quitTimer;
|
||||
UiIntegration uiIntegration;
|
||||
Settings settings;
|
||||
std::unique_ptr<ProxyRotationManager> proxyRotation;
|
||||
};
|
||||
|
||||
Application::Application()
|
||||
@@ -178,6 +180,7 @@ Application::Application()
|
||||
, _setupEmailLock(false)
|
||||
, _autoLockTimer([=] { checkAutoLock(); }) {
|
||||
Ui::Integration::Set(&_private->uiIntegration);
|
||||
_private->proxyRotation = std::make_unique<ProxyRotationManager>();
|
||||
|
||||
_platformIntegration->init();
|
||||
|
||||
@@ -239,6 +242,7 @@ Application::~Application() {
|
||||
// Domain::finish() and there is a violation on Ensures(started()).
|
||||
closeAdditionalWindows();
|
||||
|
||||
_private->proxyRotation = nullptr;
|
||||
_domain->finish();
|
||||
|
||||
Local::finish();
|
||||
@@ -843,6 +847,17 @@ void Application::setCurrentProxy(
|
||||
refreshGlobalProxy();
|
||||
_proxyChanges.fire({ was, now });
|
||||
my.connectionTypeChangesNotify();
|
||||
proxyRotationSettingsChanged();
|
||||
}
|
||||
|
||||
void Application::proxyRotationSettingsChanged() {
|
||||
_private->proxyRotation->settingsChanged();
|
||||
}
|
||||
|
||||
void Application::checkProxyRotation(
|
||||
not_null<Main::Account*> account,
|
||||
int32 state) {
|
||||
_private->proxyRotation->handleConnectionStateChanged(account, state);
|
||||
}
|
||||
|
||||
auto Application::proxyChanges() const -> rpl::producer<ProxyChange> {
|
||||
|
||||
Reference in New Issue
Block a user