From a7124bfb930b92976533166d758930c3c8811863 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 12 Mar 2020 14:13:23 +0100
Subject: [PATCH] Limit network workaround to Android 6 and earlier

---
 app/src/main/java/eu/faircode/email/ConnectionHelper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
index d2a8ce03ca..61ed0a6fcb 100644
--- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java
+++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
@@ -266,7 +266,8 @@ public class ConnectionHelper {
                 }
             } else {
                 // Workaround: active network = VPN, active network info = WiFi
-                if (network.equals(active) && !cm.isActiveNetworkMetered())
+                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M &&
+                        network.equals(active) && !cm.isActiveNetworkMetered())
                     return false;
             }
         }