diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-01-09 20:00:36 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-11 17:32:20 +0000 |
| commit | e57252e76c989c248a3f9b20907cda214155922f (patch) | |
| tree | 66b1547cda875ca6ea0d3330f7abc4fe5b680185 | |
| parent | d78724716722c7eb1ea321ccab483020e124134e (diff) | |
| download | mullvadvpn-e57252e76c989c248a3f9b20907cda214155922f.tar.xz mullvadvpn-e57252e76c989c248a3f9b20907cda214155922f.zip | |
Derive `FromJava` for `RelayConstraintsUpdate`
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.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/RelayConstraintsUpdate.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt new file mode 100644 index 0000000000..94aa58c56a --- /dev/null +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt @@ -0,0 +1,3 @@ +package net.mullvad.mullvadvpn.model + +data class RelayConstraintsUpdate(var location: Constraint<LocationConstraint>?) diff --git a/mullvad-jni/src/classes.rs b/mullvad-jni/src/classes.rs index 3cc61e86a9..4effb6d3a3 100644 --- a/mullvad-jni/src/classes.rs +++ b/mullvad-jni/src/classes.rs @@ -28,6 +28,7 @@ pub const CLASSES: &[&str] = &[ "net/mullvad/mullvadvpn/model/RelaySettings$Normal", "net/mullvad/mullvadvpn/model/RelaySettingsUpdate$CustomTunnelEndpoint", "net/mullvad/mullvadvpn/model/RelaySettingsUpdate$RelayConstraintsUpdate", + "net/mullvad/mullvadvpn/model/RelayConstraintsUpdate", "net/mullvad/mullvadvpn/model/RelayTunnels", "net/mullvad/mullvadvpn/model/Settings", "net/mullvad/mullvadvpn/model/TunnelState$Error", diff --git a/mullvad-types/src/relay_constraints.rs b/mullvad-types/src/relay_constraints.rs index 21691dc139..7f6e5a9cb4 100644 --- a/mullvad-types/src/relay_constraints.rs +++ b/mullvad-types/src/relay_constraints.rs @@ -417,10 +417,15 @@ impl RelaySettingsUpdate { } #[derive(Debug, Default, Deserialize, Serialize)] +#[cfg_attr(target_os = "android", derive(FromJava))] +#[cfg_attr(target_os = "android", jnix(package = "net.mullvad.mullvadvpn.model"))] #[serde(default)] pub struct RelayConstraintsUpdate { pub location: Option<Constraint<LocationConstraint>>, + #[cfg_attr(target_os = "android", jnix(default))] pub tunnel_protocol: Option<Constraint<TunnelProtocol>>, + #[cfg_attr(target_os = "android", jnix(default))] pub wireguard_constraints: Option<WireguardConstraints>, + #[cfg_attr(target_os = "android", jnix(default))] pub openvpn_constraints: Option<OpenVpnConstraints>, } |