Merge branch 'remove-unused-android'

2 files changed, 0 insertions, 31 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/app/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index 0dd94749c5..7a9160c684 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
@@ -64,16 +64,6 @@ open class TalpidVpnService : VpnService() {
         }
     }
 
-    fun createTunIfClosed(): Boolean {
-        synchronized(this) {
-            if (!tunIsOpen) {
-                activeTunStatus = createTun(currentTunConfig)
-            }
-
-            return tunIsOpen
-        }
-    }
-
     fun recreateTunIfOpen(config: TunConfig) {
         synchronized(this) {
             if (tunIsOpen) {
diff --git a/talpid-core/src/tunnel/tun_provider/android/mod.rs b/talpid-core/src/tunnel/tun_provider/android/mod.rs
index 12dfda6895..b7ab5665d2 100644
--- a/talpid-core/src/tunnel/tun_provider/android/mod.rs
+++ b/talpid-core/src/tunnel/tun_provider/android/mod.rs
@@ -7,7 +7,6 @@ use jnix::{
     jni::{
         objects::{GlobalRef, JValue},
         signature::{JavaType, Primitive},
-        sys::JNI_FALSE,
         JavaVM,
     },
     FromJava, IntoJava, JnixEnv,
@@ -161,26 +160,6 @@ impl AndroidTunProvider {
         }
     }
 
-    /// Open a tunnel device using the previous or the default configuration if there is no
-    /// currently active tunnel.
-    pub fn create_tun_if_closed(&mut self) -> Result<(), Error> {
-        let result = self.call_method(
-            "createTunIfClosed",
-            "()Z",
-            JavaType::Primitive(Primitive::Boolean),
-            &[],
-        )?;
-
-        match result {
-            JValue::Bool(JNI_FALSE) => Err(Error::TunnelDeviceError),
-            JValue::Bool(_) => Ok(()),
-            value => Err(Error::InvalidMethodResult(
-                "createTunIfClosed",
-                format!("{:?}", value),
-            )),
-        }
-    }
-
     /// Close currently active tunnel device.
     pub fn close_tun(&mut self) {
         let result = self.call_method("closeTun", "()V", JavaType::Primitive(Primitive::Void), &[]);