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

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

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