diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2024-02-15 11:10:52 +0100 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2024-02-15 11:10:52 +0100 |
| commit | b385ebb73f2399d0e0979aec3549b90c9e5b03df (patch) | |
| tree | 0334ec90ca4e15a386904b8f9845292cae772379 | |
| parent | 02240d69574e0d373c71d109e7ce4f006b916d2e (diff) | |
| download | mullvadvpn-b385ebb73f2399d0e0979aec3549b90c9e5b03df.tar.xz mullvadvpn-b385ebb73f2399d0e0979aec3549b90c9e5b03df.zip | |
Fix the mullvad API ffi, consume the header after building it
| -rw-r--r-- | ios/MullvadVPN.xcodeproj/project.pbxproj | 7 | ||||
| -rw-r--r-- | ios/MullvadVPNUITests/MullvadApi.swift | 4 | ||||
| -rw-r--r-- | mullvad-api/src/ffi/mod.rs | 6 |
3 files changed, 5 insertions, 12 deletions
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index 0a669b3f87..efda36cf79 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -586,7 +586,6 @@ 850201DB2B503D7700EF8C96 /* RelayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850201DA2B503D7700EF8C96 /* RelayTests.swift */; }; 850201DD2B503D8C00EF8C96 /* SelectLocationPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850201DC2B503D8C00EF8C96 /* SelectLocationPage.swift */; }; 850201DF2B5040A500EF8C96 /* TunnelControlPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850201DE2B5040A500EF8C96 /* TunnelControlPage.swift */; }; - 850201E32B51A93C00EF8C96 /* SettingsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850201E22B51A93C00EF8C96 /* SettingsPage.swift */; }; 852969282B4D9C1F007EAD4C /* AccountTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852969272B4D9C1F007EAD4C /* AccountTests.swift */; }; 852969332B4E9232007EAD4C /* Page.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852969322B4E9232007EAD4C /* Page.swift */; }; 852969352B4E9270007EAD4C /* LoginPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852969342B4E9270007EAD4C /* LoginPage.swift */; }; @@ -659,6 +658,7 @@ A99E5EE02B7628150033F241 /* ProblemReportViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A99E5EDF2B7628150033F241 /* ProblemReportViewModel.swift */; }; A99E5EE22B762ED30033F241 /* ProblemReportViewController+ViewManagement.swift in Sources */ = {isa = PBXBuildFile; fileRef = A99E5EE12B762ED30033F241 /* ProblemReportViewController+ViewManagement.swift */; }; A9A1DE792AD5708E0073F689 /* TransportStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9A1DE782AD5708E0073F689 /* TransportStrategy.swift */; }; + A9A557F32B7E19B10017ADA8 /* SettingsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850201E22B51A93C00EF8C96 /* SettingsPage.swift */; }; A9A5F9E12ACB05160083449F /* AddressCacheTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06AC114028F841390037AF9A /* AddressCacheTracker.swift */; }; A9A5F9E22ACB05160083449F /* BackgroundTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58C76A0A2A338E4300100D75 /* BackgroundTask.swift */; }; A9A5F9E32ACB05160083449F /* AccountDataThrottling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587988C628A2A01F00E3DF54 /* AccountDataThrottling.swift */; }; @@ -4142,8 +4142,8 @@ isa = PBXNativeTarget; buildConfigurationList = 8529692F2B4D9C1F007EAD4C /* Build configuration list for PBXNativeTarget "MullvadVPNUITests" */; buildPhases = ( - 01EF6F2C2B6A517900125696 /* Headers */, 01EF6F2B2B6A512C00125696 /* ShellScript */, + 01EF6F2C2B6A517900125696 /* Headers */, 852969212B4D9C1F007EAD4C /* Sources */, 852969222B4D9C1F007EAD4C /* Frameworks */, 852969232B4D9C1F007EAD4C /* Resources */, @@ -5390,9 +5390,7 @@ 8590896F2B61763B003AF5F5 /* LoggedOutUITestCase.swift in Sources */, 85557B202B5FBBD700795FE1 /* AccountPage.swift in Sources */, 852969352B4E9270007EAD4C /* LoginPage.swift in Sources */, - 850201E32B51A93C00EF8C96 /* SettingsPage.swift in Sources */, 85557B102B59215F00795FE1 /* FirewallRule.swift in Sources */, - 850201E32B51A93C00EF8C96 /* SettingsPage.swift in Sources */, 85557B0E2B591B2600795FE1 /* FirewallAPIClient.swift in Sources */, 852969282B4D9C1F007EAD4C /* AccountTests.swift in Sources */, 01EF6F2A2B6A473900125696 /* MullvadApi.swift in Sources */, @@ -5403,6 +5401,7 @@ 85557B1E2B5FB8C700795FE1 /* HeaderBar.swift in Sources */, 85557B122B594FC900795FE1 /* ConnectivityTests.swift in Sources */, 852969332B4E9232007EAD4C /* Page.swift in Sources */, + A9A557F32B7E19B10017ADA8 /* SettingsPage.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/MullvadVPNUITests/MullvadApi.swift b/ios/MullvadVPNUITests/MullvadApi.swift index 28841340f7..6fc8446d3e 100644 --- a/ios/MullvadVPNUITests/MullvadApi.swift +++ b/ios/MullvadVPNUITests/MullvadApi.swift @@ -78,10 +78,6 @@ class MullvadApi { } func createAccount() throws -> String { - guard let data = NSMutableData(length: 128) else { - throw InitMutableBufferError() - } - var newAccountPtr: UnsafePointer<CChar>? let result = mullvad_api_create_account( clientContext, diff --git a/mullvad-api/src/ffi/mod.rs b/mullvad-api/src/ffi/mod.rs index ba839f36a5..62f2045c33 100644 --- a/mullvad-api/src/ffi/mod.rs +++ b/mullvad-api/src/ffi/mod.rs @@ -196,10 +196,8 @@ impl FfiClient { } fn rest_handle(&self) -> MullvadRestHandle { - self.tokio_runtime.block_on( - self.api_runtime - .static_mullvad_rest_handle(self.api_hostname.clone()), - ) + self.api_runtime + .static_mullvad_rest_handle(self.api_hostname.clone()) } fn device_proxy(&self) -> DevicesProxy { |