From fe572180953f659eb89213ecbe4e318a8b5c09bf Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 3 Jan 2021 14:33:56 +0100 Subject: [PATCH] Removed old network fallback --- .../eu/faircode/email/ConnectionHelper.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java index 67d1fa8805..c167d7b793 100644 --- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java +++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java @@ -216,18 +216,17 @@ public class ConnectionHelper { return null; } - Network active = null; - if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) - active = cm.getActiveNetwork(); - if (active == null) { + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) { NetworkInfo ani = cm.getActiveNetworkInfo(); - if (ani == null || !ani.isConnected()) { - Log.i("isMetered: no/connected active network info=" + ani); + if (ani == null || !ani.isConnected()) return null; - } - boolean metered = cm.isActiveNetworkMetered(); - Log.i("isMetered: active network metered=" + metered); - return metered; + return cm.isActiveNetworkMetered(); + } + + Network active = cm.getActiveNetwork(); + if (active == null) { + Log.i("isMetered: no active network"); + return null; } // onLost [... state: SUSPENDED/SUSPENDED ... available: true]