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

Reduce logging

Browse source
This commit is contained in:
M66B 2018-12-23 19:58:16 +00:00
parent 04b8a44d11
commit b1039f1ba5
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -344,31 +344,27 @@ public class Helper {
if (active == null) {
if (log)
EntityLog.log(context, "isMetered: no active network");
else
Log.i(Helper.TAG, "isMetered: no active network");
return null;
}
if (log)
Log.i(Helper.TAG, "isMetered: active info=" + cm.getNetworkInfo(active));
NetworkCapabilities caps = cm.getNetworkCapabilities(active);
if (caps == null) {
if (log)
EntityLog.log(context, "isMetered: active no caps");
else
Log.i(Helper.TAG, "isMetered: active no caps");
// Assume metered
return true;
}
if (log)
Log.i(Helper.TAG, "isMetered: active caps=" + caps);
if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) {
boolean unmetered = caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
if (log)
EntityLog.log(context, "isMetered: active not VPN unmetered=" + unmetered);
else
Log.i(Helper.TAG, "isMetered: active not VPN unmetered=" + unmetered);
return !unmetered;
}
@ -378,41 +374,41 @@ public class Helper {
if (networks != null)
for (Network network : networks) {
NetworkInfo ni = cm.getNetworkInfo(network);
if (log)
Log.i(Helper.TAG, "isMetered: underlying info=" + ni);
caps = cm.getNetworkCapabilities(network);
if (caps == null) {
if (log)
EntityLog.log(context, "isMetered: no underlying caps");
else
Log.i(Helper.TAG, "isMetered: no underlying caps");
continue;
}
if (log)
Log.i(Helper.TAG, "isMetered: underlying caps=" + caps);
if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) {
if (log)
Log.i(Helper.TAG, "isMetered: underlying caps=" + caps);
if (ni != null && ni.isConnected()) {
if (log)
Log.i(Helper.TAG, "isMetered: underlying is connected");
if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)) {
if (log)
EntityLog.log(context, "isMetered: underlying is unmetered");
else
Log.i(Helper.TAG, "isMetered: underlying is unmetered");
return false;
}
} else
} else {
if (log)
Log.i(Helper.TAG, "isMetered: underlying is disconnected");
}
}
}
if (log)
EntityLog.log(context, "isMetered: underlying assume metered");
else
Log.i(Helper.TAG, "isMetered: underlying assume metered");
// Assume metered
return true;
}