From 542376d0bef92a0b8ad5d86609f8de53c4e3d9bd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 9 Dec 2018 19:09:06 +0100
Subject: [PATCH] Sometimes it is just simple

---
 app/src/main/java/eu/faircode/email/Helper.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 1b5541b56c..b88d446058 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -310,6 +310,11 @@ public class Helper {
         if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.M)
             return cm.isActiveNetworkMetered();
 
+        if (!cm.isActiveNetworkMetered()) {
+            Log.i(Helper.TAG, "isMetered: active network is unmetered");
+            return false;
+        }
+
         Network active = cm.getActiveNetwork();
         if (active == null) {
             Log.i(Helper.TAG, "isMetered: no active network");
@@ -372,6 +377,8 @@ public class Helper {
             }
 
             if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) {
+                Log.i(Helper.TAG, "isMetered: underlying caps=" + caps);
+
                 if (ni.isConnected()) {
                     connected = true;
                     Log.i(Helper.TAG, "isMetered: underlying is connected");