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

Check internet on manual sync

Browse Source
This commit is contained in:
M66B
2019-02-21 09:02:57 +00:00
parent e917a53530
commit f746509b7b
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -495,6 +495,8 @@ public class FragmentMessages extends FragmentBase {
if (!prefs.getBoolean("enabled", true))
throw new IllegalStateException(context.getString(R.string.title_sync_disabled));
boolean internet = (Helper.isMetered(context, true) != null);
DB db = DB.getInstance(context);
try {
db.beginTransaction();
@@ -513,14 +515,15 @@ public class FragmentMessages extends FragmentBase {
boolean now = false;
for (EntityFolder folder : folders)
if (folder.account == null) { // outbox
now = ("connected".equals(folder.state));
now = (internet && "connected".equals(folder.state));
EntityOperation.sync(db, folder.id);
} else {
now = true;
EntityAccount account = db.account().getAccount(folder.account);
if ("connected".equals(account.state))
if (!internet || "connected".equals(account.state)) {
now = internet;
EntityOperation.sync(db, folder.id);
else {
} else {
now = true;
db.folder().setFolderSyncState(folder.id, "requested");
ServiceSynchronize.sync(context, folder.id);
}