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

Use on demand sync when disabled

Browse Source
This commit is contained in:
M66B
2019-02-28 12:35:19 +00:00
parent 1324a364e8
commit 4b8a4b92bc
6 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/eu/faircode/email/FragmentFolders.java
View File

@@ -228,6 +228,11 @@ public class FragmentFolders extends FragmentBase {
args.putLong("account", account);
new SimpleTask<Boolean>() {
@Override
protected void onPostExecute(Bundle args) {
swipeRefresh.setRefreshing(false);
}
@Override
protected Boolean onExecute(Context context, Bundle args) {
long aid = args.getLong("account");
@@ -236,6 +241,9 @@ public class FragmentFolders extends FragmentBase {
NetworkInfo ni = cm.getActiveNetworkInfo();
boolean internet = (ni != null && ni.isConnected());
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean enabled = prefs.getBoolean("enabled", true);
DB db = DB.getInstance(context);
try {
db.beginTransaction();
@@ -248,7 +256,7 @@ public class FragmentFolders extends FragmentBase {
List<EntityFolder> folders = db.folder().getFoldersSynchronizingUnified();
for (EntityFolder folder : folders) {
EntityAccount account = db.account().getAccount(folder.account);
if (account.ondemand)
if (account.ondemand || !enabled)
if (internet) {
now = true;
ServiceUI.sync(context, folder.id);
@@ -261,7 +269,7 @@ public class FragmentFolders extends FragmentBase {
}
} else {
EntityAccount account = db.account().getAccount(aid);
if (account.ondemand) {
if (account.ondemand || !enabled) {
if (internet) {
now = true;
List<EntityFolder> folders = db.folder().getFoldersOnDemandSync(aid);
@@ -291,15 +299,12 @@ public class FragmentFolders extends FragmentBase {
@Override
protected void onExecuted(Bundle args, Boolean now) {
if (!now) {
swipeRefresh.setRefreshing(false);
if (!now)
Snackbar.make(view, R.string.title_sync_delayed, Snackbar.LENGTH_LONG).show();
}
}
@Override
protected void onException(Bundle args, Throwable ex) {
swipeRefresh.setRefreshing(false);
if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
else