diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2022-02-02 13:46:49 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2022-02-02 13:46:49 +0100 |
| commit | ff5ade18bbb7cd0cc0700e564b7b04bd45901287 (patch) | |
| tree | a8650aa4cdeb7fd8a9cadecb9216461f9895163b | |
| parent | d8c3edaea739c58ddaf5f6fc01b3165d0d68aa9f (diff) | |
| parent | dda15ef59d993eddc46ae08cd6ccf5b5b34c976c (diff) | |
| download | mullvadvpn-ff5ade18bbb7cd0cc0700e564b7b04bd45901287.tar.xz mullvadvpn-ff5ade18bbb7cd0cc0700e564b7b04bd45901287.zip | |
Merge branch 'set-relay-in-airplane-mode'
| -rw-r--r-- | ios/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | ios/MullvadVPN.xcodeproj/project.pbxproj | 2 | ||||
| -rw-r--r-- | ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 | ||||
| -rw-r--r-- | ios/PacketTunnel/PacketTunnelProvider.swift | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/ios/CHANGELOG.md b/ios/CHANGELOG.md index 17b8769e7c..92faecd5af 100644 --- a/ios/CHANGELOG.md +++ b/ios/CHANGELOG.md @@ -28,6 +28,7 @@ Line wrap the file at 100 chars. Th ### Fixed - Fix crash occurring after completing in-app purchase. +- Fix error when changing relays while in airplane mode. ### Changed - Increase hit area of settings (cog) button. diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index 0cf24d4fb1..c4410329e7 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -2206,7 +2206,7 @@ repositoryURL = "https://git.zx2c4.com/wireguard-apple"; requirement = { kind = revision; - revision = c1f509d65bba1c00c6b6ef93826f658ff36a0761; + revision = 7dea71898d7d11495c7bb9a0b4f8215ae2efe53f; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5865002810..7e56489a3f 100644 --- a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,7 +15,7 @@ "repositoryURL": "https://git.zx2c4.com/wireguard-apple", "state": { "branch": null, - "revision": "c1f509d65bba1c00c6b6ef93826f658ff36a0761", + "revision": "7dea71898d7d11495c7bb9a0b4f8215ae2efe53f", "version": null } } diff --git a/ios/PacketTunnel/PacketTunnelProvider.swift b/ios/PacketTunnel/PacketTunnelProvider.swift index cff2438130..59250d9345 100644 --- a/ios/PacketTunnel/PacketTunnelProvider.swift +++ b/ios/PacketTunnel/PacketTunnelProvider.swift @@ -200,7 +200,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider { } .onFailure { error in self.tunnelConnectionInfo = oldTunnelConnectionInfo - self.providerLogger.error(chainedError: error, message: "Failed to update WireGuard configuration") + self.providerLogger.error(chainedError: error) } } } |