Move `BlockReason` to Talpid package

5 files changed, 15 insertions, 17 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
index 63f4401a7e..352fe4dd71 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
@@ -13,11 +13,11 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache
 import net.mullvad.mullvadvpn.dataproxy.WwwAuthTokenRetriever
-import net.mullvad.mullvadvpn.model.BlockReason
 import net.mullvad.mullvadvpn.model.KeygenEvent
 import net.mullvad.mullvadvpn.model.KeygenFailure
 import net.mullvad.mullvadvpn.model.TunnelState
 import net.mullvad.talpid.tunnel.ActionAfterDisconnect
+import net.mullvad.talpid.tunnel.BlockReason
 import net.mullvad.talpid.tunnel.ParameterGenerationError
 
 class NotificationBanner(
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt
index 0c65f4754a..c91497ce03 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt
@@ -1,6 +1,7 @@
 package net.mullvad.mullvadvpn.model
 
 import net.mullvad.talpid.tunnel.ActionAfterDisconnect
+import net.mullvad.talpid.tunnel.BlockReason
 
 sealed class TunnelState() {
     class Disconnected() : TunnelState()
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt b/android/src/main/kotlin/net/mullvad/talpid/tunnel/BlockReason.kt
index bce1dd94f5..758e81dfba 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt
+++ b/android/src/main/kotlin/net/mullvad/talpid/tunnel/BlockReason.kt
@@ -1,6 +1,4 @@
-package net.mullvad.mullvadvpn.model
-
-import net.mullvad.talpid.tunnel.ParameterGenerationError
+package net.mullvad.talpid.tunnel
 
 sealed class BlockReason {
     class AuthFailed(val reason: String?) : BlockReason()
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs
index e79d2f31e3..cc6c12b585 100644
--- a/mullvad-jni/src/into_java.rs
+++ b/mullvad-jni/src/into_java.rs
@@ -660,7 +660,7 @@ impl<'env> IntoJava<'env> for BlockReason {
     fn into_java(self, env: &JNIEnv<'env>) -> Self::JavaType {
         let variant = match self {
             BlockReason::AuthFailed(reason) => {
-                let class = get_class("net/mullvad/mullvadvpn/model/BlockReason$AuthFailed");
+                let class = get_class("net/mullvad/talpid/tunnel/BlockReason$AuthFailed");
                 let reason = env.auto_local(JObject::from(reason.into_java(env)));
                 let parameters = [JValue::Object(reason.as_obj())];
 
@@ -673,8 +673,7 @@ impl<'env> IntoJava<'env> for BlockReason {
             BlockReason::SetDnsError => "SetDnsError",
             BlockReason::StartTunnelError => "StartTunnelError",
             BlockReason::TunnelParameterError(reason) => {
-                let class =
-                    get_class("net/mullvad/mullvadvpn/model/BlockReason$ParameterGeneration");
+                let class = get_class("net/mullvad/talpid/tunnel/BlockReason$ParameterGeneration");
                 let reason = env.auto_local(JObject::from(reason.into_java(env)));
                 let parameters = [JValue::Object(reason.as_obj())];
                 return env
@@ -688,7 +687,7 @@ impl<'env> IntoJava<'env> for BlockReason {
             BlockReason::IsOffline => "IsOffline",
             BlockReason::TapAdapterProblem => "TapAdapterProblem",
         };
-        let class_name = format!("net/mullvad/mullvadvpn/model/BlockReason${}", variant);
+        let class_name = format!("net/mullvad/talpid/tunnel/BlockReason${}", variant);
         let class = get_class(&class_name);
 
         env.new_object(&class, "()V", &[])
@@ -766,7 +765,7 @@ impl<'env> IntoJava<'env> for TunnelState {
                 let class = get_class("net/mullvad/mullvadvpn/model/TunnelState$Blocked");
                 let reason = env.auto_local(block_reason.into_java(env));
                 let parameters = [JValue::Object(reason.as_obj())];
-                let signature = "(Lnet/mullvad/mullvadvpn/model/BlockReason;)V";
+                let signature = "(Lnet/mullvad/talpid/tunnel/BlockReason;)V";
 
                 env.new_object(&class, signature, &parameters)
             }
diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs
index 0ea6b41db1..5d82cc1876 100644
--- a/mullvad-jni/src/lib.rs
+++ b/mullvad-jni/src/lib.rs
@@ -35,14 +35,6 @@ const CLASSES_TO_LOAD: &[&str] = &[
     "java/net/InetSocketAddress",
     "java/util/ArrayList",
     "net/mullvad/mullvadvpn/model/AccountData",
-    "net/mullvad/mullvadvpn/model/BlockReason$AuthFailed",
-    "net/mullvad/mullvadvpn/model/BlockReason$Ipv6Unavailable",
-    "net/mullvad/mullvadvpn/model/BlockReason$SetFirewallPolicyError",
-    "net/mullvad/mullvadvpn/model/BlockReason$SetDnsError",
-    "net/mullvad/mullvadvpn/model/BlockReason$StartTunnelError",
-    "net/mullvad/mullvadvpn/model/BlockReason$ParameterGeneration",
-    "net/mullvad/mullvadvpn/model/BlockReason$IsOffline",
-    "net/mullvad/mullvadvpn/model/BlockReason$TapAdapterProblem",
     "net/mullvad/mullvadvpn/model/AppVersionInfo",
     "net/mullvad/mullvadvpn/model/Constraint$Any",
     "net/mullvad/mullvadvpn/model/Constraint$Only",
@@ -84,6 +76,14 @@ const CLASSES_TO_LOAD: &[&str] = &[
     "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Block",
     "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Nothing",
     "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Reconnect",
+    "net/mullvad/talpid/tunnel/BlockReason$AuthFailed",
+    "net/mullvad/talpid/tunnel/BlockReason$Ipv6Unavailable",
+    "net/mullvad/talpid/tunnel/BlockReason$SetFirewallPolicyError",
+    "net/mullvad/talpid/tunnel/BlockReason$SetDnsError",
+    "net/mullvad/talpid/tunnel/BlockReason$StartTunnelError",
+    "net/mullvad/talpid/tunnel/BlockReason$ParameterGeneration",
+    "net/mullvad/talpid/tunnel/BlockReason$IsOffline",
+    "net/mullvad/talpid/tunnel/BlockReason$TapAdapterProblem",
     "net/mullvad/talpid/tunnel/ParameterGenerationError$NoMatchingRelay",
     "net/mullvad/talpid/tunnel/ParameterGenerationError$NoMatchingBridgeRelay",
     "net/mullvad/talpid/tunnel/ParameterGenerationError$NoWireguardKey",