From 9ea21370e43c018c9fea9d76fd75ffae16fb928c Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 27 Feb 2019 08:56:10 +0000 Subject: [PATCH] Small fix, cleanup --- app/src/main/java/eu/faircode/email/DaoFolder.java | 11 +++-------- .../main/java/eu/faircode/email/FragmentOptions.java | 2 +- .../main/java/eu/faircode/email/FragmentSetup.java | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java index d90af0bb39..989e419326 100644 --- a/app/src/main/java/eu/faircode/email/DaoFolder.java +++ b/app/src/main/java/eu/faircode/email/DaoFolder.java @@ -33,16 +33,11 @@ public interface DaoFolder { " ORDER BY CASE WHEN folder.type = '" + EntityFolder.USER + "' THEN 1 ELSE 0 END") List getFolders(long account); - @Query("SELECT * FROM folder" + - " WHERE account = :account" + - " AND synchronize = :synchronize" + - " ORDER BY CASE WHEN folder.type = '" + EntityFolder.USER + "' THEN 1 ELSE 0 END") - List getFolders(long account, boolean synchronize); - @Query("SELECT folder.* FROM folder" + " JOIN account ON account.id = folder.account" + - " WHERE account.synchronize AND folder.synchronize") - List getFoldersSynchronizing(); + " WHERE folder.synchronize" + + " AND (account.synchronize AND NOT account.ondemand)") + List getFoldersAutoSync(); @Query("SELECT folder.* FROM folder" + " JOIN account ON account.id = folder.account" + diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java index 64e47118d5..4a22ee63a7 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptions.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java @@ -267,7 +267,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O @Override protected Void onExecute(Context context, Bundle args) { DB db = DB.getInstance(context); - List folders = db.folder().getFoldersSynchronizing(); + List folders = db.folder().getFoldersAutoSync(); for (EntityFolder folder : folders) EntityOperation.sync(db, folder.id); return null; diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index 3f4e9ec3dd..534451b951 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -405,7 +405,7 @@ public class FragmentSetup extends FragmentBase { @Override protected Void onExecute(Context context, Bundle args) { DB db = DB.getInstance(context); - for (EntityFolder folder : db.folder().getFoldersSynchronizing()) + for (EntityFolder folder : db.folder().getFoldersAutoSync()) EntityOperation.sync(db, folder.id); return null; }