Workaround invalid not metered indication

5 years ago · b9e5a52f20
parent 417ca4cb2a
commit b9e5a52f20
1 changed files with 4 additions and 3 deletions
--- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java
+++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
@ -197,9 +197,10 @@ public class ConnectionHelper {
        }

        if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) {
-            boolean unmetered = caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
-            Log.i("isMetered: active not VPN unmetered=" + unmetered);
-            return !unmetered;
+            // NET_CAPABILITY_NOT_METERED is unreliable on older Android versions
+            boolean metered = cm.isActiveNetworkMetered();
+            Log.i("isMetered: active not VPN metered=" + metered);
+            return metered;
        }

        // VPN: evaluate underlying networks