Merge branch 'make-shadowsocks-obfuscation-ready-for-production-ios-879'

4 files changed, 4 insertions, 10 deletions

diff --git a/ios/CHANGELOG.md b/ios/CHANGELOG.md
index 4cf9df3c25..298c24dd7b 100644
--- a/ios/CHANGELOG.md
+++ b/ios/CHANGELOG.md
@@ -22,6 +22,9 @@ Line wrap the file at 100 chars.                                              Th
 * **Security**: in case of vulnerabilities.
 
 ## Unreleased
+### Added
+- Add WireGuard over Shadowsocks obfuscation. It can be enabled in "VPN settings". This will
+  also be used automatically when connecting fails with other methods.
 
 ## [2024.10 - 2024-11-20]
 ### Fixed
diff --git a/ios/MullvadVPN/View controllers/Settings/SelectableSettingsDetailsCell.swift b/ios/MullvadVPN/View controllers/Settings/SelectableSettingsDetailsCell.swift
index 33708d1b86..8f68c7d5ad 100644
--- a/ios/MullvadVPN/View controllers/Settings/SelectableSettingsDetailsCell.swift
+++ b/ios/MullvadVPN/View controllers/Settings/SelectableSettingsDetailsCell.swift
@@ -56,13 +56,11 @@ class SelectableSettingsDetailsCell: SelectableSettingsCell {
     }
 
     private func setViewContainer() {
-        #if DEBUG
         setTrailingView { superview in
             superview.addConstrainedSubviews([viewContainer]) {
                 viewContainer.pinEdgesToSuperview()
             }
         }
-        #endif
     }
 
     // MARK: - Actions
diff --git a/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsCellFactory.swift b/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsCellFactory.swift
index 526fb1c16c..5bef5509f0 100644
--- a/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsCellFactory.swift
+++ b/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsCellFactory.swift
@@ -146,14 +146,12 @@ final class VPNSettingsCellFactory: CellFactoryProtocol {
                 comment: ""
             )
 
-            #if DEBUG
             cell.detailTitleLabel.text = String(format: NSLocalizedString(
                 "WIREGUARD_OBFUSCATION_UDP_TCP_PORT",
                 tableName: "VPNSettings",
                 value: "Port: %@",
                 comment: ""
             ), viewModel.obfuscationUpdOverTcpPort.description)
-            #endif
 
             cell.accessibilityIdentifier = item.accessibilityIdentifier
             cell.applySubCellStyling()
@@ -172,14 +170,12 @@ final class VPNSettingsCellFactory: CellFactoryProtocol {
                 comment: ""
             )
 
-            #if DEBUG
             cell.detailTitleLabel.text = String(format: NSLocalizedString(
                 "WIREGUARD_OBFUSCATION_SHADOWSOCKS_PORT",
                 tableName: "VPNSettings",
                 value: "Port: %@",
                 comment: ""
             ), viewModel.obfuscationShadowsocksPort.description)
-            #endif
 
             cell.accessibilityIdentifier = item.accessibilityIdentifier
             cell.applySubCellStyling()
diff --git a/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift b/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift
index 6e33890235..0855d204b4 100644
--- a/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift
+++ b/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift
@@ -94,14 +94,11 @@ final class VPNSettingsDataSource: UITableViewDiffableDataSource<
         static var wireGuardObfuscation: [Item] {
             var items: [Item] = [
                 .wireGuardObfuscationAutomatic,
+                .wireGuardObfuscationShadowsocks,
                 .wireGuardObfuscationUdpOverTcp,
                 .wireGuardObfuscationOff,
             ]
 
-            #if DEBUG
-            items.insert(.wireGuardObfuscationShadowsocks, at: 1)
-            #endif
-
             return items
         }