From 5097b0c523858020eda1167e5bd5bfcb3eaa22db Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 5 Sep 2023 21:16:16 +0200 Subject: [PATCH] Small improvement --- .../java/eu/faircode/email/ConnectionHelper.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java index f13d02ae77..80c2bf343c 100644 --- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java +++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java @@ -344,6 +344,7 @@ public class ConnectionHelper { Network[] networks = cm.getAllNetworks(); if (standalone_vpn && networks != null && networks.length == 1) { // Internet not checked/validated + // Used for USB/Ethernet internet connection boolean metered = cm.isActiveNetworkMetered(); Log.i("isMetered: active VPN metered=" + metered); return metered; @@ -390,14 +391,12 @@ public class ConnectionHelper { continue; } - if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) { - underlying = true; - Log.i("isMetered: underlying is connected"); + underlying = true; + Log.i("isMetered: underlying is connected"); - if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)) { - Log.i("isMetered: underlying is unmetered"); - return false; - } + if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)) { + Log.i("isMetered: underlying is unmetered"); + return false; } }