From 217eb460186e865a5e3c97652093e78fd47bc58c Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 28 Nov 2020 12:46:30 +0100 Subject: [PATCH] Revert "Workaround suspended VPNs" This reverts commit c7a219df07042a39a81e0d753bc80cbca5f8fc60. --- app/src/main/java/eu/faircode/email/ConnectionHelper.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java index a1e0508914..4ebd039308 100644 --- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java +++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java @@ -234,11 +234,8 @@ public class ConnectionHelper { // onLost [... state: DISCONNECTED/DISCONNECTED ... available: true] NetworkInfo ani = cm.getNetworkInfo(active); if (ani == null || ani.getState() != NetworkInfo.State.CONNECTED) { - Log.i("isMetered: no/connected active info ani=" + ani); - if (ani == null || - ani.getState() != NetworkInfo.State.SUSPENDED || - ani.getType() != ConnectivityManager.TYPE_VPN) - return null; + Log.i("isMetered: no active info ani=" + ani); + return null; } NetworkCapabilities caps = cm.getNetworkCapabilities(active);