Get inbox case insensitive

master
M66B 3 months ago
parent 116db18217
commit 2e6874adf0

@ -2992,6 +2992,14 @@ class Core {
try {
db.beginTransaction();
if (EntityFolder.INBOX.equalsIgnoreCase(fullName)) {
List<EntityFolder> inboxes = db.folder().getFoldersByName(account.id, fullName);
Log.i(account.name + ":" + fullName + " count=" + (inboxes == null ? -1 : inboxes.size()));
if (inboxes != null && inboxes.size() == 1)
folder = inboxes.get(0);
else
folder = db.folder().getFolderByName(account.id, fullName);
} else
folder = db.folder().getFolderByName(account.id, fullName);
if (folder == null) {
EntityFolder parent = null;

@ -232,6 +232,9 @@ public interface DaoFolder {
@Query("SELECT * FROM folder WHERE account = :account AND name = :name")
EntityFolder getFolderByName(Long account, String name);
@Query("SELECT * FROM folder WHERE account = :account AND name = :name COLLATE NOCASE")
List<EntityFolder> getFoldersByName(Long account, String name);
@Query("SELECT folder.* FROM folder" +
" WHERE account = :account AND type = :type")
EntityFolder getFolderByType(long account, String type);

Loading…
Cancel
Save