diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-22 00:58:16 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-22 15:16:55 +0000 |
| commit | e969b797a28d07c8e1f1f2ae84baa40cea6f9c7e (patch) | |
| tree | 4e3c0f37caaa998e989a5a0c937d97080e25e69d | |
| parent | f81f90aadef06f3bcfce4d3346f29c9ab05d506a (diff) | |
| download | mullvadvpn-e969b797a28d07c8e1f1f2ae84baa40cea6f9c7e.tar.xz mullvadvpn-e969b797a28d07c8e1f1f2ae84baa40cea6f9c7e.zip | |
Derive `IntoJava` for `CustomTunnelEndpoint`
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt | 3 | ||||
| -rw-r--r-- | mullvad-types/src/custom_tunnel.rs | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt new file mode 100644 index 0000000000..05dd38a80b --- /dev/null +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt @@ -0,0 +1,3 @@ +package net.mullvad.mullvadvpn.model + +class CustomTunnelEndpoint() diff --git a/mullvad-types/src/custom_tunnel.rs b/mullvad-types/src/custom_tunnel.rs index ea84e28979..12c293c22d 100644 --- a/mullvad-types/src/custom_tunnel.rs +++ b/mullvad-types/src/custom_tunnel.rs @@ -1,4 +1,6 @@ use crate::settings::TunnelOptions; +#[cfg(target_os = "android")] +use jnix::IntoJava; use serde::{Deserialize, Serialize}; use std::{ fmt, io, @@ -18,6 +20,10 @@ pub enum Error { #[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)] +// TODO: Remove this Java conversion once `jnix` supports skipping fields in enum tuple variants. +#[cfg_attr(target_os = "android", derive(IntoJava))] +#[cfg_attr(target_os = "android", jnix(package = "net.mullvad.mullvadvpn.model"))] +#[cfg_attr(target_os = "android", jnix(skip_all))] pub struct CustomTunnelEndpoint { host: String, config: ConnectionConfig, |