diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/extension/_Ext.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/extension/_Ext.kt index e39d16f2..87fa3260 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/extension/_Ext.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/extension/_Ext.kt @@ -56,20 +56,4 @@ val URLConnection.responseLength: Long val URI.idnHost: String get() = host?.replace("[", "")?.replace("]", "").orEmpty() -fun String.removeWhiteSpace(): String = replace("\\s+".toRegex(), "") - -val Context.isNetworkConnected: Boolean - get() { - val manager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) - manager.getNetworkCapabilities(manager.activeNetwork)?.let { - it.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) || - it.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) || - it.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) || - it.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) || - it.hasTransport(NetworkCapabilities.TRANSPORT_VPN) - } ?: false - else - @Suppress("DEPRECATION") - manager.activeNetworkInfo?.isConnectedOrConnecting == true - } \ No newline at end of file +fun String.removeWhiteSpace(): String = replace("\\s+".toRegex(), "") \ No newline at end of file diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt index 8a78473d..20d4df33 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt @@ -199,14 +199,10 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList } fun startV2Ray() { - if (isNetworkConnected) { - if (MmkvManager.mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER).isNullOrEmpty()) { - return - } - V2RayServiceManager.startV2Ray(this) - } else { - ToastCompat.makeText(this, getString(R.string.connection_test_fail), Toast.LENGTH_LONG).show() + if (MmkvManager.mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER).isNullOrEmpty()) { + return } + V2RayServiceManager.startV2Ray(this) } fun restartV2Ray() {