mirror of https://github.com/M66B/FairEmail.git
Check swipe target
This commit is contained in:
parent
94ede60603
commit
3980cd6dd3
|
@ -338,7 +338,10 @@ public class FragmentMessages extends FragmentEx {
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
EntityFolder folder = db.folder().getFolder(message.folder);
|
EntityFolder folder = db.folder().getFolder(message.folder);
|
||||||
|
|
||||||
if (swipeTarget < 0 || direction == ItemTouchHelper.LEFT) {
|
if (swipeTarget >= 0 && direction == ItemTouchHelper.RIGHT)
|
||||||
|
target = db.folder().getFolder(swipeTarget);
|
||||||
|
|
||||||
|
if (target == null || !target.account.equals((message.account))) {
|
||||||
if (EntityFolder.ARCHIVE.equals(folder.type) || EntityFolder.TRASH.equals(folder.type))
|
if (EntityFolder.ARCHIVE.equals(folder.type) || EntityFolder.TRASH.equals(folder.type))
|
||||||
target = db.folder().getFolderByType(message.account, EntityFolder.INBOX);
|
target = db.folder().getFolderByType(message.account, EntityFolder.INBOX);
|
||||||
else {
|
else {
|
||||||
|
@ -349,8 +352,6 @@ public class FragmentMessages extends FragmentEx {
|
||||||
if (target == null)
|
if (target == null)
|
||||||
target = db.folder().getFolderByType(message.account, EntityFolder.INBOX);
|
target = db.folder().getFolderByType(message.account, EntityFolder.INBOX);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
target = db.folder().getFolder(swipeTarget);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
result.target = target.name;
|
result.target = target.name;
|
||||||
|
|
Loading…
Reference in New Issue