Only allow moving emails from trash (for now), never allow move to outbox

This commit is contained in:
str4d
2014-06-11 08:18:53 +00:00
parent e9239067b8
commit d626081242
3 changed files with 12 additions and 2 deletions

View File

@@ -321,7 +321,9 @@ public class EmailListFragment extends ListFragment implements
// Inflate the menu for the CAB
MenuInflater inflater = mode.getMenuInflater();
inflater.inflate(R.menu.email_list_context, menu);
if (BoteHelper.isOutbox(mFolder))
// Only allow moving from the trash
// TODO change this when user folders are implemented
if (!BoteHelper.isTrash(mFolder))
menu.findItem(R.id.action_move_to).setVisible(false);
return true;
}

View File

@@ -210,6 +210,14 @@ public class BoteHelper extends GeneralHelper {
return "Outbox".equalsIgnoreCase(folderName);
}
public static boolean isTrash(EmailFolder folder) {
return isTrash(folder.getName());
}
public static boolean isTrash(String folderName) {
return "Trash".equalsIgnoreCase(folderName);
}
public static List<Email> getRecentEmails(EmailFolder folder) throws PasswordException, MessagingException {
List<Email> emails = folder.getElements();
Iterator<Email> iter = emails.iterator();

View File

@@ -54,7 +54,7 @@ public class MoveToDialogFragment extends DialogFragment {
Iterator<EmailFolder> i = mFolders.iterator();
while (i.hasNext()) {
EmailFolder folder = i.next();
if (folder.getName().equals(curFolder))
if (folder.getName().equals(curFolder) || BoteHelper.isOutbox(folder.getName()))
i.remove();
else
mFolderDisplayNames.add(