From 76eb0988f38538d33f26edae8e40ec0df118e3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Mon, 25 Dec 2023 18:12:41 +0800
Subject: [PATCH] Ignore system proxy settings before Android 10

---
 .../main/java/io/nekohasekai/sfa/bg/VPNService.kt | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/io/nekohasekai/sfa/bg/VPNService.kt b/app/src/main/java/io/nekohasekai/sfa/bg/VPNService.kt
index 5b7df3e..2131773 100644
--- a/app/src/main/java/io/nekohasekai/sfa/bg/VPNService.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/bg/VPNService.kt
@@ -163,19 +163,14 @@ class VPNService : VpnService(), PlatformInterfaceWrapper {
             }
         }
 
-        if (options.isHTTPProxyEnabled) {
+        if (options.isHTTPProxyEnabled && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             systemProxyAvailable = true
             systemProxyEnabled = Settings.systemProxyEnabled
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                if (systemProxyEnabled) builder.setHttpProxy(
-                    ProxyInfo.buildDirectProxy(
-                        options.httpProxyServer,
-                        options.httpProxyServerPort
-                    )
+            if (systemProxyEnabled) builder.setHttpProxy(
+                ProxyInfo.buildDirectProxy(
+                    options.httpProxyServer, options.httpProxyServerPort
                 )
-            } else {
-                error("android: tun.platform.http_proxy requires android 10 or higher")
-            }
+            )
         } else {
             systemProxyAvailable = false
             systemProxyEnabled = false