Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-26 23:50:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reload on network type change when needed

Browse Source
This commit is contained in:
M66B
2019-12-08 09:00:00 +01:00
parent 037af96be0
commit 00ef6cd812
2 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/ConnectionHelper.java
View File

@@ -75,9 +75,7 @@ public class ConnectionHelper {
private Boolean suitable = null;
private Boolean unmetered = null;
private Boolean roaming = null;
private actionType action = actionType.NONE;
public enum actionType {NONE, AVAILABLE, CHANGED, LOST}
private Integer type = null;
boolean isConnected() {
return (connected != null && connected);
@@ -95,11 +93,16 @@ public class ConnectionHelper {
return (roaming != null && roaming);
}
Integer getType() {
return type;
}
public void update(NetworkState newState) {
connected = newState.connected;
unmetered = newState.unmetered;
suitable = newState.suitable;
roaming = newState.roaming;
type = newState.type;
}
@Override
@@ -128,10 +131,13 @@ public class ConnectionHelper {
state.unmetered = (isMetered != null && !isMetered);
state.suitable = (isMetered != null && (metered || !isMetered));
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo ani = (cm == null ? null : cm.getActiveNetworkInfo());
if (ani != null)
state.type = ani.getType();
if (state.connected && !roaming) {
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
NetworkInfo ani = (cm == null ? null : cm.getActiveNetworkInfo());
if (ani != null)
state.roaming = ani.isRoaming();
} else {
@@ -166,12 +172,6 @@ public class ConnectionHelper {
return state;
}
static NetworkState getNetworkState(Context context, NetworkState.actionType action) {
NetworkState state = getNetworkState(context);
state.action = action;
return state;
}
private static Boolean isMetered(Context context) {
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
if (cm == null)