On-Demand: Move detail text to TunnelViewModel

Signed-off-by: Roopesh Chander <roop@roopc.net>

diff --git a/WireGuard/WireGuard/UI/TunnelViewModel.swift b/WireGuard/WireGuard/UI/TunnelViewModel.swift
index f237660cf2b33e3eac070ec2448b8e0c15ad9958..2a3f36b0f0553a99c52731e06c68ff504562b261 100644 (file)
--- a/WireGuard/WireGuard/UI/TunnelViewModel.swift
+++ b/WireGuard/WireGuard/UI/TunnelViewModel.swift
@@ -464,6 +464,18 @@ extension TunnelViewModel {
         }
     }
 
+    static func activateOnDemandDetailText(for activateOnDemandSetting: ActivateOnDemandSetting?) -> String {
+        if let activateOnDemandSetting = activateOnDemandSetting {
+            if (activateOnDemandSetting.isActivateOnDemandEnabled) {
+                return TunnelViewModel.activateOnDemandOptionText(for: activateOnDemandSetting.activateOnDemandOption)
+            } else {
+                return TunnelViewModel.activateOnDemandOptionText(for: .none)
+            }
+        } else {
+            return TunnelViewModel.activateOnDemandOptionText(for: .none)
+        }
+    }
+
     func defaultActivateOnDemandOption() -> ActivateOnDemandOption {
         return .useOnDemandOverWiFiOrCellular
     }

diff --git a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
index 5873f1df2b5040ffdfe6c69081d91d814b008638..a888924c2e97240947a9e5fc9feda67fbc3a9e15 100644 (file)
--- a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
@@ -426,26 +426,7 @@ class TunnelDetailTableViewActivateOnDemandCell: UITableViewCell {
     }
 
     func update(from activateOnDemandSetting: ActivateOnDemandSetting?) {
-        let detailText: String
-        if let activateOnDemandSetting = activateOnDemandSetting {
-            if (activateOnDemandSetting.isActivateOnDemandEnabled) {
-                switch (activateOnDemandSetting.activateOnDemandOption) {
-                case .none:
-                    detailText = "Off"
-                case .useOnDemandOverWiFiOrCellular:
-                    detailText = "Wi-Fi or cellular"
-                case .useOnDemandOverWiFiOnly:
-                    detailText = "Wi-Fi only"
-                case .useOnDemandOverCellularOnly:
-                    detailText = "Cellular only"
-                }
-            } else {
-                detailText = "Off"
-            }
-        } else {
-            detailText = "Off"
-        }
-        detailTextLabel?.text = detailText
+        detailTextLabel?.text = TunnelViewModel.activateOnDemandDetailText(for: activateOnDemandSetting)
     }
 
     override func prepareForReuse() {