Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7c9fcd9f43 | ||
|
|
54c76d9968 | ||
|
|
40b3f0fedc | ||
|
|
dcfcf83430 | ||
|
|
e46b354643 | ||
|
|
f497e4e301 | ||
|
|
b65e4b3819 | ||
|
|
d166b036fc |
Submodule AndroidLibXrayLite updated: e738d44233...5644ebf958
@@ -12,8 +12,8 @@ android {
|
||||
applicationId = "com.v2ray.ang"
|
||||
minSdk = 21
|
||||
targetSdk = 35
|
||||
versionCode = 631
|
||||
versionName = "1.9.35"
|
||||
versionCode = 634
|
||||
versionName = "1.9.37"
|
||||
multiDexEnabled = true
|
||||
|
||||
val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')
|
||||
|
||||
@@ -356,11 +356,11 @@ class ServerActivity : BaseActivity() {
|
||||
et_sni?.text = Utils.getEditable(config.sni)
|
||||
config.fingerPrint?.let {
|
||||
val utlsIndex = Utils.arrayFind(uTlsItems, it)
|
||||
sp_stream_fingerprint?.setSelection(utlsIndex)
|
||||
utlsIndex.let { sp_stream_fingerprint?.setSelection(if (it >= 0) it else 0) }
|
||||
}
|
||||
config.alpn?.let {
|
||||
val alpnIndex = Utils.arrayFind(alpns, it)
|
||||
sp_stream_alpn?.setSelection(alpnIndex)
|
||||
alpnIndex.let { sp_stream_alpn?.setSelection(if (it >= 0) it else 0) }
|
||||
}
|
||||
if (config.security == TLS) {
|
||||
container_allow_insecure?.visibility = View.VISIBLE
|
||||
|
||||
@@ -4,10 +4,15 @@ import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import com.v2ray.ang.R
|
||||
import com.v2ray.ang.databinding.ActivityLogcatBinding
|
||||
import com.v2ray.ang.extension.toast
|
||||
import com.v2ray.ang.handler.AngConfigManager
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.withContext
|
||||
import java.net.URLDecoder
|
||||
|
||||
class UrlSchemeActivity : BaseActivity() {
|
||||
@@ -66,11 +71,15 @@ class UrlSchemeActivity : BaseActivity() {
|
||||
decodedUrl += "#${fragment}"
|
||||
}
|
||||
Log.d("UrlScheme-decodedUrl", decodedUrl)
|
||||
val (count, countSub) = AngConfigManager.importBatchConfig(decodedUrl, "", false)
|
||||
if (count + countSub > 0) {
|
||||
toast(R.string.import_subscription_success)
|
||||
} else {
|
||||
toast(R.string.import_subscription_failure)
|
||||
lifecycleScope.launch(Dispatchers.IO) {
|
||||
val (count, countSub) = AngConfigManager.importBatchConfig(decodedUrl, "", false)
|
||||
withContext(Dispatchers.Main) {
|
||||
if (count + countSub > 0) {
|
||||
toast(R.string.import_subscription_success)
|
||||
} else {
|
||||
toast(R.string.import_subscription_failure)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[versions]
|
||||
agp = "8.8.0"
|
||||
agp = "8.8.1"
|
||||
desugar_jdk_libs = "2.1.4"
|
||||
gradleLicensePlugin = "0.9.8"
|
||||
kotlin = "2.1.10"
|
||||
|
||||
2
badvpn
2
badvpn
Submodule badvpn updated: 3cb49ab810...e68480088a
2
hysteria
2
hysteria
Submodule hysteria updated: 8c05217590...401ed5245d
Reference in New Issue
Block a user