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

Default no download for archive, trash and junk

This commit is contained in:
M66B 2019-01-05 07:52:08 +00:00
parent 6dcac8ff91
commit 988973135d
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/EntityFolder.java
View File

@ -149,6 +149,13 @@ public class EntityFolder implements Serializable {
TRASH,
JUNK
);
static final List<Boolean> SYSTEM_FOLDER_DOWNLOAD = Arrays.asList(
true, // drafts
true, // sent
false, // archive
false, // trash
false // junk
); // MUST match SYSTEM_FOLDER_SYNC
public EntityFolder() {
}

4
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@ -524,10 +524,12 @@ public class FragmentAccount extends FragmentEx {
DB db = DB.getInstance(context);
EntityFolder folder = db.folder().getFolderByName(id, ifolder.getFullName());
if (folder == null) {
int sync = EntityFolder.SYSTEM_FOLDER_SYNC.indexOf(type);
folder = new EntityFolder();
folder.name = ifolder.getFullName();
folder.type = (type == null ? EntityFolder.USER : type);
folder.synchronize = (type != null && EntityFolder.SYSTEM_FOLDER_SYNC.contains(type));
folder.synchronize = (sync >= 0);
folder.download = (sync < 0 ? true : EntityFolder.SYSTEM_FOLDER_DOWNLOAD.get(sync));
folder.sync_days = EntityFolder.DEFAULT_SYNC;
folder.keep_days = EntityFolder.DEFAULT_KEEP;
}

4
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@ -338,11 +338,13 @@ public class FragmentSetup extends FragmentEx {
}
if (selectable && type != null) {
int sync = EntityFolder.SYSTEM_FOLDER_SYNC.indexOf(type);
EntityFolder folder = new EntityFolder();
folder.name = ifolder.getFullName();
folder.type = type;
folder.level = EntityFolder.getLevel(separator, folder.name);
folder.synchronize = EntityFolder.SYSTEM_FOLDER_SYNC.contains(type);
folder.synchronize = (sync >= 0);
folder.download = (sync < 0 ? true : EntityFolder.SYSTEM_FOLDER_DOWNLOAD.get(sync));
folder.sync_days = EntityFolder.DEFAULT_SYNC;
folder.keep_days = EntityFolder.DEFAULT_KEEP;
folders.add(folder);