|
|
|
@ -1375,15 +1375,17 @@ public class FragmentAccount extends FragmentBase {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void setFolders(List<EntityFolder> _folders, EntityAccount account) {
|
|
|
|
|
{
|
|
|
|
|
List<EntityFolder> folders = new ArrayList<>();
|
|
|
|
|
for (EntityFolder folder : _folders)
|
|
|
|
|
if (!EntityFolder.INBOX.equals(folder.type))
|
|
|
|
|
folders.add(folder);
|
|
|
|
|
|
|
|
|
|
EntityFolder none = new EntityFolder();
|
|
|
|
|
none.id = 0L;
|
|
|
|
|
none.name = "-";
|
|
|
|
|
folders.add(0, none);
|
|
|
|
|
folders.add(none);
|
|
|
|
|
|
|
|
|
|
for (EntityFolder folder : _folders)
|
|
|
|
|
if (!EntityFolder.INBOX.equals(folder.type))
|
|
|
|
|
folders.add(folder);
|
|
|
|
|
|
|
|
|
|
adapter.clear();
|
|
|
|
|
adapter.addAll(folders);
|
|
|
|
@ -1402,16 +1404,27 @@ public class FragmentAccount extends FragmentBase {
|
|
|
|
|
else if (EntityFolder.JUNK.equals(folder.type))
|
|
|
|
|
spJunk.setSelection(pos);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
List<EntityFolder> folders = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
EntityFolder none = new EntityFolder();
|
|
|
|
|
none.id = 0L;
|
|
|
|
|
none.name = "-";
|
|
|
|
|
folders.add(none);
|
|
|
|
|
|
|
|
|
|
EntityFolder ask = new EntityFolder();
|
|
|
|
|
ask.id = SWIPE_ACTION_ASK;
|
|
|
|
|
ask.name = getString(R.string.title_ask_what);
|
|
|
|
|
folders.add(1, ask);
|
|
|
|
|
folders.add(ask);
|
|
|
|
|
|
|
|
|
|
EntityFolder seen = new EntityFolder();
|
|
|
|
|
seen.id = SWIPE_ACTION_SEEN;
|
|
|
|
|
seen.name = getString(R.string.title_seen);
|
|
|
|
|
folders.add(1, seen);
|
|
|
|
|
folders.add(seen);
|
|
|
|
|
|
|
|
|
|
folders.addAll(_folders);
|
|
|
|
|
|
|
|
|
|
adapterSwipe.clear();
|
|
|
|
|
adapterSwipe.addAll(folders);
|
|
|
|
@ -1436,6 +1449,7 @@ public class FragmentAccount extends FragmentBase {
|
|
|
|
|
if (right == null ? (account == null && rightDefault.equals(folder.type)) : right.equals(folder.id))
|
|
|
|
|
spRight.setSelection(pos);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grpFolders.setVisibility(_folders.size() > 1 ? View.VISIBLE : View.GONE);
|
|
|
|
|
btnSave.setVisibility(_folders.size() > 1 ? View.VISIBLE : View.GONE);
|
|
|
|
|