yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases 2 Wiki Activity

Merge pull request #2052 from 821938089/fix-webdav-network-detect

Browse Source 
fix webdav network detect bug
This commit is contained in:
kunfei
2022-07-10 17:36:42 +08:00
committed by GitHub
parent b179c75e8e 784cf975f8
commit 913ba76740
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/utils/NetworkUtils.kt
+12 -10
View File
@@ -27,22 +27,24 @@ object NetworkUtils {
if (Build.VERSION.SDK_INT < 23) { if (Build.VERSION.SDK_INT < 23) {
val mWiFiNetworkInfo = connectivityManager.activeNetworkInfo val mWiFiNetworkInfo = connectivityManager.activeNetworkInfo
if (mWiFiNetworkInfo != null) { if (mWiFiNetworkInfo != null) {
//移动数据 // WIFI
return if (mWiFiNetworkInfo.type == ConnectivityManager.TYPE_WIFI) { return mWiFiNetworkInfo.type == ConnectivityManager.TYPE_WIFI ||
//WIFI // 移动数据
true mWiFiNetworkInfo.type == ConnectivityManager.TYPE_MOBILE ||
} else mWiFiNetworkInfo.type == ConnectivityManager.TYPE_MOBILE // 以太网
mWiFiNetworkInfo.type == ConnectivityManager.TYPE_ETHERNET
} }
} else { } else {
val network = connectivityManager.activeNetwork val network = connectivityManager.activeNetwork
if (network != null) { if (network != null) {
val nc = connectivityManager.getNetworkCapabilities(network) val nc = connectivityManager.getNetworkCapabilities(network)
if (nc != null) { if (nc != null) {
//移动数据 // WIFI
return if (nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) { return nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ||
//WIFI // 移动数据
true nc.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ||
} else nc.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) // 以太网
nc.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
} }
} }
} }