Validate underlying connections

12 months ago · de8f20d5df
parent bc284c9b3c
commit de8f20d5df
1 changed files with 8 additions and 0 deletions
--- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java
+++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
@ -383,6 +383,14 @@ public class ConnectionHelper {
                continue;
            }

+            boolean captive = caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
+            if ((require_validated || (require_validated_captive && captive)) &&
+                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+                    !caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {
+                Log.i("isMetered: underlying not validated captive=" + captive);
+                continue;
+            }
+
            if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) {
                underlying = true;
                Log.i("isMetered: underlying is connected");