SagerNet/sing-box-for-android
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box-for-android.git synced 2025-04-03 20:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 27c84942d1 into e0f8b4fe56

Browse source
This commit is contained in:
k3-cat 2024-11-29 09:12:12 +03:30 • committed by GitHub
commit 3ce0f41b14
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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 {
}
}
}

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

@ -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>() {
}
}
}
}

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

@ -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>() {
}
}
}

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

@ -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,12 +25,20 @@ 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() {
@ -38,4 +46,4 @@ class HTTPClient : Closeable {
}
}
}