mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7565 from nextcloud/hardenConnectionCheck

Browse source 
getActiveNetwork might be null
This commit is contained in:
Andy Scherzinger 2020-11-30 13:13:10 +01:00 committed by GitHub
commit dc0337476d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java
View file

@ -118,7 +118,11 @@ class ConnectivityServiceImpl implements ConnectivityService {
NetworkCapabilities networkCapabilities = platformConnectivityManager.getNetworkCapabilities(
platformConnectivityManager.getActiveNetwork());
isMetered = !networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
if (networkCapabilities != null) {
isMetered = !networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
} else {
isMetered = ConnectivityManagerCompat.isActiveNetworkMetered(platformConnectivityManager);
}
} else {
isMetered = ConnectivityManagerCompat.isActiveNetworkMetered(platformConnectivityManager);
}