From a57aee942477d4ddc8a14672327acaafd3f0d1c1 Mon Sep 17 00:00:00 2001
From: Rurirei <72071920+rurirei@users.noreply.github.com>
Date: Wed, 21 Oct 2020 15:19:55 +0800
Subject: [PATCH] proxyOnly update

* do not run Tun2socks under proxyOnly
---
 AndroidLibV2rayLite/interact.go               | 19 +++++++++++--------
 .../v2ray/ang/service/V2RayServiceManager.kt  |  1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/AndroidLibV2rayLite/interact.go b/AndroidLibV2rayLite/interact.go
index b07cd2f0..6cb2e2d8 100644
--- a/AndroidLibV2rayLite/interact.go
+++ b/AndroidLibV2rayLite/interact.go
@@ -48,6 +48,7 @@ type V2RayPoint struct {
 	ConfigureFileContent string
 	EnableLocalDNS       bool
 	ForwardIpv6          bool
+	ProxyOnly            bool
 }
 
 /*V2RayVPNServiceSupportsSet To support Android VPN mode*/
@@ -160,15 +161,17 @@ func (v *V2RayPoint) pointloop() error {
 	v.SupportSet.Setup(v.status.GetVPNSetupArg(v.EnableLocalDNS, v.ForwardIpv6))
 	v.SupportSet.OnEmitStatus(0, "Running")
 
-	if err := v.runTun2socks(); err != nil {
-		log.Println(err)
-		return err
-	}
+	if !v.ProxyOnly {
+		if err := v.runTun2socks(); err != nil {
+			log.Println(err)
+			return err
+		}
 
-	log.Printf("EnableLocalDNS: %v\nForwardIpv6: %v\nDomainName: %s",
-		v.EnableLocalDNS,
-		v.ForwardIpv6,
-		v.DomainName)
+		log.Printf("EnableLocalDNS: %v\nForwardIpv6: %v\nDomainName: %s",
+			v.EnableLocalDNS,
+			v.ForwardIpv6,
+			v.DomainName)
+	}
 
 	return nil
 }
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt
index 282ddd21..be183d39 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt
@@ -131,6 +131,7 @@ object V2RayServiceManager {
             v2rayPoint.enableLocalDNS = service.defaultDPreference.getPrefBoolean(SettingsActivity.PREF_LOCAL_DNS_ENABLED, false)
             v2rayPoint.forwardIpv6 = service.defaultDPreference.getPrefBoolean(SettingsActivity.PREF_FORWARD_IPV6, false)
             v2rayPoint.domainName = service.defaultDPreference.getPrefString(AppConfig.PREF_CURR_CONFIG_DOMAIN, "")
+            v2rayPoint.proxyOnly = service.defaultDPreference.getPrefString(AppConfig.PREF_MODE, "VPN") != "VPN"
 
             try {
                 v2rayPoint.runLoop()