summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2023-03-28 16:07:28 +0200
committerAndrej Mihajlov <and@mullvad.net>2023-03-28 16:07:28 +0200
commit6b7f52e35f2bf41ac235b2506ed7bfee26cb8eea (patch)
tree785754ad4f28fe95838df0b395171b9fde47d4c6
parentcb3f0080298f636ddfbcc98b3e4d4bb2ec0dc9ba (diff)
parent92bdc4aebd57f1840a4eaa66e94b194f4cab63b0 (diff)
downloadmullvadvpn-6b7f52e35f2bf41ac235b2506ed7bfee26cb8eea.tar.xz
mullvadvpn-6b7f52e35f2bf41ac235b2506ed7bfee26cb8eea.zip
Merge branch 'change-max-width-120-ios-59'
-rw-r--r--ios/.swiftformat2
-rw-r--r--ios/MullvadVPN/Notifications/Notification Providers/AccountExpiryInAppNotificationProvider.swift3
-rw-r--r--ios/MullvadVPN/StorePaymentManager/SendStoreReceiptOperation.swift3
3 files changed, 3 insertions, 5 deletions
diff --git a/ios/.swiftformat b/ios/.swiftformat
index 4a2eebe95e..2d23b54781 100644
--- a/ios/.swiftformat
+++ b/ios/.swiftformat
@@ -6,7 +6,7 @@
# format options
--indent 4
---maxwidth 100
+--maxwidth 120
--wraparguments before-first
--wrapcollections before-first
--wrapternary before-operators
diff --git a/ios/MullvadVPN/Notifications/Notification Providers/AccountExpiryInAppNotificationProvider.swift b/ios/MullvadVPN/Notifications/Notification Providers/AccountExpiryInAppNotificationProvider.swift
index 5d9e978e60..ec5ef9e0ae 100644
--- a/ios/MullvadVPN/Notifications/Notification Providers/AccountExpiryInAppNotificationProvider.swift
+++ b/ios/MullvadVPN/Notifications/Notification Providers/AccountExpiryInAppNotificationProvider.swift
@@ -11,8 +11,7 @@ import Foundation
private let triggerInterval = 3
private let refreshInterval = 60
-final class AccountExpiryInAppNotificationProvider: NotificationProvider, InAppNotificationProvider
-{
+final class AccountExpiryInAppNotificationProvider: NotificationProvider, InAppNotificationProvider {
private var accountExpiry: Date?
private var tunnelObserver: TunnelBlockObserver?
private var timer: DispatchSourceTimer?
diff --git a/ios/MullvadVPN/StorePaymentManager/SendStoreReceiptOperation.swift b/ios/MullvadVPN/StorePaymentManager/SendStoreReceiptOperation.swift
index 4afb212585..e78c9993a8 100644
--- a/ios/MullvadVPN/StorePaymentManager/SendStoreReceiptOperation.swift
+++ b/ios/MullvadVPN/StorePaymentManager/SendStoreReceiptOperation.swift
@@ -13,8 +13,7 @@ import MullvadTypes
import Operations
import StoreKit
-class SendStoreReceiptOperation: ResultOperation<REST.CreateApplePaymentResponse>, SKRequestDelegate
-{
+class SendStoreReceiptOperation: ResultOperation<REST.CreateApplePaymentResponse>, SKRequestDelegate {
private let apiProxy: REST.APIProxy
private let accountNumber: String