ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tunnel edit: Assume there's just one section per peer

Browse Source 
Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander
2018-10-29 12:46:54 +05:30
parent e4125f6d22
commit 81bbfcf46a
1 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
+19 -30
View File
@@ -20,10 +20,10 @@ class TunnelEditTableViewController: UITableViewController {
[.addresses, .listenPort, .mtu, .dns] [.addresses, .listenPort, .mtu, .dns]
] ]
let peerFieldsBySection: [[TunnelViewModel.PeerField]] = [ let peerFields: [TunnelViewModel.PeerField] = [
[.publicKey, .preSharedKey, .endpoint, .publicKey, .preSharedKey, .endpoint,
.allowedIPs, .persistentKeepAlive, .allowedIPs, .persistentKeepAlive,
.deletePeer] .deletePeer
] ]
let tunnelsManager: TunnelsManager let tunnelsManager: TunnelsManager
@@ -120,24 +120,21 @@ class TunnelEditTableViewController: UITableViewController {
extension TunnelEditTableViewController { extension TunnelEditTableViewController {
override func numberOfSections(in tableView: UITableView) -> Int { override func numberOfSections(in tableView: UITableView) -> Int {
let numberOfInterfaceSections = interfaceFieldsBySection.count let numberOfInterfaceSections = interfaceFieldsBySection.count
let numberOfPeerSections = peerFieldsBySection.count let numberOfPeerSections = tunnelViewModel.peersData.count
let numberOfPeers = tunnelViewModel.peersData.count
return numberOfInterfaceSections + (numberOfPeers * numberOfPeerSections) + 1 return numberOfInterfaceSections + numberOfPeerSections + 1
} }
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
let numberOfInterfaceSections = interfaceFieldsBySection.count let numberOfInterfaceSections = interfaceFieldsBySection.count
let numberOfPeerSections = peerFieldsBySection.count let numberOfPeerSections = tunnelViewModel.peersData.count
let numberOfPeers = tunnelViewModel.peersData.count
if (section < numberOfInterfaceSections) { if (section < numberOfInterfaceSections) {
// Interface // Interface
return interfaceFieldsBySection[section].count return interfaceFieldsBySection[section].count
} else if ((numberOfPeers > 0) && (section < (numberOfInterfaceSections + numberOfPeers * numberOfPeerSections))) { } else if ((numberOfPeerSections > 0) && (section < (numberOfInterfaceSections + numberOfPeerSections))) {
// Peer // Peer
let fieldIndex = (section - numberOfInterfaceSections) % numberOfPeerSections return peerFields.count
return peerFieldsBySection[fieldIndex].count
} else { } else {
// Add peer // Add peer
return 1 return 1
@@ -146,16 +143,14 @@ extension TunnelEditTableViewController {
override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
let numberOfInterfaceSections = interfaceFieldsBySection.count let numberOfInterfaceSections = interfaceFieldsBySection.count
let numberOfPeerSections = peerFieldsBySection.count let numberOfPeerSections = tunnelViewModel.peersData.count
let numberOfPeers = tunnelViewModel.peersData.count
if (section < numberOfInterfaceSections) { if (section < numberOfInterfaceSections) {
// Interface // Interface
return (section == 0) ? "Interface" : nil return (section == 0) ? "Interface" : nil
} else if ((numberOfPeers > 0) && (section < (numberOfInterfaceSections + numberOfPeers * numberOfPeerSections))) { } else if ((numberOfPeerSections > 0) && (section < (numberOfInterfaceSections + numberOfPeerSections))) {
// Peer // Peer
let fieldIndex = (section - numberOfInterfaceSections) % numberOfPeerSections return "Peer"
return (fieldIndex == 0) ? "Peer" : nil
} else { } else {
// Add peer // Add peer
return nil return nil
@@ -164,8 +159,7 @@ extension TunnelEditTableViewController {
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let numberOfInterfaceSections = interfaceFieldsBySection.count let numberOfInterfaceSections = interfaceFieldsBySection.count
let numberOfPeerSections = peerFieldsBySection.count let numberOfPeerSections = tunnelViewModel.peersData.count
let numberOfPeers = tunnelViewModel.peersData.count
let section = indexPath.section let section = indexPath.section
let row = indexPath.row let row = indexPath.row
@@ -227,12 +221,11 @@ extension TunnelEditTableViewController {
} }
return cell return cell
} }
} else if ((numberOfPeers > 0) && (section < (numberOfInterfaceSections + numberOfPeers * numberOfPeerSections))) { } else if ((numberOfPeerSections > 0) && (section < (numberOfInterfaceSections + numberOfPeerSections))) {
// Peer // Peer
let peerIndex = Int((section - numberOfInterfaceSections) / numberOfPeerSections) let peerIndex = (section - numberOfInterfaceSections)
let peerSectionIndex = (section - numberOfInterfaceSections) % numberOfPeerSections
let peerData = tunnelViewModel.peersData[peerIndex] let peerData = tunnelViewModel.peersData[peerIndex]
let field = peerFieldsBySection[peerSectionIndex][row] let field = peerFields[row]
if (field == .deletePeer) { if (field == .deletePeer) {
let cell = tableView.dequeueReusableCell(withIdentifier: TunnelEditTableViewButtonCell.id, for: indexPath) as! TunnelEditTableViewButtonCell let cell = tableView.dequeueReusableCell(withIdentifier: TunnelEditTableViewButtonCell.id, for: indexPath) as! TunnelEditTableViewButtonCell
cell.buttonText = field.rawValue cell.buttonText = field.rawValue
@@ -273,7 +266,7 @@ extension TunnelEditTableViewController {
return cell return cell
} }
} else { } else {
assert(section == (numberOfInterfaceSections + numberOfPeers * numberOfPeerSections)) assert(section == (numberOfInterfaceSections + numberOfPeerSections))
// Add peer // Add peer
let cell = tableView.dequeueReusableCell(withIdentifier: TunnelEditTableViewButtonCell.id, for: indexPath) as! TunnelEditTableViewButtonCell let cell = tableView.dequeueReusableCell(withIdentifier: TunnelEditTableViewButtonCell.id, for: indexPath) as! TunnelEditTableViewButtonCell
cell.buttonText = "Add peer" cell.buttonText = "Add peer"
@@ -288,25 +281,21 @@ extension TunnelEditTableViewController {
func appendEmptyPeer() -> IndexSet { func appendEmptyPeer() -> IndexSet {
let numberOfInterfaceSections = interfaceFieldsBySection.count let numberOfInterfaceSections = interfaceFieldsBySection.count
let numberOfPeerSections = peerFieldsBySection.count
tunnelViewModel.appendEmptyPeer() tunnelViewModel.appendEmptyPeer()
let addedPeerIndex = tunnelViewModel.peersData.count - 1 let addedPeerIndex = tunnelViewModel.peersData.count - 1
let firstAddedSectionIndex = (numberOfInterfaceSections + addedPeerIndex * numberOfPeerSections) let addedSectionIndices = IndexSet(integer: (numberOfInterfaceSections + addedPeerIndex))
let addedSectionIndices = IndexSet(integersIn: firstAddedSectionIndex ..< firstAddedSectionIndex + numberOfPeerSections)
return addedSectionIndices return addedSectionIndices
} }
func deletePeer(peer: TunnelViewModel.PeerData) -> IndexSet { func deletePeer(peer: TunnelViewModel.PeerData) -> IndexSet {
let numberOfInterfaceSections = interfaceFieldsBySection.count let numberOfInterfaceSections = interfaceFieldsBySection.count
let numberOfPeerSections = peerFieldsBySection.count
assert(peer.index < tunnelViewModel.peersData.count) assert(peer.index < tunnelViewModel.peersData.count)
tunnelViewModel.deletePeer(peer: peer) tunnelViewModel.deletePeer(peer: peer)
let firstRemovedSectionIndex = (numberOfInterfaceSections + peer.index * numberOfPeerSections) let removedSectionIndices = IndexSet(integer: (numberOfInterfaceSections + peer.index))
let removedSectionIndices = IndexSet(integersIn: firstRemovedSectionIndex ..< firstRemovedSectionIndex + numberOfPeerSections)
return removedSectionIndices return removedSectionIndices
} }