Fixed editable KeyValueCells being copyable

Fixed DNS servers not saving

Signed-off-by: Eric Kuck <eric@bluelinelabs.com>

diff --git a/WireGuard/WireGuard/UI/iOS/View/TunnelEditKeyValueCell.swift b/WireGuard/WireGuard/UI/iOS/View/TunnelEditKeyValueCell.swift
index 3e1867017e8bf211e1ed2a05a4fd87044cf08937..30897344862df99984fd58b8ef28645b19b65994 100644 (file)
--- a/WireGuard/WireGuard/UI/iOS/View/TunnelEditKeyValueCell.swift
+++ b/WireGuard/WireGuard/UI/iOS/View/TunnelEditKeyValueCell.swift
@@ -29,6 +29,7 @@ class TunnelEditEditableKeyValueCell: TunnelEditKeyValueCell {
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         
+        copyableGesture = false
         valueTextField.textColor = .black
         valueTextField.isEnabled = true
         valueLabelScrollView.isScrollEnabled = false

diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift
index a9e213920e62e5a53a3902fefccdd471167068cd..4ba0cb090496c02d4947f4580e946855f53a2c59 100644 (file)
--- a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift
@@ -246,7 +246,6 @@ extension TunnelEditTableViewController {
         // Bind values to view model
         cell.value = tunnelViewModel.interfaceData[field]
         if field == .dns { // While editing DNS, you might directly set exclude private IPs
-            cell.onValueChanged = nil
             cell.onValueBeingEdited = { [weak self] value in
                 self?.tunnelViewModel.interfaceData[field] = value
             }
@@ -254,7 +253,6 @@ extension TunnelEditTableViewController {
             cell.onValueChanged = { [weak self] value in
                 self?.tunnelViewModel.interfaceData[field] = value
             }
-            cell.onValueBeingEdited = nil
         }
         // Compute public key live
         if field == .privateKey {
@@ -266,8 +264,6 @@ extension TunnelEditTableViewController {
                     self.tableView.reloadRows(at: [IndexPath(row: row, section: indexPath.section)], with: .none)
                 }
             }
-        } else {
-            cell.onValueBeingEdited = nil
         }
         return cell
     }