msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Check internet on manual sync

Browse Source
pull/149/head
M66B 6 years ago
parent e917a53530
commit f746509b7b
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File

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

@ -294,6 +294,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
if (!prefs.getBoolean("enabled", true)) if (!prefs.getBoolean("enabled", true))
throw new IllegalStateException(context.getString(R.string.title_sync_disabled)); throw new IllegalStateException(context.getString(R.string.title_sync_disabled));
boolean internet = (Helper.isMetered(context, true) != null);
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
try { try {
db.beginTransaction(); db.beginTransaction();
@ -301,13 +303,14 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
boolean now; boolean now;
if (aid < 0) { if (aid < 0) {
// outbox // outbox
now = ("connected".equals(folder.state)); now = (internet && "connected".equals(folder.state));
EntityOperation.sync(db, fid); EntityOperation.sync(db, fid);
} else { } else {
now = true; if (!internet || "connected".equals(db.account().getAccount(aid).state)) {
if ("connected".equals(db.account().getAccount(aid).state)) now = internet;
EntityOperation.sync(db, fid); EntityOperation.sync(db, fid);
else { } else {
now = true;
db.folder().setFolderSyncState(folder.id, "requested"); db.folder().setFolderSyncState(folder.id, "requested");
ServiceSynchronize.sync(context, fid); ServiceSynchronize.sync(context, fid);
} }

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

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

Write Preview
Loading…
Cancel
Save