diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-22 00:51:48 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-22 15:16:55 +0000 |
| commit | f81f90aadef06f3bcfce4d3346f29c9ab05d506a (patch) | |
| tree | ce839e0356a1420ae329eb8291cf2c85b357f87a | |
| parent | 1c1f0d3b1a8deb74d6ec5dd65655b0cd236fc36b (diff) | |
| download | mullvadvpn-f81f90aadef06f3bcfce4d3346f29c9ab05d506a.tar.xz mullvadvpn-f81f90aadef06f3bcfce4d3346f29c9ab05d506a.zip | |
Derive `IntoJava` for `RelayConstraints`
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt | 3 | ||||
| -rw-r--r-- | mullvad-jni/src/classes.rs | 1 | ||||
| -rw-r--r-- | mullvad-types/src/relay_constraints.rs | 5 |
3 files changed, 9 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt new file mode 100644 index 0000000000..e4e6d6634e --- /dev/null +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt @@ -0,0 +1,3 @@ +package net.mullvad.mullvadvpn.model + +data class RelayConstraints(val location: Constraint<LocationConstraint>) diff --git a/mullvad-jni/src/classes.rs b/mullvad-jni/src/classes.rs index 752158c14c..30740dfa26 100644 --- a/mullvad-jni/src/classes.rs +++ b/mullvad-jni/src/classes.rs @@ -21,6 +21,7 @@ pub const CLASSES: &[&str] = &[ "net/mullvad/mullvadvpn/model/LocationConstraint$Hostname", "net/mullvad/mullvadvpn/model/PublicKey", "net/mullvad/mullvadvpn/model/Relay", + "net/mullvad/mullvadvpn/model/RelayConstraints", "net/mullvad/mullvadvpn/model/RelayList", "net/mullvad/mullvadvpn/model/RelayListCity", "net/mullvad/mullvadvpn/model/RelayListCountry", diff --git a/mullvad-types/src/relay_constraints.rs b/mullvad-types/src/relay_constraints.rs index 51834ad859..941b5f8a39 100644 --- a/mullvad-types/src/relay_constraints.rs +++ b/mullvad-types/src/relay_constraints.rs @@ -124,10 +124,15 @@ impl RelaySettings { #[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)] #[cfg_attr(not(target_os = "android"), derive(Default))] +#[cfg_attr(target_os = "android", derive(IntoJava))] +#[cfg_attr(target_os = "android", jnix(package = "net.mullvad.mullvadvpn.model"))] pub struct RelayConstraints { pub location: Constraint<LocationConstraint>, + #[cfg_attr(target_os = "android", jnix(skip))] pub tunnel_protocol: Constraint<TunnelProtocol>, + #[cfg_attr(target_os = "android", jnix(skip))] pub wireguard_constraints: WireguardConstraints, + #[cfg_attr(target_os = "android", jnix(skip))] pub openvpn_constraints: OpenVpnConstraints, } |