Evaluate underlying networks only when active network is a VPN

6 years ago · cec0d1032c
parent c8df742a33
commit cec0d1032c
1 changed files with 4 additions and 4 deletions
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@ -337,10 +337,10 @@ public class Helper {

        Log.i(Helper.TAG, "isMetered: active caps=" + caps);

-        if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) &&
-                caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)) {
-            Log.i(Helper.TAG, "isMetered: active not VPN unmetered");
-            return false;
+        if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) {
+            boolean unmetered = caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
+            Log.i(Helper.TAG, "isMetered: active not VPN unmetered=" + unmetered);
+            return !unmetered;
        }

        // VPN: evaluate underlying networks