From ceb27b69410b9a03f7229efd6f4964f88faa53b5 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 5 Sep 2023 16:43:45 +0200 Subject: [PATCH] Optimization --- .../main/java/eu/faircode/email/ConnectionHelper.java | 11 +++++++++-- 1 file changed, 9 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 f34c2db559..be0445f676 100644 --- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java +++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java @@ -530,8 +530,15 @@ public class ConnectionHelper { return false; try { - for (Network network : cm.getAllNetworks()) { - NetworkCapabilities caps = cm.getNetworkCapabilities(network); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { + for (Network network : cm.getAllNetworks()) { + NetworkCapabilities caps = cm.getNetworkCapabilities(network); + if (caps != null && caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) + return true; + } + } else { + Network active = cm.getActiveNetwork(); + NetworkCapabilities caps = (active == null ? null : cm.getNetworkCapabilities(active)); if (caps != null && caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) return true; }