passepartoutvpn/passepartout-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/passepartout-apple.git synced 2025-01-31 04:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Omit empty sections in server-pushed configuration

Browse Source
This commit is contained in:
Davide De Rosa 2019-12-12 00:45:21 +01:00
parent e27d40c3da
commit 3165461b8d
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Passepartout-iOS/Scenes/ConfigurationViewController.swift
View File

@ -58,15 +58,12 @@ class ConfigurationViewController: UIViewController, StrongTableHost {
model.clear()
// sections
model.add(.communication)
model.add(.compression)
if isEditable {
model.add(.reset)
}
if !isServerPushed {
model.add(.tls)
}
model.add(.other)
// headers
model.setHeader(L10n.Core.Configuration.Sections.Communication.header, forSection: .communication)
@ -90,7 +87,10 @@ class ConfigurationViewController: UIViewController, StrongTableHost {
if let _ = configuration.digest {
rows.append(.digest)
}
model.set(rows, forSection: .communication)
if !rows.isEmpty {
model.add(.communication)
model.set(rows, forSection: .communication)
}
rows = []
if let _ = configuration.compressionFraming {
@ -99,7 +99,10 @@ class ConfigurationViewController: UIViewController, StrongTableHost {
if let _ = configuration.compressionAlgorithm {
rows.append(.compressionAlgorithm)
}
model.set(rows, forSection: .compression)
if !rows.isEmpty {
model.add(.compression)
model.set(rows, forSection: .compression)
}
rows = []
if let _ = configuration.keepAliveInterval {
@ -111,8 +114,14 @@ class ConfigurationViewController: UIViewController, StrongTableHost {
if let _ = configuration.randomizeEndpoint {
rows.append(.randomEndpoint)
}
model.set(rows, forSection: .other)
if !rows.isEmpty {
model.add(.other)
model.set(rows, forSection: .other)
}
} else {
model.add(.communication)
model.add(.compression)
model.add(.other)
model.set([.cipher, .digest], forSection: .communication)
model.set([.compressionFraming, .compressionAlgorithm], forSection: .compression)
model.set([.keepAlive, .renegSeconds, .randomEndpoint], forSection: .other)