mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 05:35:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Test also for connected networks

Browse source 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2020-10-29 13:38:35 +01:00
parent bdf90f0a1c
commit e20f69dd7f
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -111,16 +111,17 @@ class ConnectivityServiceImpl implements ConnectivityService {
if (networkInfo != null) {
boolean isConnected = networkInfo.isConnectedOrConnecting();
boolean isMetered = ConnectivityManagerCompat.isActiveNetworkMetered(platformConnectivityManager);
boolean isWifi = networkInfo.getType() == ConnectivityManager.TYPE_WIFI || isAnyOtherNetworkWifi();
boolean isWifi = networkInfo.getType() == ConnectivityManager.TYPE_WIFI || hasNonCellularConnectivity();
return new Connectivity(isConnected, isMetered, isWifi, null);
} else {
return Connectivity.DISCONNECTED;
}
}
private boolean isAnyOtherNetworkWifi() {
private boolean hasNonCellularConnectivity() {
for (NetworkInfo networkInfo : platformConnectivityManager.getAllNetworkInfo()) {
if (networkInfo.isConnectedOrConnecting() && networkInfo.getType() == ConnectivityManager.TYPE_WIFI) {
if (networkInfo.isConnectedOrConnecting() && (networkInfo.getType() == ConnectivityManager.TYPE_WIFI ||
networkInfo.getType() == ConnectivityManager.TYPE_ETHERNET)) {
return true;
}
}