Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-06 09:03:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Keep network state

Browse Source
This commit is contained in:
M66B
2019-03-16 13:12:31 +00:00
parent fa579d3c10
commit 4ca5cd0540
11 changed files with 94 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -515,7 +515,7 @@ public class FragmentMessages extends FragmentBase {
protected Void onExecute(Context context, Bundle args) {
long fid = args.getLong("folder");
if (!Helper.suitableNetwork(context, false))
if (!Helper.getNetworkState(context).isSuitable())
throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
@@ -2096,8 +2096,7 @@ public class FragmentMessages extends FragmentBase {
if (download == 0)
download = Long.MAX_VALUE;
Boolean isMetered = Helper.isMetered(getContext(), false);
boolean metered = (isMetered == null || isMetered);
boolean unmetered = Helper.getNetworkState(getContext()).isUnmetered();
int count = 0;
int unseen = 0;
@@ -2139,7 +2138,7 @@ public class FragmentMessages extends FragmentBase {
expand = messages.get(0);
if (expand != null &&
(expand.content || !metered || (expand.size != null && expand.size < download))) {
(expand.content || unmetered || (expand.size != null && expand.size < download))) {
if (!values.containsKey("expanded"))
values.put("expanded", new ArrayList<Long>());
values.get("expanded").add(expand.id);