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

Better target folder evaluation

This commit is contained in:
M66B 2019-01-25 07:09:03 +00:00
parent 5c9706e912
commit aaafa4275a
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -788,48 +788,48 @@ public class FragmentMessages extends FragmentBase {
private void onMore() { private void onMore() {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("folder", folder);
args.putLongArray("ids", getSelection()); args.putLongArray("ids", getSelection());
new SimpleTask<MoreResult>() { new SimpleTask<MoreResult>() {
@Override @Override
protected MoreResult onExecute(Context context, Bundle args) { protected MoreResult onExecute(Context context, Bundle args) {
long fid = args.getLong("folder");
long[] ids = args.getLongArray("ids"); long[] ids = args.getLongArray("ids");
MoreResult result = new MoreResult(); MoreResult result = new MoreResult();
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
List<Long> fids = new ArrayList<>();
for (long id : ids) { for (long id : ids) {
EntityMessage message = db.message().getMessage(id); EntityMessage message = db.message().getMessage(id);
if (message != null) { if (message == null)
if (message.ui_seen) continue;
result.seen = true;
else
result.unseen = true;
if (message.ui_flagged) if (!fids.contains(message.folder))
result.flagged = true; fids.add(message.folder);
else
result.unflagged = true;
result.hasArchive = (result.hasArchive && EntityFolder folder = db.folder().getFolder(message.folder);
db.folder().getFolderByType(message.account, EntityFolder.ARCHIVE) != null);
result.hasTrash = (result.hasTrash &&
db.folder().getFolderByType(message.account, EntityFolder.TRASH) != null);
result.hasJunk = (result.hasJunk &&
db.folder().getFolderByType(message.account, EntityFolder.JUNK) != null);
}
}
EntityFolder folder = db.folder().getFolder(fid);
if (folder != null) {
result.isArchive = EntityFolder.ARCHIVE.equals(folder.type); result.isArchive = EntityFolder.ARCHIVE.equals(folder.type);
result.isTrash = EntityFolder.TRASH.equals(folder.type); result.isTrash = EntityFolder.TRASH.equals(folder.type);
result.isJunk = EntityFolder.JUNK.equals(folder.type); result.isJunk = EntityFolder.JUNK.equals(folder.type);
result.isDrafts = EntityFolder.DRAFTS.equals(folder.type); result.isDrafts = EntityFolder.DRAFTS.equals(folder.type);
if (message.ui_seen)
result.seen = true;
else
result.unseen = true;
if (message.ui_flagged)
result.flagged = true;
else
result.unflagged = true;
result.hasArchive = (result.hasArchive &&
db.folder().getFolderByType(message.account, EntityFolder.ARCHIVE) != null);
result.hasTrash = (result.hasTrash &&
db.folder().getFolderByType(message.account, EntityFolder.TRASH) != null);
result.hasJunk = (result.hasJunk &&
db.folder().getFolderByType(message.account, EntityFolder.JUNK) != null);
} }
result.accounts = db.account().getAccounts(true); result.accounts = db.account().getAccounts(true);
@ -854,7 +854,7 @@ public class FragmentMessages extends FragmentBase {
!EntityFolder.ARCHIVE.equals(target.type) && !EntityFolder.ARCHIVE.equals(target.type) &&
!EntityFolder.TRASH.equals(target.type) && !EntityFolder.TRASH.equals(target.type) &&
!EntityFolder.JUNK.equals(target.type) && !EntityFolder.JUNK.equals(target.type) &&
!target.id.equals(fid)) (fids.size() != 1 || !fids.contains(target.id)))
targets.add(target); targets.add(target);
EntityFolder.sort(context, targets); EntityFolder.sort(context, targets);
result.targets.put(account, targets); result.targets.put(account, targets);