[feat] Update the remoteURL of profiles after receiving a 301 response

app/src/main/java/io/nekohasekai/sfa/bg/UpdateProfileWork.kt

@@ -74,9 +74,10 @@ class UpdateProfileWork {
                     continue
                 }
                 try {
-                    val content = HTTPClient().use { it.getString(profile.typed.remoteURL) }
+                    val (content, newURL) = HTTPClient().use { it.getConfigWithUpdatedURL(profile.typed.remoteURL) }
                     Libbox.checkConfig(content)
                     File(profile.typed.path).writeText(content)
+                    profile.typed.remoteURL = newURL
                     profile.typed.lastUpdated = Date()
                     ProfileManager.update(profile)
                 } catch (e: Exception) {
@@ -94,4 +95,4 @@ class UpdateProfileWork {
     }
 
 
-}
+}

app/src/main/java/io/nekohasekai/sfa/bg/VPNService.kt

@@ -9,6 +9,7 @@ import android.os.IBinder
 import io.nekohasekai.libbox.TunOptions
 import io.nekohasekai.sfa.database.Settings
 import io.nekohasekai.sfa.ktx.toIpPrefix
+import io.nekohasekai.sfa.ktx.toList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
@@ -169,7 +170,9 @@ class VPNService : VpnService(), PlatformInterfaceWrapper {
             systemProxyEnabled = Settings.systemProxyEnabled
             if (systemProxyEnabled) builder.setHttpProxy(
                 ProxyInfo.buildDirectProxy(
-                    options.httpProxyServer, options.httpProxyServerPort
+                    options.httpProxyServer,
+                    options.httpProxyServerPort,
+                    options.httpProxyBypassDomain.toList()
                 )
             )
         } else {

app/src/main/java/io/nekohasekai/sfa/ui/profile/EditProfileActivity.kt

@@ -167,9 +167,10 @@ class EditProfileActivity : AbstractActivity<ActivityEditProfileBinding>() {
         binding.progressView.isVisible = true
         lifecycleScope.launch(Dispatchers.IO) {
             try {
-                val content = HTTPClient().use { it.getString(profile.typed.remoteURL) }
+                val (content, newURL) = HTTPClient().use { it.getConfigWithUpdatedURL(profile.typed.remoteURL) }
                 Libbox.checkConfig(content)
                 File(profile.typed.path).writeText(content)
+                profile.typed.remoteURL = newURL
                 profile.typed.lastUpdated = Date()
                 ProfileManager.update(profile)
             } catch (e: Exception) {
@@ -185,4 +186,4 @@ class EditProfileActivity : AbstractActivity<ActivityEditProfileBinding>() {
         }
     }
 
-}
+}

app/src/main/java/io/nekohasekai/sfa/ui/profile/NewProfileActivity.kt

@@ -168,10 +168,10 @@ class NewProfileActivity : AbstractActivity<ActivityAddProfileBinding>() {
             TypedProfile.Type.Remote.name -> {
                 typedProfile.type = TypedProfile.Type.Remote
                 val remoteURL = binding.remoteURL.text
-                val content = HTTPClient().use { it.getString(remoteURL) }
+                val (content, newURL) = HTTPClient().use { it.getConfigWithUpdatedURL(remoteURL) }
                 Libbox.checkConfig(content)
                 configFile.writeText(content)
-                typedProfile.remoteURL = remoteURL
+                typedProfile.remoteURL = newURL
                 typedProfile.lastUpdated = Date()
                 typedProfile.autoUpdate = EnabledType.valueOf(binding.autoUpdate.text).boolValue
                 binding.autoUpdateInterval.text.toIntOrNull()?.also {
@@ -206,4 +206,4 @@ class NewProfileActivity : AbstractActivity<ActivityAddProfileBinding>() {
     }
 
 
-}
+}

app/src/main/java/io/nekohasekai/sfa/utils/HTTPClient.kt

@@ -10,7 +10,7 @@ class HTTPClient : Closeable {
         val userAgent by lazy {
             var userAgent = "SFA/"
             userAgent += BuildConfig.VERSION_NAME
-            userAgent += " ("
+            userAgent += " (Build "
             userAgent += BuildConfig.VERSION_CODE
             userAgent += "; sing-box "
             userAgent += Libbox.version()
@@ -25,17 +25,25 @@ class HTTPClient : Closeable {
         client.modernTLS()
     }
 
-    fun getString(url: String): String {
+    private fun _getResponse(url: String): HTTPResponse {
         val request = client.newRequest()
         request.setUserAgent(userAgent)
         request.setURL(url)
-        val response = request.execute()
-        return response.contentString
+        return request.execute()
+    }
+
+    fun getString(url: String): String {
+        return _getResponse(url).contentString
+    }
+
+    fun getConfigWithUpdatedURL(url: String): Pair<String, String> {
+        val response = _getResponse(url);
+        return Pair(response.contentString, response.finalURL)
     }
 
     override fun close() {
         client.close()
     }
 
 
-}
+}