Merge pull request #695 from rurirei/proxyOnly

proxyOnly update
2020-10-22 07:59:19 +08:00
parent 411d9e5c9a a57aee9424
commit 7b2794f6be
3 changed files with 13 additions and 9 deletions
--- 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()
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt
@@ -79,7 +79,7 @@ class V2RayVpnService : VpnService(), ServiceControl {

    override fun onDestroy() {
        super.onDestroy()
-        V2RayServiceManager.cancelNotification()
+        stopV2Ray()
    }

    private fun setup(parameters: String) {