Use `TunnelState` in `mullvad-jni`

3 files changed, 19 insertions, 11 deletions

diff --git a/mullvad-jni/src/daemon_interface.rs b/mullvad-jni/src/daemon_interface.rs
index a99c6e7cac..661550ca17 100644
--- a/mullvad-jni/src/daemon_interface.rs
+++ b/mullvad-jni/src/daemon_interface.rs
@@ -1,11 +1,16 @@
 use futures::{sync::oneshot, Future};
 use mullvad_daemon::{DaemonCommandSender, ManagementCommand};
 use mullvad_types::{
-    account::AccountData, location::GeoIpLocation, relay_constraints::RelaySettingsUpdate,
-    relay_list::RelayList, settings::Settings, states::TargetState, wireguard::KeygenEvent,
+    account::AccountData,
+    location::GeoIpLocation,
+    relay_constraints::RelaySettingsUpdate,
+    relay_list::RelayList,
+    settings::Settings,
+    states::{TargetState, TunnelState},
+    wireguard::KeygenEvent,
 };
 use parking_lot::Mutex;
-use talpid_types::{net::wireguard, tunnel::TunnelStateTransition};
+use talpid_types::net::wireguard;
 
 #[derive(Debug, err_derive::Error)]
 pub enum Error {
@@ -107,7 +112,7 @@ impl DaemonInterface {
         Ok(rx.wait().map_err(|_| Error::NoResponse)?)
     }
 
-    pub fn get_state(&self) -> Result<TunnelStateTransition> {
+    pub fn get_state(&self) -> Result<TunnelState> {
         let (tx, rx) = oneshot::channel();
 
         self.send_command(ManagementCommand::GetState(tx))?;
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs
index c5fd9667c0..b08c555ee0 100644
--- a/mullvad-jni/src/into_java.rs
+++ b/mullvad-jni/src/into_java.rs
@@ -12,11 +12,12 @@ use mullvad_types::{
     relay_constraints::{Constraint, LocationConstraint, RelayConstraints, RelaySettings},
     relay_list::{Relay, RelayList, RelayListCity, RelayListCountry},
     settings::Settings,
+    states::TunnelState,
     CustomTunnelEndpoint,
 };
 use std::{fmt::Debug, net::IpAddr};
 use talpid_core::tunnel::tun_provider::TunConfig;
-use talpid_types::{net::wireguard::PublicKey, tunnel::TunnelStateTransition};
+use talpid_types::net::wireguard::PublicKey;
 
 pub trait IntoJava<'env> {
     type JavaType;
@@ -460,7 +461,7 @@ impl<'env> IntoJava<'env> for Settings {
     }
 }
 
-impl<'env> IntoJava<'env> for TunnelStateTransition {
+impl<'env> IntoJava<'env> for TunnelState {
     type JavaType = JObject<'env>;
 
     fn into_java(self, env: &JNIEnv<'env>) -> Self::JavaType {
diff --git a/mullvad-jni/src/jni_event_listener.rs b/mullvad-jni/src/jni_event_listener.rs
index 37f19ad944..c072867ea5 100644
--- a/mullvad-jni/src/jni_event_listener.rs
+++ b/mullvad-jni/src/jni_event_listener.rs
@@ -5,9 +5,11 @@ use jni::{
     AttachGuard, JNIEnv,
 };
 use mullvad_daemon::EventListener;
-use mullvad_types::{relay_list::RelayList, settings::Settings, wireguard::KeygenEvent};
+use mullvad_types::{
+    relay_list::RelayList, settings::Settings, states::TunnelState, wireguard::KeygenEvent,
+};
 use std::{sync::mpsc, thread};
-use talpid_types::{tunnel::TunnelStateTransition, ErrorExt};
+use talpid_types::ErrorExt;
 
 #[derive(Debug, err_derive::Error)]
 pub enum Error {
@@ -24,7 +26,7 @@ pub enum Error {
 enum Event {
     RelayList(RelayList),
     Settings(Settings),
-    Tunnel(TunnelStateTransition),
+    Tunnel(TunnelState),
 }
 
 #[derive(Clone, Debug)]
@@ -37,7 +39,7 @@ impl JniEventListener {
 }
 
 impl EventListener for JniEventListener {
-    fn notify_new_state(&self, state: TunnelStateTransition) {
+    fn notify_new_state(&self, state: TunnelState) {
         let _ = self.0.send(Event::Tunnel(state));
     }
 
@@ -184,7 +186,7 @@ impl<'env> JniEventHandler<'env> {
         }
     }
 
-    fn handle_tunnel_event(&self, event: TunnelStateTransition) {
+    fn handle_tunnel_event(&self, event: TunnelState) {
         let java_tunnel_state_transition = self.env.auto_local(event.into_java(&self.env));
 
         let result = self.env.call_method_unchecked(