Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-02 19:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync when account connected

Browse Source
This commit is contained in:
M66B
2019-04-11 17:47:58 +02:00
parent a0038c41da
commit 01c1d76a48
6 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -630,6 +630,8 @@ public class FragmentMessages extends FragmentBase {
if (!Helper.getNetworkState(context).isSuitable())
throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
boolean now = true;
DB db = DB.getInstance(context);
try {
db.beginTransaction();
@@ -642,14 +644,27 @@ public class FragmentMessages extends FragmentBase {
if (folder != null)
folders.add(folder);
}
for (EntityFolder folder : folders)
for (EntityFolder folder : folders) {
EntityOperation.sync(context, folder.id, true);
if (folder.account != null) {
EntityAccount account = db.account().getAccount(folder.account);
if (account != null && !"connected".equals(account.state))
now = false;
}
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
if (!now) {
ServiceSynchronize.reset(context);
throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
}
return null;
}
@@ -1732,7 +1747,7 @@ public class FragmentMessages extends FragmentBase {
boolean refreshing = false;
for (TupleFolderEx folder : folders)
if (folder.sync_state != null) {
if (folder.sync_state != null && (folder.account == null || "connected".equals(folder.accountState))) {
refreshing = true;
break;
}