mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-21 21:57:19 +00:00
Code Issues Releases Wiki Activity

Check for underlying network

Browse source
This commit is contained in:
M66B 2018-12-24 08:48:32 +00:00
parent b1039f1ba5
commit f88c0e44c2
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/Helper.java
View file

@ -354,8 +354,7 @@ public class Helper {
if (caps == null) {
if (log)
EntityLog.log(context, "isMetered: active no caps");
// Assume metered
return true;
return null; // network unknown
}
if (log)
@ -370,6 +369,7 @@ public class Helper {
// VPN: evaluate underlying networks
boolean underlying = false;
Network[] networks = cm.getAllNetworks();
if (networks != null)
for (Network network : networks) {
@ -381,13 +381,15 @@ public class Helper {
if (caps == null) {
if (log)
EntityLog.log(context, "isMetered: no underlying caps");
continue;
continue; // network unknown
}
if (log)
Log.i(Helper.TAG, "isMetered: underlying caps=" + caps);
if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) {
underlying = true;
if (log)
Log.i(Helper.TAG, "isMetered: underlying caps=" + caps);
@ -407,6 +409,11 @@ public class Helper {
}
}
if (!underlying) {
EntityLog.log(context, "isMetered: no underlying network");
return null;
}
if (log)
EntityLog.log(context, "isMetered: underlying assume metered");
// Assume metered