|
|
@ -2302,10 +2302,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
else if (EntityMessage.SWIPE_ACTION_DELETE.equals(action) ||
|
|
|
|
else if (EntityMessage.SWIPE_ACTION_DELETE.equals(action) ||
|
|
|
|
(action.equals(message.folder) && EntityFolder.TRASH.equals(message.folderType)) ||
|
|
|
|
(action.equals(message.folder) && EntityFolder.TRASH.equals(message.folderType)) ||
|
|
|
|
(EntityFolder.TRASH.equals(actionType) && EntityFolder.JUNK.equals(message.folderType)))
|
|
|
|
(EntityFolder.TRASH.equals(actionType) && EntityFolder.JUNK.equals(message.folderType)))
|
|
|
|
icon = Boolean.TRUE.equals(message.accountLeaveDeleted) &&
|
|
|
|
icon = (message.accountLeaveDeleted && EntityFolder.INBOX.equals(message.folderType)
|
|
|
|
EntityFolder.INBOX.equals(message.folderType)
|
|
|
|
|
|
|
|
? R.drawable.twotone_delete_24
|
|
|
|
? R.drawable.twotone_delete_24
|
|
|
|
: R.drawable.twotone_delete_forever_24;
|
|
|
|
: R.drawable.twotone_delete_forever_24);
|
|
|
|
else if (EntityMessage.SWIPE_ACTION_REPLY.equals(action))
|
|
|
|
else if (EntityMessage.SWIPE_ACTION_REPLY.equals(action))
|
|
|
|
icon = R.drawable.twotone_reply_24;
|
|
|
|
icon = R.drawable.twotone_reply_24;
|
|
|
|
else
|
|
|
|
else
|
|
|
@ -2444,6 +2443,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
} else if (EntityMessage.SWIPE_ACTION_DELETE.equals(action) ||
|
|
|
|
} else if (EntityMessage.SWIPE_ACTION_DELETE.equals(action) ||
|
|
|
|
(action.equals(message.folder) && EntityFolder.TRASH.equals(message.folderType)) ||
|
|
|
|
(action.equals(message.folder) && EntityFolder.TRASH.equals(message.folderType)) ||
|
|
|
|
(EntityFolder.TRASH.equals(actionType) && EntityFolder.JUNK.equals(message.folderType))) {
|
|
|
|
(EntityFolder.TRASH.equals(actionType) && EntityFolder.JUNK.equals(message.folderType))) {
|
|
|
|
|
|
|
|
if (!(message.accountLeaveDeleted && EntityFolder.INBOX.equals(message.folderType)))
|
|
|
|
adapter.notifyItemChanged(pos);
|
|
|
|
adapter.notifyItemChanged(pos);
|
|
|
|
onSwipeDelete(message);
|
|
|
|
onSwipeDelete(message);
|
|
|
|
} else
|
|
|
|
} else
|
|
|
|