summaryrefslogtreecommitdiffhomepage
path: root/talpid-core
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-21 18:06:06 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-12-16 12:36:00 +0000
commit5de62ca337490bdff08c7d53d46a795b482cc787 (patch)
treea1292eba840d5ecae4f80406cba3e838b9af78f9 /talpid-core
parent4a801a0a8cb101c0bafd7427f2350184b0c1a230 (diff)
downloadmullvadvpn-5de62ca337490bdff08c7d53d46a795b482cc787.tar.xz
mullvadvpn-5de62ca337490bdff08c7d53d46a795b482cc787.zip
Use `CreateTunResult` instead of int error codes
Diffstat (limited to 'talpid-core')
-rw-r--r--talpid-core/src/tunnel/tun_provider/android/mod.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/talpid-core/src/tunnel/tun_provider/android/mod.rs b/talpid-core/src/tunnel/tun_provider/android/mod.rs
index 8bb7d4c93f..762f5e4382 100644
--- a/talpid-core/src/tunnel/tun_provider/android/mod.rs
+++ b/talpid-core/src/tunnel/tun_provider/android/mod.rs
@@ -193,15 +193,13 @@ impl AndroidTunProvider {
let result = self.call_method(
"getTun",
- "(Lnet/mullvad/talpid/tun_provider/TunConfig;)I",
- JavaType::Primitive(Primitive::Int),
+ "(Lnet/mullvad/talpid/tun_provider/TunConfig;)Lnet/mullvad/talpid/CreateTunResult;",
+ JavaType::Object("net/mullvad/talpid/CreateTunResult".to_owned()),
&[JValue::Object(java_config.as_obj())],
)?;
match result {
- JValue::Int(0) => Err(Error::TunnelDeviceError),
- JValue::Int(-1) => Err(Error::PermissionDenied),
- JValue::Int(fd) => Ok(fd),
+ JValue::Object(result) => CreateTunResult::from_java(&env, result).into(),
value => Err(Error::InvalidMethodResult("getTun", format!("{:?}", value))),
}
}