summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-02-05 13:17:11 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-02-11 17:32:20 +0000
commitf46427b2d14c83deca15a1e329fc346e6c04f974 (patch)
tree53102c0a862445acde4e3e01ec78bd41fb431913
parente3d2e21344e848aa90c75970400de6b325281a5e (diff)
downloadmullvadvpn-f46427b2d14c83deca15a1e329fc346e6c04f974.tar.xz
mullvadvpn-f46427b2d14c83deca15a1e329fc346e6c04f974.zip
Remove obsoleted `from_java` module
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt2
-rw-r--r--mullvad-jni/src/classes.rs1
-rw-r--r--mullvad-jni/src/lib.rs1
3 files changed, 0 insertions, 4 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 d5f08b3581..51a6e48cca 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
@@ -2,8 +2,6 @@ package net.mullvad.mullvadvpn.model
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 7e463afbf6..c060a2e584 100644
--- a/mullvad-jni/src/classes.rs
+++ b/mullvad-jni/src/classes.rs
@@ -28,7 +28,6 @@ pub const CLASSES: &[&str] = &[
"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",
"net/mullvad/mullvadvpn/model/Settings",
diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs
index ca7dc00399..5f4cae6e1c 100644
--- a/mullvad-jni/src/lib.rs
+++ b/mullvad-jni/src/lib.rs
@@ -3,7 +3,6 @@
mod classes;
mod daemon_interface;
-mod from_java;
mod is_null;
mod jni_event_listener;