summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2024-02-21 13:35:35 +0100
committerDavid Lönnhager <david.l@mullvad.net>2024-02-21 13:35:35 +0100
commitafd04b6a4e6e28fb4583b724983121678a0104e9 (patch)
treed1f9e79090a5bdbd9a9997343617ed60eebe1c98
parent2adee191e165e1536c33da5a40710947c5386c8d (diff)
parent283a484ab51da27139a2b3bf11bdaf1d8445e039 (diff)
downloadmullvadvpn-afd04b6a4e6e28fb4583b724983121678a0104e9.tar.xz
mullvadvpn-afd04b6a4e6e28fb4583b724983121678a0104e9.zip
Merge branch 'fix-ios-api-ffi' into main
-rw-r--r--mullvad-api/src/ffi/mod.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/mullvad-api/src/ffi/mod.rs b/mullvad-api/src/ffi/mod.rs
index 62f2045c33..39b971cf3f 100644
--- a/mullvad-api/src/ffi/mod.rs
+++ b/mullvad-api/src/ffi/mod.rs
@@ -196,8 +196,10 @@ impl FfiClient {
}
fn rest_handle(&self) -> MullvadRestHandle {
- self.api_runtime
- .static_mullvad_rest_handle(self.api_hostname.clone())
+ self.tokio_handle().block_on(async {
+ self.api_runtime
+ .static_mullvad_rest_handle(self.api_hostname.clone())
+ })
}
fn device_proxy(&self) -> DevicesProxy {