VPN v2

main/Requests/TVCDomains.swift

@@ -0,0 +1,41 @@
+import UIKit
+
+class TVCDomains: UITableViewController, IncrementalDataSourceUpdate {
+	
+	internal var dataSource: [GroupedDomain] = []
+	
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		if #available(iOS 10.0, *) {
+			tableView.refreshControl = UIRefreshControl(call: #selector(reloadDataSource), on: self)
+		}
+		NotifyLogHistoryReset.observe(call: #selector(reloadDataSource), on: self)
+		reloadDataSource()
+		DBWrp.dataA_delegate = self
+	}
+	
+	@objc func reloadDataSource() {
+		dataSource = DBWrp.listOfDomains()
+		tableView.reloadData()
+	}
+	
+	override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+		if let index = tableView.indexPathForSelectedRow?.row {
+			(segue.destination as? TVCHosts)?.parentDomain = dataSource[index].domain
+		}
+	}
+	
+	
+	// MARK: - Table View Delegate
+	
+	override func tableView(_ _: UITableView, numberOfRowsInSection _: Int) -> Int { dataSource.count }
+	
+	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+		let cell = tableView.dequeueReusableCell(withIdentifier: "DomainCell")!
+		let entry = dataSource[indexPath.row]
+		cell.textLabel?.text = entry.domain
+		cell.detailTextLabel?.text = entry.detailCellText
+		cell.imageView?.image = entry.options?.tableRowImage()
+		return cell
+	}
+}

main/Requests/TVCHostDetails.swift

@@ -0,0 +1,32 @@
+import UIKit
+
+class TVCHostDetails: UITableViewController {
+
+	public var fullDomain: String!
+	private var dataSource: [(ts: Timestamp, blocked: Bool)] = []
+	
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		navigationItem.prompt = fullDomain
+		if #available(iOS 10.0, *) {
+			tableView.refreshControl = UIRefreshControl(call: #selector(reloadDataSource), on: self)
+		}
+		NotifyLogHistoryReset.observe(call: #selector(reloadDataSource), on: self)
+		reloadDataSource()
+	}
+	
+	@objc func reloadDataSource() {
+		dataSource = DBWrp.listOfTimes(fullDomain)
+		tableView.reloadData()
+	}
+	
+	override func tableView(_ _: UITableView, numberOfRowsInSection _: Int) -> Int { dataSource.count }
+	
+	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+		let cell = tableView.dequeueReusableCell(withIdentifier: "HostDetailCell")!
+		let src = dataSource[indexPath.row]
+		cell.textLabel?.text = dateTimeFormat.string(from: src.ts)
+		cell.imageView?.image = (src.blocked ? UIImage(named: "shield-x") : nil)
+		return cell
+	}
+}

main/Requests/TVCHosts.swift

@@ -0,0 +1,54 @@
+import UIKit
+
+class TVCHosts: UITableViewController, IncrementalDataSourceUpdate {
+	
+	public var parentDomain: String!
+	internal var dataSource: [GroupedDomain] = []
+	private var isSpecial: Bool = false
+	
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		navigationItem.prompt = parentDomain
+		isSpecial = (parentDomain.first == "#") // aka: "# IP address"
+		if #available(iOS 10.0, *) {
+			tableView.refreshControl = UIRefreshControl(call: #selector(reloadDataSource), on: self)
+		}
+		NotifyLogHistoryReset.observe(call: #selector(reloadDataSource), on: self)
+		reloadDataSource()
+		DBWrp.currentlyOpenParent = parentDomain
+		DBWrp.dataB_delegate = self
+	}
+	deinit {
+		DBWrp.currentlyOpenParent = nil
+	}
+	
+	@objc func reloadDataSource() {
+		dataSource = DBWrp.listOfHosts(parentDomain)
+		tableView.reloadData()
+	}
+	
+	override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+		if let index = tableView.indexPathForSelectedRow?.row {
+			(segue.destination as? TVCHostDetails)?.fullDomain = dataSource[index].domain
+		}
+	}
+	
+	// MARK: - Data Source
+	
+	override func tableView(_ _: UITableView, numberOfRowsInSection _: Int) -> Int { dataSource.count }
+	
+	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+		let cell = tableView.dequeueReusableCell(withIdentifier: "HostCell")!
+		let entry = dataSource[indexPath.row]
+		if isSpecial {
+			// currently only used for IP addresses
+			cell.textLabel?.text = entry.domain
+		} else {
+			cell.textLabel?.attributedText = NSMutableAttributedString(string: entry.domain)
+				.withColor(.darkGray, fromBack: parentDomain.count + 1)
+		}
+		cell.detailTextLabel?.text = entry.detailCellText
+		cell.imageView?.image = entry.options?.tableRowImage()
+		return cell
+	}
+}