Merge pull request #1879 from MUedsa/idn_to_accii

only domain idn to ascii

V2rayNG/app/build.gradle

@@ -18,8 +18,8 @@ android {
         minSdkVersion 21
         targetSdkVersion Integer.parseInt("$targetSdkVer")
         multiDexEnabled true
-        versionCode 488
-        versionName "1.7.28"
+        versionCode 492
+        versionName "1.7.31"
     }
 
     if (props["sign"]) {

V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt

@@ -36,6 +36,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
     private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
 
     private lateinit var mInterface: ParcelFileDescriptor
+    private var isRunning = false
 
     //val fd: Int get() = mInterface.fd
     private lateinit var process: Process
@@ -183,6 +184,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
         // Create a new interface using the builder and save the parameters.
         try {
             mInterface = builder.establish()!!
+            isRunning = true
             runTun2socks()
         } catch (e: Exception) {
             // non-nullable lateinit var
@@ -219,6 +221,15 @@ class V2RayVpnService : VpnService(), ServiceControl {
             process = proBuilder
                     .directory(applicationContext.filesDir)
                     .start()
+            Thread(Runnable {
+                Log.d(packageName,"$TUN2SOCKS check")
+                process.waitFor()
+                Log.d(packageName,"$TUN2SOCKS exited")
+                if (isRunning) {
+                    Log.d(packageName,"$TUN2SOCKS restart")
+                    runTun2socks()
+                }
+            }).start()
             Log.d(packageName, process.toString())
 
             sendFd()
@@ -262,6 +273,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
 //        val emptyInfo = VpnNetworkInfo()
 //        val info = loadVpnNetworkInfo(configName, emptyInfo)!! + (lastNetworkInfo ?: emptyInfo)
 //        saveVpnNetworkInfo(configName, info)
+        isRunning = false;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             try {
                 connectivity.unregisterNetworkCallback(defaultNetworkCallback)

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt

@@ -488,7 +488,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                 if (!it.second.enabled) {
                     return@forEach
                 }
-                val url = it.second.url
+                val url = Utils.idnToASCII(it.second.url)
                 if (!Utils.isValidUrl(url)) {
                     return@forEach
                 }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt

@@ -429,5 +429,11 @@ object Utils {
     fun removeWhiteSpace(str: String?): String? {
         return str?.replace(" ", "")
     }
+
+    fun idnToASCII(str: String): String {
+        val url = URL(str)
+        return URL(url.protocol, IDN.toASCII(url.host, IDN.ALLOW_UNASSIGNED), url.port, url.file)
+            .toExternalForm()
+    }
 }