Add intermediate "Info" screen.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

WireGuard/ViewControllers/TunnelInfoTableViewController.swift

@@ -0,0 +1,115 @@
+//
+//  TunnelInfoTableViewController.swift
+//  WireGuard
+//
+//  Created by Jeroen Leenarts on 15-09-18.
+//  Copyright © 2018 WireGuard LLC. All rights reserved.
+//
+
+import UIKit
+import CoreData
+import BNRCoreDataStack
+import PromiseKit
+
+protocol TunnelInfoTableViewControllerDelegate: class {
+    func configure(tunnel: Tunnel, tunnelInfoTableViewController: TunnelInfoTableViewController)
+}
+
+class TunnelInfoTableViewController: UITableViewController {
+
+    @IBOutlet weak var editButton: UIBarButtonItem!
+
+    private var viewContext: NSManagedObjectContext!
+    private weak var delegate: TunnelInfoTableViewControllerDelegate?
+    private var tunnel: Tunnel!
+
+    func configure(context: NSManagedObjectContext, delegate: TunnelInfoTableViewControllerDelegate? = nil, tunnel: Tunnel) {
+        viewContext = context
+        self.delegate = delegate
+        self.tunnel = tunnel
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super .viewWillAppear(animated)
+
+        self.tableView.reloadData()
+    }
+
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 3
+    }
+
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        switch section {
+        case 1:
+            return tunnel?.peers?.count ?? 1
+        default:
+            return 1
+        }
+    }
+
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        switch indexPath.section {
+        case 0:
+            let cell = tableView.dequeueReusableCell(type: InterfaceInfoTableViewCell.self, for: indexPath)
+            cell.model = tunnel.interface
+            return cell
+        default:
+            let cell =  tableView.dequeueReusableCell(type: PeerInfoTableViewCell.self, for: indexPath)
+            if let peer = tunnel.peers?.object(at: indexPath.row) as? Peer {
+                cell.peer = peer
+            } else {
+                let peer = Peer(context: tunnel.managedObjectContext!)
+                tunnel.addToPeers(peer)
+                cell.peer = peer
+            }
+            return cell
+        }
+    }
+
+    @IBAction func editTunnelConfiguration(_ sender: Any) {
+        delegate?.configure(tunnel: self.tunnel, tunnelInfoTableViewController: self)
+    }
+}
+
+class InterfaceInfoTableViewCell: UITableViewCell {
+    var model: Interface! {
+        didSet {
+            nameField.text = model.tunnel?.title
+            addressesField.text = model.addresses
+            privateKeyField.text = model.privateKey
+            listenPortField.text = String(model.listenPort)
+            dnsField.text = model.dns
+            mtuField.text = String(model.mtu)
+        }
+    }
+
+    @IBOutlet weak var nameField: UILabel!
+    @IBOutlet weak var addressesField: UILabel!
+    @IBOutlet weak var privateKeyField: UILabel!
+    @IBOutlet weak var listenPortField: UILabel!
+    @IBOutlet weak var dnsField: UILabel!
+    @IBOutlet weak var mtuField: UILabel!
+}
+
+class PeerInfoTableViewCell: UITableViewCell {
+    var peer: Peer! {
+        didSet {
+            publicKeyField.text = peer.publicKey
+            preSharedKeyField.text = peer.presharedKey
+            allowedIpsField.text = peer.allowedIPs
+            endpointField.text = peer.endpoint
+            persistentKeepaliveField.text = String(peer.persistentKeepalive)
+        }
+    }
+
+    @IBOutlet weak var publicKeyField: UILabel!
+    @IBOutlet weak var preSharedKeyField: UILabel!
+    @IBOutlet weak var allowedIpsField: UILabel!
+    @IBOutlet weak var endpointField: UILabel!
+    @IBOutlet weak var persistentKeepaliveField: UILabel!
+}
+
+extension TunnelInfoTableViewController: Identifyable {}
+extension InterfaceInfoTableViewCell: Identifyable {}
+extension PeerInfoTableViewCell: Identifyable {}

WireGuard/ViewControllers/TunnelsTableViewController.swift

@@ -7,8 +7,9 @@
 //
 
 import UIKit
-
+import os.log
 import CoreData
+
 import BNRCoreDataStack
 import NetworkExtension
 
@@ -17,7 +18,7 @@ protocol TunnelsTableViewControllerDelegate: class {
     func addProvider(tunnelsTableViewController: TunnelsTableViewController)
     func connect(tunnel: Tunnel, tunnelsTableViewController: TunnelsTableViewController)
     func disconnect(tunnel: Tunnel, tunnelsTableViewController: TunnelsTableViewController)
-    func configure(tunnel: Tunnel, tunnelsTableViewController: TunnelsTableViewController)
+    func info(tunnel: Tunnel, tunnelsTableViewController: TunnelsTableViewController)
     func delete(tunnel: Tunnel, tunnelsTableViewController: TunnelsTableViewController)
     func status(for tunnel: Tunnel, tunnelsTableViewController: TunnelsTableViewController) -> NEVPNStatus
 }
@@ -39,11 +40,16 @@ class TunnelsTableViewController: UITableViewController {
 
     public func updateStatus(for tunnelIdentifier: String) {
         viewContext.perform {
-            let tunnel = try? Tunnel.findFirstInContext(self.viewContext, predicate: NSPredicate(format: "tunnelIdentifier == %@", tunnelIdentifier))
-            if let tunnel = tunnel {
-                if let indexPath = self.fetchedResultsController.indexPathForObject(tunnel!) {
-                    self.tableView.reloadRows(at: [indexPath], with: UITableViewRowAnimation.none)
+            do {
+                let tunnel = try Tunnel.findFirstInContext(self.viewContext, predicate: NSPredicate(format: "tunnelIdentifier == %@", tunnelIdentifier))
+                if let tunnel = tunnel {
+                    if let indexPath = self.fetchedResultsController.indexPathForObject(tunnel) {
+                        self.tableView.reloadRows(at: [indexPath], with: UITableViewRowAnimation.none)
+                    }
                 }
+            } catch {
+                os_log("Unable to load tunnel for tunnel identifier: %{public}@", log: Log.general, type: .error, error.localizedDescription)
+
             }
         }
     }
@@ -104,7 +110,7 @@ class TunnelsTableViewController: UITableViewController {
         let section = sections[indexPath.section]
         let tunnel = section.objects[indexPath.row]
 
-        delegate?.configure(tunnel: tunnel, tunnelsTableViewController: self)
+        delegate?.info(tunnel: tunnel, tunnelsTableViewController: self)
 
         tableView.deselectRow(at: indexPath, animated: true)
     }
@@ -117,7 +123,7 @@ class TunnelsTableViewController: UITableViewController {
         let section = sections[indexPath.section]
         let tunnel = section.objects[indexPath.row]
 
-        delegate?.configure(tunnel: tunnel, tunnelsTableViewController: self)
+        delegate?.info(tunnel: tunnel, tunnelsTableViewController: self)
 
     }