Pass a value with the VPN option, if plugin version < 2.0

shadowsocks · Oct 19, 2020 · f38d828 · f38d828
1 parent 52d0d7e
commit f38d828
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt b/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
@@ -102,8 +102,8 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
 
         this.configFile = configFile
         val config = profile.toJson()
-        plugin?.let { (path, opts) ->
-            if (service.isVpnService) opts["V"] = ""
+        plugin?.let { (path, opts, isV2) ->
+            if (service.isVpnService) if (isV2) opts["__android_vpn"] = "" else opts["V"] = "true"
             config.put("plugin", path).put("plugin_opts", opts.toString())
         }
         config.put("local_address", DataStore.listenAddress)

diff --git a/core/src/main/java/com/github/shadowsocks/plugin/PluginManager.kt b/core/src/main/java/com/github/shadowsocks/plugin/PluginManager.kt
@@ -158,7 +158,7 @@ object PluginManager {
         }
         val provider = providers.single().providerInfo
         val options = configuration.getOptions { provider.loadString(PluginContract.METADATA_KEY_DEFAULT_CONFIG) }
-        val isV2 = (provider.applicationInfo.metaData?.getString(PluginContract.METADATA_KEY_VERSION)
+        val isV2 = provider.applicationInfo.metaData?.getString(PluginContract.METADATA_KEY_VERSION
                 ?.substringBefore('.')?.toIntOrNull() ?: 0) >= 2
         var failure: Throwable? = null
         try {