From e08f276996f9ed4ec7f8fedc96ac54ee2028bc3c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 2 Mar 2019 10:22:15 +0000
Subject: [PATCH] Refactoring small improvement

---
 .../main/java/eu/faircode/email/AdapterMessage.java    |  4 ++--
 .../main/java/eu/faircode/email/FragmentCompose.java   |  2 +-
 app/src/main/java/eu/faircode/email/Helper.java        | 10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 97f2d50569..718ba22c06 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2568,7 +2568,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         this.name_email = prefs.getBoolean("name_email", !compact);
         this.zoom = zoom;
         this.sort = sort;
-        this.internet = (Helper.isMetered(context, false) != null);
+        this.internet = Helper.isConnected(context);
         this.properties = properties;
 
 
@@ -2648,7 +2648,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     }
 
     void checkInternet() {
-        boolean internet = (Helper.isMetered(context, false) != null);
+        boolean internet = Helper.isConnected(context);
         if (this.internet != internet) {
             this.internet = internet;
             notifyDataSetChanged();
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index b074991cdc..6c0d2f1f7e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -695,7 +695,7 @@ public class FragmentCompose extends FragmentBase {
     };
 
     private void checkInternet() {
-        boolean internet = (Helper.isMetered(getContext(), false) != null);
+        boolean internet = Helper.isConnected(getContext());
 
         Boolean content = (Boolean) tvNoInternet.getTag();
         tvNoInternet.setVisibility(!internet && content != null && !content ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index fca54c82b2..6545443a87 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -696,16 +696,18 @@ public class Helper {
     }
 
     static boolean isConnected(Context context) {
-        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo ni = cm.getActiveNetworkInfo();
-        return (ni != null && ni.isConnected());
+        return (isMetered(context, false) != null);
     }
 
     static Boolean isMetered(Context context, boolean log) {
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
 
-        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.M)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            NetworkInfo ani = cm.getActiveNetworkInfo();
+            if (ani == null || !ani.isConnected())
+                return null;
             return cm.isActiveNetworkMetered();
+        }
 
         Network active = cm.getActiveNetwork();
         if (active == null) {