From f04e4f8ef9f309a877d3c2cdb6414a65a281828a Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 13 Mar 2020 07:59:29 +0100 Subject: [PATCH] Changed network workaround --- app/src/main/java/eu/faircode/email/ConnectionHelper.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java index 61ed0a6fcb..814b393b03 100644 --- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java +++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java @@ -177,7 +177,7 @@ public class ConnectionHelper { if (cm == null) return null; - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) { NetworkInfo ani = cm.getActiveNetworkInfo(); if (ani == null || !ani.isConnected()) return null; @@ -264,11 +264,6 @@ public class ConnectionHelper { Log.i("isMetered: underlying is unmetered"); return false; } - } else { - // Workaround: active network = VPN, active network info = WiFi - if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M && - network.equals(active) && !cm.isActiveNetworkMetered()) - return false; } }