2
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-05 00:46:08 +00:00

Support multiple proxies in local storage.

This commit is contained in:
John Preston
2018-04-27 21:26:45 +04:00
parent 8e99135f37
commit 900d1ddb36
12 changed files with 205 additions and 146 deletions

View File

@@ -168,21 +168,18 @@ void Session::restart() {
}
void Session::refreshDataFields() {
const auto connectionType = Global::ConnectionType();
const auto proxyType = Global::ConnectionProxy().type;
const auto useTcp = (proxyType != ProxyData::Type::Http) &&
(connectionType == dbictAuto
|| connectionType == dbictTcpProxy
|| proxyType == ProxyData::Type::Mtproto);
const auto useHttp = (proxyType != ProxyData::Type::Mtproto) &&
(connectionType == dbictAuto
|| connectionType == dbictHttpProxy);
const auto &proxy = Global::SelectedProxy();
const auto proxyType = Global::UseProxy()
? proxy.type
: ProxyData::Type::None;
const auto useTcp = (proxyType != ProxyData::Type::Http);
const auto useHttp = (proxyType != ProxyData::Type::Mtproto);
const auto useIPv4 = true;
const auto useIPv6 = Global::TryIPv6();
data.setConnectionOptions(ConnectionOptions(
_instance->systemLangCode(),
_instance->cloudLangCode(),
Global::ConnectionProxy(),
Global::UseProxy() ? proxy : ProxyData(),
useIPv4,
useIPv6,
useHttp,