mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-02-23 23:00:56 +00:00
Code Issues Releases Wiki Activity

Hide up/down speed when unsupported/zero

Browse source 
Refs #489
This commit is contained in:
M66B 2017-03-23 10:37:57 +01:00
parent 013adfc738
commit cb52caa8b1
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/faircode/netguard/AdapterRule.java
View file

@ -454,7 +454,10 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> im
holder.tvDisabled.setVisibility(rule.enabled ? View.GONE : View.VISIBLE); holder.tvDisabled.setVisibility(rule.enabled ? View.GONE : View.VISIBLE);
// Show traffic statistics // Show traffic statistics
holder.tvStatistics.setVisibility(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ? View.GONE : View.VISIBLE); holder.tvStatistics.setVisibility(
Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ||
(rule.upspeed == 0 && rule.downspeed == 0)
? View.GONE : View.VISIBLE);
holder.tvStatistics.setText(context.getString(R.string.msg_mbday, rule.upspeed, rule.downspeed)); holder.tvStatistics.setText(context.getString(R.string.msg_mbday, rule.upspeed, rule.downspeed));
// Show related // Show related

4
app/src/main/java/eu/faircode/netguard/Rule.java
View file

@ -410,6 +410,10 @@ public class Rule {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
long up = TrafficStats.getUidTxBytes(rule.info.applicationInfo.uid); long up = TrafficStats.getUidTxBytes(rule.info.applicationInfo.uid);
long down = TrafficStats.getUidRxBytes(rule.info.applicationInfo.uid); long down = TrafficStats.getUidRxBytes(rule.info.applicationInfo.uid);
if (up == TrafficStats.UNSUPPORTED)
up = 0;
if (down == TrafficStats.UNSUPPORTED)
down = 0;
rule.totalbytes = up + down; rule.totalbytes = up + down;
rule.upspeed = (float) up * 24 * 3600 * 1000 / 1024f / 1024f / now; rule.upspeed = (float) up * 24 * 3600 * 1000 / 1024f / 1024f / now;
rule.downspeed = (float) down * 24 * 3600 * 1000 / 1024f / 1024f / now; rule.downspeed = (float) down * 24 * 3600 * 1000 / 1024f / 1024f / now;