moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-17 07:30:16 -05:00
Code Issues Releases Wiki Activity

Only list messages in searchable folders under "All messages"

Browse Source
This commit is contained in:
cketti 2012-12-07 12:55:32 +01:00
parent 251428e963
commit d3e840a9ee
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/fsck/k9/search/SearchAccount.java
View File

@ -21,7 +21,10 @@ public class SearchAccount implements BaseAccount {
// create the all messages search ( all accounts is default when none specified )
public static SearchAccount createAllMessagesAccount(Context context) {
String name = context.getString(R.string.search_all_messages_title);
LocalSearch tmpSearch = new LocalSearch(name);
tmpSearch.and(Searchfield.SEARCHABLE, "1", Attribute.EQUALS);
return new SearchAccount(ALL_MESSAGES, tmpSearch, name,
context.getString(R.string.search_all_messages_detail));
}

3
src/com/fsck/k9/search/SearchSpecification.java
View File

@ -81,7 +81,8 @@ public interface SearchSpecification extends Parcelable {
INTEGRATE,
READ,
FLAGGED,
DISPLAY_CLASS
DISPLAY_CLASS,
SEARCHABLE
}

37
src/com/fsck/k9/search/SqlQueryBuilder.java
View File

@ -21,6 +21,7 @@ public class SqlQueryBuilder {
private static void buildWhereClauseInternal(Account account, ConditionsTreeNode node,
StringBuilder query, List<String> selectionArgs) {
if (node == null) {
query.append("1");
return;
}
@ -38,6 +39,33 @@ public class SqlQueryBuilder {
selectionArgs.add(Long.toString(folderId));
break;
}
case SEARCHABLE: {
switch (account.getSearchableFolders()) {
case ALL: {
// Dummy condition, always select
query.append("1");
break;
}
case DISPLAYABLE: {
// Create temporary LocalSearch object so we can use...
LocalSearch tempSearch = new LocalSearch();
// ...the helper methods in Account to create the necessary conditions
// to limit the selection to displayable, non-special folders.
account.excludeSpecialFolders(tempSearch);
account.limitToDisplayableFolders(tempSearch);
buildWhereClauseInternal(account, tempSearch.getConditions(), query,
selectionArgs);
break;
}
case NONE: {
// Dummy condition, never select
query.append("0");
break;
}
}
break;
}
default: {
appendCondition(condition, query, selectionArgs);
}
@ -101,10 +129,6 @@ public class SqlQueryBuilder {
columnName = "flags";
break;
}
case FOLDER: {
columnName = "folder_id";
break;
}
case ID: {
columnName = "id";
break;
@ -153,6 +177,11 @@ public class SqlQueryBuilder {
columnName = "display_class";
break;
}
case FOLDER:
case SEARCHABLE: {
// Special cases handled in buildWhereClauseInternal()
break;
}
}
if (columnName == null) {