summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBug Magnet <marco.nikic@mullvad.net>2023-08-11 08:26:53 +0200
committerBug Magnet <marco.nikic@mullvad.net>2023-08-11 14:26:46 +0200
commit0197095231b5356f1e656e63044f8033ef39d8f1 (patch)
tree0297265b9088c9f4693a98501a9bcd0e6016540c
parent86efb93c8e2463633f55644146f27a2c3fa3e009 (diff)
downloadmullvadvpn-0197095231b5356f1e656e63044f8033ef39d8f1.tar.xz
mullvadvpn-0197095231b5356f1e656e63044f8033ef39d8f1.zip
Silence swiftlint errors, for now
-rw-r--r--ios/MullvadVPN/Containers/Root/RootContainerViewController.swift1
-rw-r--r--ios/MullvadVPN/TunnelManager/TunnelManager.swift2
-rw-r--r--ios/MullvadVPN/View controllers/Preferences/PreferencesCellFactory.swift1
-rw-r--r--ios/MullvadVPN/View controllers/TermsOfService/TermsOfServiceContentView.swift8
4 files changed, 11 insertions, 1 deletions
diff --git a/ios/MullvadVPN/Containers/Root/RootContainerViewController.swift b/ios/MullvadVPN/Containers/Root/RootContainerViewController.swift
index b63206cdc1..5a6907a2cf 100644
--- a/ios/MullvadVPN/Containers/Root/RootContainerViewController.swift
+++ b/ios/MullvadVPN/Containers/Root/RootContainerViewController.swift
@@ -449,6 +449,7 @@ class RootContainerViewController: UIViewController {
showSettings(animated: true)
}
+ // swiftlint:disable:next function_body_length
private func setViewControllersInternal(
_ newViewControllers: [UIViewController],
isUnwinding: Bool,
diff --git a/ios/MullvadVPN/TunnelManager/TunnelManager.swift b/ios/MullvadVPN/TunnelManager/TunnelManager.swift
index e04039df2f..71f2f60b4b 100644
--- a/ios/MullvadVPN/TunnelManager/TunnelManager.swift
+++ b/ios/MullvadVPN/TunnelManager/TunnelManager.swift
@@ -1325,3 +1325,5 @@ private struct TunnelInteractorProxy: TunnelInteractor {
tunnelManager.handleRestError(error)
}
}
+
+// swiftlint:disable:this file_length
diff --git a/ios/MullvadVPN/View controllers/Preferences/PreferencesCellFactory.swift b/ios/MullvadVPN/View controllers/Preferences/PreferencesCellFactory.swift
index 6ccefff8ac..dd861072fb 100644
--- a/ios/MullvadVPN/View controllers/Preferences/PreferencesCellFactory.swift
+++ b/ios/MullvadVPN/View controllers/Preferences/PreferencesCellFactory.swift
@@ -36,6 +36,7 @@ final class PreferencesCellFactory: CellFactoryProtocol {
return cell
}
+ // swiftlint:disable:next cyclomatic_complexity function_body_length
func configureCell(_ cell: UITableViewCell, item: PreferencesDataSource.Item, indexPath: IndexPath) {
switch item {
case .blockAdvertising:
diff --git a/ios/MullvadVPN/View controllers/TermsOfService/TermsOfServiceContentView.swift b/ios/MullvadVPN/View controllers/TermsOfService/TermsOfServiceContentView.swift
index 1e5e737cfc..11423c91e0 100644
--- a/ios/MullvadVPN/View controllers/TermsOfService/TermsOfServiceContentView.swift
+++ b/ios/MullvadVPN/View controllers/TermsOfService/TermsOfServiceContentView.swift
@@ -36,7 +36,13 @@ class TermsOfServiceContentView: UIView {
bodyLabel.text = NSLocalizedString(
"PRIVACY_NOTICE_BODY",
tableName: "TermsOfService",
- value: "You have a right to privacy. That’s why we never store activity logs, don’t ask for personal information, and encourage anonymous payments.\n\nIn some situations, as outlined in our privacy policy, we might process personal data that you choose to send, for example if you email us.\n\nWe strongly believe in retaining as little data as possible because we want you to remain anonymous.",
+ value: """
+ You have a right to privacy. That’s why we never store activity logs, don’t ask for personal information, and encourage anonymous payments.
+
+ In some situations, as outlined in our privacy policy, we might process personal data that you choose to send, for example if you email us.
+
+ We strongly believe in retaining as little data as possible because we want you to remain anonymous.
+ """,
comment: ""
)
return bodyLabel