From b10dcac314d2fe7b9a8d6c1f62b86447351af838 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 1 Sep 2022 08:11:57 +0200
Subject: [PATCH] Require captive portals to be validated

---
 app/src/main/java/eu/faircode/email/ConnectionHelper.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
index 35b8505aa2..e2285d0caf 100644
--- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java
+++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
@@ -299,10 +299,11 @@ public class ConnectionHelper {
                 Log.i("isMetered: no internet");
                 return null;
             }
-            if (require_validated &&
+            boolean captive = caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
+            if ((require_validated || captive) &&
                     Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
                     !caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {
-                Log.i("isMetered: not validated");
+                Log.i("isMetered: not validated captive=" + captive);
                 return null;
             }
         }