Sort the "NONE" folder to the top of the auto-expand folder list

This commit is contained in:
Jesse Vincent 2009-11-13 03:20:31 +00:00
parent 393519d352
commit 6daeb6b749

View file

@ -228,7 +228,7 @@ public class ChooseFolder extends K9ListActivity
localFolders.add(folder.getName());
}
if (showOptionNone)
{
localFolders.add(Email.FOLDER_NONE);
@ -237,6 +237,14 @@ public class ChooseFolder extends K9ListActivity
Collections.sort(localFolders, new Comparator<String>() {
public int compare(String aName, String bName)
{
if (Email.FOLDER_NONE.equalsIgnoreCase(aName))
{
return -1;
}
if (Email.FOLDER_NONE.equalsIgnoreCase(bName))
{
return 1;
}
if (Email.INBOX.equalsIgnoreCase(aName))
{
return -1;
@ -245,14 +253,6 @@ public class ChooseFolder extends K9ListActivity
{
return 1;
}
if (Email.FOLDER_NONE.equalsIgnoreCase(aName))
{
return 1;
}
if (Email.FOLDER_NONE.equalsIgnoreCase(bName))
{
return -1;
}
return aName.compareToIgnoreCase(bName);
}