passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tunnel creation: Variable renaming 

s/interfaceEditFieldsBySection/interfaceFieldsBySection/g;
s/peerEditFieldsBySection/peerFieldsBySection/g;

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2018-10-23 18:02:10 +05:30
parent 6243717a37
commit fa2760190b
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
View File

@ -12,13 +12,13 @@ import UIKit
class TunnelEditTableViewController: UITableViewController { class TunnelEditTableViewController: UITableViewController {
let interfaceEditFieldsBySection: [[TunnelViewModel.InterfaceField]] = [ let interfaceFieldsBySection: [[TunnelViewModel.InterfaceField]] = [
[.name], [.name],
[.privateKey, .publicKey, .generateKeyPair], [.privateKey, .publicKey, .generateKeyPair],
[.addresses, .listenPort, .mtu, .dns] [.addresses, .listenPort, .mtu, .dns]
] ]
let peerEditFieldsBySection: [[TunnelViewModel.PeerField]] = [ let peerFieldsBySection: [[TunnelViewModel.PeerField]] = [
[.publicKey, .preSharedKey, .endpoint, [.publicKey, .preSharedKey, .endpoint,
.allowedIPs, .excludePrivateIPs, .allowedIPs, .excludePrivateIPs,
.persistentKeepAlive, .persistentKeepAlive,
@ -89,25 +89,25 @@ class TunnelEditTableViewController: UITableViewController {
extension TunnelEditTableViewController { extension TunnelEditTableViewController {
override func numberOfSections(in tableView: UITableView) -> Int { override func numberOfSections(in tableView: UITableView) -> Int {
let numberOfInterfaceSections = interfaceEditFieldsBySection.count let numberOfInterfaceSections = interfaceFieldsBySection.count
let numberOfPeerSections = peerEditFieldsBySection.count let numberOfPeerSections = peerFieldsBySection.count
let numberOfPeers = tunnelViewModel.peersData.count let numberOfPeers = tunnelViewModel.peersData.count
return numberOfInterfaceSections + (numberOfPeers * numberOfPeerSections) + 1 return numberOfInterfaceSections + (numberOfPeers * numberOfPeerSections) + 1
} }
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
let numberOfInterfaceSections = interfaceEditFieldsBySection.count let numberOfInterfaceSections = interfaceFieldsBySection.count
let numberOfPeerSections = peerEditFieldsBySection.count let numberOfPeerSections = peerFieldsBySection.count
let numberOfPeers = tunnelViewModel.peersData.count let numberOfPeers = tunnelViewModel.peersData.count
if (section < numberOfInterfaceSections) { if (section < numberOfInterfaceSections) {
// Interface // Interface
return interfaceEditFieldsBySection[section].count return interfaceFieldsBySection[section].count
} else if ((numberOfPeers > 0) && (section < (numberOfInterfaceSections + numberOfPeers * numberOfPeerSections))) { } else if ((numberOfPeers > 0) && (section < (numberOfInterfaceSections + numberOfPeers * numberOfPeerSections))) {
// Peer // Peer
let fieldIndex = (section - numberOfInterfaceSections) % numberOfPeerSections let fieldIndex = (section - numberOfInterfaceSections) % numberOfPeerSections
return peerEditFieldsBySection[fieldIndex].count return peerFieldsBySection[fieldIndex].count
} else { } else {
// Add peer // Add peer
return 1 return 1
@ -115,8 +115,8 @@ extension TunnelEditTableViewController {
} }
override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
let numberOfInterfaceSections = interfaceEditFieldsBySection.count let numberOfInterfaceSections = interfaceFieldsBySection.count
let numberOfPeerSections = peerEditFieldsBySection.count let numberOfPeerSections = peerFieldsBySection.count
let numberOfPeers = tunnelViewModel.peersData.count let numberOfPeers = tunnelViewModel.peersData.count
if (section < numberOfInterfaceSections) { if (section < numberOfInterfaceSections) {
@ -133,8 +133,8 @@ extension TunnelEditTableViewController {
} }
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let numberOfInterfaceSections = interfaceEditFieldsBySection.count let numberOfInterfaceSections = interfaceFieldsBySection.count
let numberOfPeerSections = peerEditFieldsBySection.count let numberOfPeerSections = peerFieldsBySection.count
let numberOfPeers = tunnelViewModel.peersData.count let numberOfPeers = tunnelViewModel.peersData.count
let section = indexPath.section let section = indexPath.section
@ -143,7 +143,7 @@ extension TunnelEditTableViewController {
if (section < numberOfInterfaceSections) { if (section < numberOfInterfaceSections) {
// Interface // Interface
let interfaceData = tunnelViewModel.interfaceData let interfaceData = tunnelViewModel.interfaceData
let field = interfaceEditFieldsBySection[section][row] let field = interfaceFieldsBySection[section][row]
if (field == .generateKeyPair) { if (field == .generateKeyPair) {
let cell = tableView.dequeueReusableCell(withIdentifier: TunnelsEditTableViewButtonCell.id, for: indexPath) as! TunnelsEditTableViewButtonCell let cell = tableView.dequeueReusableCell(withIdentifier: TunnelsEditTableViewButtonCell.id, for: indexPath) as! TunnelsEditTableViewButtonCell
cell.buttonText = field.rawValue cell.buttonText = field.rawValue
@ -173,7 +173,7 @@ extension TunnelEditTableViewController {
let peerIndex = Int((section - numberOfInterfaceSections) / numberOfPeerSections) let peerIndex = Int((section - numberOfInterfaceSections) / numberOfPeerSections)
let peerSectionIndex = (section - numberOfInterfaceSections) % numberOfPeerSections let peerSectionIndex = (section - numberOfInterfaceSections) % numberOfPeerSections
let peerData = tunnelViewModel.peersData[peerIndex] let peerData = tunnelViewModel.peersData[peerIndex]
let field = peerEditFieldsBySection[peerSectionIndex][row] let field = peerFieldsBySection[peerSectionIndex][row]
if (field == .deletePeer) { if (field == .deletePeer) {
let cell = tableView.dequeueReusableCell(withIdentifier: TunnelsEditTableViewButtonCell.id, for: indexPath) as! TunnelsEditTableViewButtonCell let cell = tableView.dequeueReusableCell(withIdentifier: TunnelsEditTableViewButtonCell.id, for: indexPath) as! TunnelsEditTableViewButtonCell
cell.buttonText = field.rawValue cell.buttonText = field.rawValue
@ -223,8 +223,8 @@ extension TunnelEditTableViewController {
} }
func appendEmptyPeer() -> IndexSet { func appendEmptyPeer() -> IndexSet {
let numberOfInterfaceSections = interfaceEditFieldsBySection.count let numberOfInterfaceSections = interfaceFieldsBySection.count
let numberOfPeerSections = peerEditFieldsBySection.count let numberOfPeerSections = peerFieldsBySection.count
tunnelViewModel.appendEmptyPeer() tunnelViewModel.appendEmptyPeer()
let addedPeerIndex = tunnelViewModel.peersData.count - 1 let addedPeerIndex = tunnelViewModel.peersData.count - 1
@ -235,8 +235,8 @@ extension TunnelEditTableViewController {
} }
func deletePeer(peer: TunnelViewModel.PeerData) -> IndexSet { func deletePeer(peer: TunnelViewModel.PeerData) -> IndexSet {
let numberOfInterfaceSections = interfaceEditFieldsBySection.count let numberOfInterfaceSections = interfaceFieldsBySection.count
let numberOfPeerSections = peerEditFieldsBySection.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)