summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBug Magnet <marco.nikic@mullvad.net>2024-11-28 14:36:24 +0100
committerBug Magnet <marco.nikic@mullvad.net>2024-12-02 14:59:39 +0100
commit7614082f580710936408fe9425b00ecf5e92cc47 (patch)
tree3acc38ef1b6574ca2027fdb9c7ba195300aee01e
parentfb88bcfe801426f6ae834de880d4db9cacdeceb6 (diff)
downloadmullvadvpn-7614082f580710936408fe9425b00ecf5e92cc47.tar.xz
mullvadvpn-7614082f580710936408fe9425b00ecf5e92cc47.zip
Enable Shadowsocks obfuscation in Release
-rw-r--r--ios/MullvadVPN/View controllers/Settings/SelectableSettingsDetailsCell.swift2
-rw-r--r--ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsCellFactory.swift4
-rw-r--r--ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift5
3 files changed, 1 insertions, 10 deletions
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
}