From b9e5a52f2039deed9dc63ba548991b7ac20c357b Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 22 Oct 2019 10:37:21 +0200 Subject: [PATCH] Workaround invalid not metered indication --- app/src/main/java/eu/faircode/email/ConnectionHelper.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java index b02520c3cf..78d763204d 100644 --- 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