Move `ParameterGenerationError` to Talpid package

5 files changed, 10 insertions, 8 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
index 7fb3beda55..63f4401a7e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
@@ -16,9 +16,9 @@ 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.ParameterGenerationError
 import net.mullvad.mullvadvpn.model.TunnelState
 import net.mullvad.talpid.tunnel.ActionAfterDisconnect
+import net.mullvad.talpid.tunnel.ParameterGenerationError
 
 class NotificationBanner(
     val parentView: View,
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt
index 21cf01f0ef..bce1dd94f5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/BlockReason.kt
@@ -1,5 +1,7 @@
 package net.mullvad.mullvadvpn.model
 
+import net.mullvad.talpid.tunnel.ParameterGenerationError
+
 sealed class BlockReason {
     class AuthFailed(val reason: String?) : BlockReason()
     class Ipv6Unavailable : BlockReason()
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/ParameterGenerationError.kt b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt
index ffc159b952..92547a02b4 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/ParameterGenerationError.kt
+++ b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.model
+package net.mullvad.talpid.tunnel
 
 sealed class ParameterGenerationError {
     class NoMatchingRelay : ParameterGenerationError()
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs
index 6720b0f08e..e79d2f31e3 100644
--- a/mullvad-jni/src/into_java.rs
+++ b/mullvad-jni/src/into_java.rs
@@ -680,7 +680,7 @@ impl<'env> IntoJava<'env> for BlockReason {
                 return env
                     .new_object(
                         &class,
-                        "(Lnet/mullvad/mullvadvpn/model/ParameterGenerationError;)V",
+                        "(Lnet/mullvad/talpid/tunnel/ParameterGenerationError;)V",
                         &parameters,
                     )
                     .expect("Failed to create BlockReason.ParameterGeneration Java object");
@@ -709,7 +709,7 @@ impl<'env> IntoJava<'env> for ParameterGenerationError {
             }
         };
         let class_name = format!(
-            "net/mullvad/mullvadvpn/model/ParameterGenerationError${}",
+            "net/mullvad/talpid/tunnel/ParameterGenerationError${}",
             class_variant
         );
         let class = get_class(&class_name);
diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs
index 3cdd3c9c32..0ea6b41db1 100644
--- a/mullvad-jni/src/lib.rs
+++ b/mullvad-jni/src/lib.rs
@@ -60,10 +60,6 @@ const CLASSES_TO_LOAD: &[&str] = &[
     "net/mullvad/mullvadvpn/model/LocationConstraint$City",
     "net/mullvad/mullvadvpn/model/LocationConstraint$Country",
     "net/mullvad/mullvadvpn/model/LocationConstraint$Hostname",
-    "net/mullvad/mullvadvpn/model/ParameterGenerationError$NoMatchingRelay",
-    "net/mullvad/mullvadvpn/model/ParameterGenerationError$NoMatchingBridgeRelay",
-    "net/mullvad/mullvadvpn/model/ParameterGenerationError$NoWireguardKey",
-    "net/mullvad/mullvadvpn/model/ParameterGenerationError$CustomTunnelHostResultionError",
     "net/mullvad/mullvadvpn/model/PublicKey",
     "net/mullvad/mullvadvpn/model/Relay",
     "net/mullvad/mullvadvpn/model/RelayList",
@@ -88,6 +84,10 @@ 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/ParameterGenerationError$NoMatchingRelay",
+    "net/mullvad/talpid/tunnel/ParameterGenerationError$NoMatchingBridgeRelay",
+    "net/mullvad/talpid/tunnel/ParameterGenerationError$NoWireguardKey",
+    "net/mullvad/talpid/tunnel/ParameterGenerationError$CustomTunnelHostResultionError",
 ];
 
 lazy_static! {