Revert "Revert "Workaround suspended VPNs""

This reverts commit 217eb46018.
5 years ago · 58b0c6aa1a
parent ad8cfb1917
commit 58b0c6aa1a
1 changed files with 5 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java
+++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
@ -234,7 +234,10 @@ 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 active info ani=" + ani);
+            Log.i("isMetered: no/connected active info ani=" + ani);
+            if (ani == null ||
+                    ani.getState() != NetworkInfo.State.SUSPENDED ||
+                    ani.getType() != ConnectivityManager.TYPE_VPN)
                return null;
        }