From ab764786fef620426d40f419435478d007d60d1a Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 5 Sep 2023 15:53:56 +0200 Subject: [PATCH] Revert "Check if VPN network has internet" This reverts commit 6df8613004dfdb9772b9417c06b5e83fa42b8687. --- .../java/eu/faircode/email/ConnectionHelper.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java index d954d69968..b89a670903 100644 --- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java +++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java @@ -300,10 +300,9 @@ public class ConnectionHelper { if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) { if (!caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) { - Log.i("isMetered: active no internet"); + Log.i("isMetered: no internet"); return null; } - boolean captive = caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL); if ((require_validated || (require_validated_captive && captive)) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && @@ -331,23 +330,17 @@ public class ConnectionHelper { return null; } - if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) { + if (standalone_vpn || + caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) { // NET_CAPABILITY_NOT_METERED is unreliable on older Android versions boolean metered = cm.isActiveNetworkMetered(); Log.i("isMetered: active not VPN metered=" + metered); return metered; } - // Active network is VPN network - Network[] networks = cm.getAllNetworks(); - if (standalone_vpn || (networks != null && networks.length == 1)) { + if (networks != null && networks.length == 1) { // Standalone VPN - if (!caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) { - Log.i("isMetered: VPN no internet"); - return null; - } - boolean metered = cm.isActiveNetworkMetered(); Log.i("isMetered: active VPN metered=" + metered); return metered;