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

Merge branch 'master' of github.com:M66B/open-source-email

This commit is contained in:
M66B 2019-02-21 20:15:13 +01:00
parent ba4e8df7ff 81235592e3
commit ac01896e20
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,9 +301,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
db.beginTransaction(); db.beginTransaction();
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 {
if (!internet || "connected".equals(db.account().getAccount(aid).state)) { if (!internet || "connected".equals(db.account().getAccount(aid).state)) {
@ -311,7 +310,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
EntityOperation.sync(db, fid); EntityOperation.sync(db, fid);
} else { } else {
now = true; now = true;
db.folder().setFolderSyncState(folder.id, "requested");
ServiceSynchronize.sync(context, fid); ServiceSynchronize.sync(context, fid);
} }
} }

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

@ -515,7 +515,7 @@ 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 = (internet && "connected".equals(folder.state)); now = "connected".equals(folder.state);
EntityOperation.sync(db, folder.id); EntityOperation.sync(db, folder.id);
} else { } else {
EntityAccount account = db.account().getAccount(folder.account); EntityAccount account = db.account().getAccount(folder.account);
@ -524,7 +524,6 @@ public class FragmentMessages extends FragmentBase {
EntityOperation.sync(db, folder.id); EntityOperation.sync(db, folder.id);
} else { } else {
now = true; now = true;
db.folder().setFolderSyncState(folder.id, "requested");
ServiceSynchronize.sync(context, folder.id); ServiceSynchronize.sync(context, folder.id);
} }
} }