moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-25 17:18:50 -05:00
Code Issues Releases Wiki Activity

Fix crash due to ambiguous column name in SORT clause

Browse Source
This commit is contained in:
cketti 2013-03-19 02:32:47 +01:00
parent aff9bec92b
commit 1c75590e7a
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/fsck/k9/provider/EmailProvider.java
View File

@ -73,10 +73,21 @@ public class EmailProvider extends ContentProvider {
THREAD_AGGREGATION_FUNCS.put(MessageColumns.ANSWERED, "MIN"); THREAD_AGGREGATION_FUNCS.put(MessageColumns.ANSWERED, "MIN");
THREAD_AGGREGATION_FUNCS.put(MessageColumns.FORWARDED, "MIN"); THREAD_AGGREGATION_FUNCS.put(MessageColumns.FORWARDED, "MIN");
} }
private static final String[] FIXUP_MESSAGES_COLUMNS = { private static final String[] FIXUP_MESSAGES_COLUMNS = {
MessageColumns.ID MessageColumns.ID
}; };
private static final String[] FIXUP_AGGREGATED_MESSAGES_COLUMNS = {
MessageColumns.DATE,
MessageColumns.INTERNAL_DATE,
MessageColumns.ATTACHMENT_COUNT,
MessageColumns.READ,
MessageColumns.FLAGGED,
MessageColumns.ANSWERED,
MessageColumns.FORWARDED
};
private static final String FOLDERS_TABLE = "folders"; private static final String FOLDERS_TABLE = "folders";
private static final String[] FOLDERS_COLUMNS = { private static final String[] FOLDERS_COLUMNS = {
@ -408,7 +419,8 @@ public class EmailProvider extends ContentProvider {
query.append("WHERE m." + MessageColumns.DATE + " = a." + MessageColumns.DATE); query.append("WHERE m." + MessageColumns.DATE + " = a." + MessageColumns.DATE);
if (!StringUtils.isNullOrEmpty(sortOrder)) { if (!StringUtils.isNullOrEmpty(sortOrder)) {
query.append(" ORDER BY "); query.append(" ORDER BY ");
query.append(sortOrder); query.append(SqlQueryBuilder.addPrefixToSelection(
FIXUP_AGGREGATED_MESSAGES_COLUMNS, "a.", sortOrder));
} }
return db.rawQuery(query.toString(), selectionArgs); return db.rawQuery(query.toString(), selectionArgs);