From: Roopesh Chander Date: Tue, 18 Dec 2018 14:30:01 +0000 (+0530) Subject: s/Observervation/Observation/g; X-Git-Tag: 0.0.20181225-1~57 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ae9fb538df8a3ff80af09f297864e74fe0a4336;p=thirdparty%2Fwireguard-apple.git s/Observervation/Observation/g; Signed-off-by: Roopesh Chander --- diff --git a/WireGuard/WireGuard/UI/iOS/View/TunnelListCell.swift b/WireGuard/WireGuard/UI/iOS/View/TunnelListCell.swift index 14a7194..d13346a 100644 --- a/WireGuard/WireGuard/UI/iOS/View/TunnelListCell.swift +++ b/WireGuard/WireGuard/UI/iOS/View/TunnelListCell.swift @@ -8,12 +8,12 @@ class TunnelListCell: UITableViewCell { didSet(value) { // Bind to the tunnel's name nameLabel.text = tunnel?.name ?? "" - nameObservervationToken = tunnel?.observe(\.name) { [weak self] tunnel, _ in + nameObservationToken = tunnel?.observe(\.name) { [weak self] tunnel, _ in self?.nameLabel.text = tunnel.name } // Bind to the tunnel's status update(from: tunnel?.status) - statusObservervationToken = tunnel?.observe(\.status) { [weak self] tunnel, _ in + statusObservationToken = tunnel?.observe(\.status) { [weak self] tunnel, _ in self?.update(from: tunnel.status) } } @@ -36,8 +36,8 @@ class TunnelListCell: UITableViewCell { let statusSwitch = UISwitch() - private var statusObservervationToken: AnyObject? - private var nameObservervationToken: AnyObject? + private var statusObservationToken: AnyObject? + private var nameObservationToken: AnyObject? override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { super.init(style: style, reuseIdentifier: reuseIdentifier) diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift index 1e1ac59..cd6c7d8 100644 --- a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift @@ -29,8 +29,8 @@ class TunnelDetailTableViewController: UITableViewController { let tunnel: TunnelContainer var tunnelViewModel: TunnelViewModel private var sections = [Section]() - private var onDemandStatusObservervationToken: AnyObject? - private var statusObservervationToken: AnyObject? + private var onDemandStatusObservationToken: AnyObject? + private var statusObservationToken: AnyObject? init(tunnelsManager: TunnelsManager, tunnel: TunnelContainer) { self.tunnelsManager = tunnelsManager @@ -45,8 +45,8 @@ class TunnelDetailTableViewController: UITableViewController { } deinit { - onDemandStatusObservervationToken = nil - statusObservervationToken = nil + onDemandStatusObservationToken = nil + statusObservationToken = nil } override func viewDidLoad() { @@ -196,7 +196,7 @@ extension TunnelDetailTableViewController { } statusUpdate(cell, tunnel.status) - statusObservervationToken = tunnel.observe(\.status) { [weak cell] tunnel, _ in + statusObservationToken = tunnel.observe(\.status) { [weak cell] tunnel, _ in guard let cell = cell else { return } statusUpdate(cell, tunnel.status) } @@ -232,7 +232,7 @@ extension TunnelDetailTableViewController { let cell: KeyValueCell = tableView.dequeueReusableCell(for: indexPath) cell.key = "Activate on demand" cell.value = TunnelViewModel.activateOnDemandDetailText(for: tunnel.activateOnDemandSetting()) - onDemandStatusObservervationToken = tunnel.observe(\.isActivateOnDemandEnabled) { [weak cell] tunnel, _ in + onDemandStatusObservationToken = tunnel.observe(\.isActivateOnDemandEnabled) { [weak cell] tunnel, _ in cell?.value = TunnelViewModel.activateOnDemandDetailText(for: tunnel.activateOnDemandSetting()) } return cell