mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactoring small improvement

This commit is contained in:
M66B 2019-03-02 10:22:15 +00:00
parent 28fe881b46
commit e08f276996
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -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();

2
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -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);

10
app/src/main/java/eu/faircode/email/Helper.java
View File

@ -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) {