ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 06:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into buck-test

Browse Source
This commit is contained in:
Peter
2019-08-30 04:16:26 +04:00
parent ff64dff3b6 749a35b11c
commit 2d56c99495
660 changed files with 20469 additions and 11858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
submodules/SettingsUI/Sources/Data and Storage/ProxyListSettingsController.swift
View File

@@ -39,6 +39,7 @@ private final class ProxySettingsControllerArguments {
private enum ProxySettingsControllerSection: Int32 {
case enabled
case servers
case share
case calls
}
@@ -72,8 +73,10 @@ private enum ProxySettingsControllerEntry: ItemListNodeEntry {
switch self {
case .enabled:
return ProxySettingsControllerSection.enabled.rawValue
case .serversHeader, .addServer, .server, .shareProxyList:
case .serversHeader, .addServer, .server:
return ProxySettingsControllerSection.servers.rawValue
case .shareProxyList:
return ProxySettingsControllerSection.share.rawValue
case .useForCalls, .useForCallsInfo:
return ProxySettingsControllerSection.calls.rawValue
}
@@ -344,7 +347,7 @@ public func proxySettingsController(accountManager: AccountManager, postbox: Pos
let _ = updateProxySettingsInteractively(accountManager: accountManager, { current in
var current = current
if current.activeServer != server {
if let _ = current.servers.index(of: server) {
if let _ = current.servers.firstIndex(of: server) {
current.activeServer = server
current.enabled = true
}
@@ -356,7 +359,7 @@ public func proxySettingsController(accountManager: AccountManager, postbox: Pos
}, removeServer: { server in
let _ = updateProxySettingsInteractively(accountManager: accountManager, { current in
var current = current
if let index = current.servers.index(of: server) {
if let index = current.servers.firstIndex(of: server) {
current.servers.remove(at: index)
if current.activeServer == server {
current.activeServer = nil
@@ -466,7 +469,7 @@ public func proxySettingsController(accountManager: AccountManager, postbox: Pos
let _ = updateProxySettingsInteractively(accountManager: accountManager, { current in
var current = current
if let index = current.servers.index(of: fromServer) {
if let index = current.servers.firstIndex(of: fromServer) {
current.servers.remove(at: index)
}
if let referenceServer = referenceServer {