ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-04 05:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Peter Iakovlev 2018-04-20 14:24:17 +04:00
parent b081acd134
commit e6721adc80
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TelegramCore/Network.swift
View File

@ -336,7 +336,7 @@ func initializedNetwork(arguments: NetworkInitializationArguments, supplementary
apiEnvironment.disableUpdates = supplementary apiEnvironment.disableUpdates = supplementary
apiEnvironment = apiEnvironment.withUpdatedLangPackCode(languageCode ?? "en") apiEnvironment = apiEnvironment.withUpdatedLangPackCode(languageCode ?? "en")
if let activeServer = proxySettings?.activeServer { if let effectiveActiveServer = proxySettings?.effectiveActiveServer {
apiEnvironment = apiEnvironment.withUpdatedSocksProxySettings(MTSocksProxySettings(ip: activeServer.host, port: UInt16(activeServer.port), username: activeServer.username, password: activeServer.password)) apiEnvironment = apiEnvironment.withUpdatedSocksProxySettings(MTSocksProxySettings(ip: activeServer.host, port: UInt16(activeServer.port), username: activeServer.username, password: activeServer.password))
} }

31
TelegramCore/ProxySettings.swift
View File

@ -46,27 +46,42 @@ public struct ProxyServerSettings: PostboxCoding, Equatable {
} }
public struct ProxySettings: PreferencesEntry, Equatable { public struct ProxySettings: PreferencesEntry, Equatable {
public var enabled: Bool
public var servers: [ProxyServerSettings] public var servers: [ProxyServerSettings]
public var activeServer: ProxyServerSettings? public var activeServer: ProxyServerSettings?
public var useForCalls: Bool public var useForCalls: Bool
public static var defaultSettings: ProxySettings { public static var defaultSettings: ProxySettings {
return ProxySettings(servers: [], activeServer: nil, useForCalls: false) return ProxySettings(enabled: false, servers: [], activeServer: nil, useForCalls: false)
} }
public init(servers: [ProxyServerSettings], activeServer: ProxyServerSettings?, useForCalls: Bool) { public init(enabled: Bool, servers: [ProxyServerSettings], activeServer: ProxyServerSettings?, useForCalls: Bool) {
self.enabled = enabled
self.servers = servers self.servers = servers
self.activeServer = activeServer self.activeServer = activeServer
self.useForCalls = useForCalls self.useForCalls = useForCalls
} }
public init(decoder: PostboxDecoder) { public init(decoder: PostboxDecoder) {
if let _ = decoder.decodeOptionalStringForKey("server") {
let legacyServer = ProxyServerSettings(decoder: decoder)
if !legacyServer.host.isEmpty && legacyServer.port != 0 {
self.enabled = true
self.servers = [legacyServer]
} else {
self.enabled = false
self.servers = []
}
} else {
self.enabled = decoder.decodeInt32ForKey("enabled", orElse: 0) != 0
self.servers = decoder.decodeObjectArrayWithDecoderForKey("servers") self.servers = decoder.decodeObjectArrayWithDecoderForKey("servers")
}
self.activeServer = decoder.decodeObjectForKey("activeServer", decoder: ProxyServerSettings.init(decoder:)) as? ProxyServerSettings self.activeServer = decoder.decodeObjectForKey("activeServer", decoder: ProxyServerSettings.init(decoder:)) as? ProxyServerSettings
self.useForCalls = decoder.decodeInt32ForKey("useForCalls", orElse: 0) != 0 self.useForCalls = decoder.decodeInt32ForKey("useForCalls", orElse: 0) != 0
} }
public func encode(_ encoder: PostboxEncoder) { public func encode(_ encoder: PostboxEncoder) {
encoder.encodeInt32(self.enabled ? 1 : 0, forKey: "enabled")
encoder.encodeObjectArray(self.servers, forKey: "servers") encoder.encodeObjectArray(self.servers, forKey: "servers")
if let activeServer = self.activeServer { if let activeServer = self.activeServer {
encoder.encodeObject(activeServer, forKey: "activeServer") encoder.encodeObject(activeServer, forKey: "activeServer")
@ -83,6 +98,14 @@ public struct ProxySettings: PreferencesEntry, Equatable {
return self == to return self == to
} }
var effectiveActiveServer: ProxyServerSettings? {
if self.enabled, let activeServer = self.activeServer {
return activeServer
} else {
return nil
}
}
} }
public func updateProxySettingsInteractively(postbox: Postbox, network: Network, _ f: @escaping (ProxySettings) -> ProxySettings) -> Signal<Void, NoError> { public func updateProxySettingsInteractively(postbox: Postbox, network: Network, _ f: @escaping (ProxySettings) -> ProxySettings) -> Signal<Void, NoError> {
@ -93,7 +116,7 @@ public func updateProxySettingsInteractively(postbox: Postbox, network: Network,
let previous = (current as? ProxySettings) ?? ProxySettings.defaultSettings let previous = (current as? ProxySettings) ?? ProxySettings.defaultSettings
let updated = f(previous) let updated = f(previous)
updatedSettings = updated updatedSettings = updated
if updated.activeServer != previous.activeServer { if updated.effectiveActiveServer != previous.effectiveActiveServer {
updateNetwork = true updateNetwork = true
} }
return updated return updated
@ -101,7 +124,7 @@ public func updateProxySettingsInteractively(postbox: Postbox, network: Network,
if updateNetwork, let updatedSettings = updatedSettings { if updateNetwork, let updatedSettings = updatedSettings {
network.context.updateApiEnvironment { current in network.context.updateApiEnvironment { current in
return current?.withUpdatedSocksProxySettings(updatedSettings.activeServer.flatMap { activeServer -> MTSocksProxySettings? in return current?.withUpdatedSocksProxySettings(updatedSettings.effectiveActiveServer.flatMap { activeServer -> MTSocksProxySettings? in
return MTSocksProxySettings(ip: activeServer.host, port: UInt16(activeServer.port), username: activeServer.username, password: activeServer.password) return MTSocksProxySettings(ip: activeServer.host, port: UInt16(activeServer.port), username: activeServer.username, password: activeServer.password)
}) })
} }