summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBug Magnet <marco.nikic@mullvad.net>2024-08-16 17:08:53 +0200
committerBug Magnet <marco.nikic@mullvad.net>2024-08-19 14:48:54 +0200
commit2b37ca7b23ce2b557003997758a1be0735f43545 (patch)
tree8e5a57651ae079cd1e121c4fdbd07dbb47547d43
parenta4ad185257a560ad841ef0a0f4b398828128ddef (diff)
downloadmullvadvpn-2b37ca7b23ce2b557003997758a1be0735f43545.tar.xz
mullvadvpn-2b37ca7b23ce2b557003997758a1be0735f43545.zip
Fix swift 6 related warnings
-rw-r--r--ios/MullvadVPN/Extensions/CodingErrors+CustomErrorDescription.swift4
-rw-r--r--ios/MullvadVPN/Extensions/NEVPNStatus+Debug.swift2
-rw-r--r--ios/MullvadVPN/Extensions/RESTError+Display.swift2
-rw-r--r--ios/MullvadVPN/Extensions/SKError+Localized.swift2
-rw-r--r--ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift8
-rw-r--r--ios/PacketTunnelCore/Actor/PacketTunnelActor.swift2
6 files changed, 12 insertions, 8 deletions
diff --git a/ios/MullvadVPN/Extensions/CodingErrors+CustomErrorDescription.swift b/ios/MullvadVPN/Extensions/CodingErrors+CustomErrorDescription.swift
index 56bd591bf4..6643aeac68 100644
--- a/ios/MullvadVPN/Extensions/CodingErrors+CustomErrorDescription.swift
+++ b/ios/MullvadVPN/Extensions/CodingErrors+CustomErrorDescription.swift
@@ -9,7 +9,7 @@
import Foundation
import MullvadTypes
-extension DecodingError: CustomErrorDescriptionProtocol {
+extension DecodingError: MullvadTypes.CustomErrorDescriptionProtocol {
public var customErrorDescription: String? {
switch self {
case let .typeMismatch(type, context):
@@ -30,7 +30,7 @@ extension DecodingError: CustomErrorDescriptionProtocol {
}
}
-extension EncodingError: CustomErrorDescriptionProtocol {
+extension EncodingError: MullvadTypes.CustomErrorDescriptionProtocol {
public var customErrorDescription: String? {
switch self {
case let .invalidValue(_, context):
diff --git a/ios/MullvadVPN/Extensions/NEVPNStatus+Debug.swift b/ios/MullvadVPN/Extensions/NEVPNStatus+Debug.swift
index 49320084d4..e4536dc2e8 100644
--- a/ios/MullvadVPN/Extensions/NEVPNStatus+Debug.swift
+++ b/ios/MullvadVPN/Extensions/NEVPNStatus+Debug.swift
@@ -8,7 +8,7 @@
import NetworkExtension
-extension NEVPNStatus: CustomStringConvertible {
+extension NEVPNStatus: Swift.CustomStringConvertible {
public var description: String {
switch self {
case .connected:
diff --git a/ios/MullvadVPN/Extensions/RESTError+Display.swift b/ios/MullvadVPN/Extensions/RESTError+Display.swift
index a4e5f9b7fc..c917ebbd82 100644
--- a/ios/MullvadVPN/Extensions/RESTError+Display.swift
+++ b/ios/MullvadVPN/Extensions/RESTError+Display.swift
@@ -10,7 +10,7 @@ import Foundation
import MullvadREST
import MullvadTypes
-extension REST.Error: DisplayError {
+extension REST.Error: MullvadTypes.DisplayError {
public var displayErrorDescription: String? {
switch self {
case let .network(urlError):
diff --git a/ios/MullvadVPN/Extensions/SKError+Localized.swift b/ios/MullvadVPN/Extensions/SKError+Localized.swift
index 024e258d27..288cc3aabd 100644
--- a/ios/MullvadVPN/Extensions/SKError+Localized.swift
+++ b/ios/MullvadVPN/Extensions/SKError+Localized.swift
@@ -8,7 +8,7 @@
import StoreKit
-extension SKError: LocalizedError {
+extension SKError: Foundation.LocalizedError {
public var errorDescription: String? {
switch code {
case .unknown:
diff --git a/ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift b/ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift
index c6339ce11e..0f83178747 100644
--- a/ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift
+++ b/ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift
@@ -15,7 +15,9 @@ extension PacketTunnelActor {
`NEPacketTunnelProvider` provides the corresponding lifecycle method.
*/
public nonisolated func onWake() {
- tunnelMonitor.onWake()
+ Task {
+ await tunnelMonitor.onWake()
+ }
}
/**
@@ -24,6 +26,8 @@ extension PacketTunnelActor {
`NEPacketTunnelProvider` provides the corresponding lifecycle method.
*/
public nonisolated func onSleep() {
- tunnelMonitor.onSleep()
+ Task {
+ await tunnelMonitor.onSleep()
+ }
}
}
diff --git a/ios/PacketTunnelCore/Actor/PacketTunnelActor.swift b/ios/PacketTunnelCore/Actor/PacketTunnelActor.swift
index 10cd928cf8..77989f97df 100644
--- a/ios/PacketTunnelCore/Actor/PacketTunnelActor.swift
+++ b/ios/PacketTunnelCore/Actor/PacketTunnelActor.swift
@@ -87,7 +87,7 @@ public actor PacketTunnelActor {
for await event in channel {
guard let self else { return }
- self.logger.debug("Received event: \(event.logFormat())")
+ await self.logger.debug("Received event: \(event.logFormat())")
let effects = await self.runReducer(event)