diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-01-09 20:02:28 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-11 17:32:20 +0000 |
| commit | dd3819baee018d3a4400e212445238297186c42c (patch) | |
| tree | 50b0499158c87b61326db50917a77d3646f581bc | |
| parent | e57252e76c989c248a3f9b20907cda214155922f (diff) | |
| download | mullvadvpn-dd3819baee018d3a4400e212445238297186c42c.tar.xz mullvadvpn-dd3819baee018d3a4400e212445238297186c42c.zip | |
Derive `FromJava` for `RelaySettingsUpdate`
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt | 4 | ||||
| -rw-r--r-- | mullvad-jni/src/classes.rs | 1 | ||||
| -rw-r--r-- | mullvad-types/src/relay_constraints.rs | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt index 7a24688768..d5f08b3581 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt @@ -4,4 +4,8 @@ sealed class RelaySettingsUpdate { class CustomTunnelEndpoint() : RelaySettingsUpdate() class RelayConstraintsUpdate(var location: Constraint<LocationConstraint>?) : RelaySettingsUpdate() + + class Normal(var constraints: RelayConstraintsUpdate) : RelaySettingsUpdate() { + fun get0() = constraints + } } diff --git a/mullvad-jni/src/classes.rs b/mullvad-jni/src/classes.rs index 4effb6d3a3..7e463afbf6 100644 --- a/mullvad-jni/src/classes.rs +++ b/mullvad-jni/src/classes.rs @@ -27,6 +27,7 @@ pub const CLASSES: &[&str] = &[ "net/mullvad/mullvadvpn/model/RelaySettings$CustomTunnelEndpoint", "net/mullvad/mullvadvpn/model/RelaySettings$Normal", "net/mullvad/mullvadvpn/model/RelaySettingsUpdate$CustomTunnelEndpoint", + "net/mullvad/mullvadvpn/model/RelaySettingsUpdate$Normal", "net/mullvad/mullvadvpn/model/RelaySettingsUpdate$RelayConstraintsUpdate", "net/mullvad/mullvadvpn/model/RelayConstraintsUpdate", "net/mullvad/mullvadvpn/model/RelayTunnels", diff --git a/mullvad-types/src/relay_constraints.rs b/mullvad-types/src/relay_constraints.rs index 7f6e5a9cb4..14d3b01c4b 100644 --- a/mullvad-types/src/relay_constraints.rs +++ b/mullvad-types/src/relay_constraints.rs @@ -385,8 +385,11 @@ pub struct InternalBridgeConstraints { } #[derive(Debug, Deserialize, Serialize)] +#[cfg_attr(target_os = "android", derive(FromJava))] +#[cfg_attr(target_os = "android", jnix(package = "net.mullvad.mullvadvpn.model"))] #[serde(rename_all = "snake_case")] pub enum RelaySettingsUpdate { + #[cfg_attr(target_os = "android", jnix(deny))] CustomTunnelEndpoint(CustomTunnelEndpoint), Normal(RelayConstraintsUpdate), } |