Fix for 'group message' regression.

This commit is contained in:
Moxie Marlinspike 2013-02-04 11:03:19 -08:00
parent bf92de394b
commit dcf73cd009

View File

@ -78,7 +78,7 @@ public class MmsSmsDatabase extends Database {
"WHEN " + SmsDatabase.Types.FAILED_TYPE + " THEN 1 " + "WHEN " + SmsDatabase.Types.FAILED_TYPE + " THEN 1 " +
"ELSE 0 END)"; "ELSE 0 END)";
String[] projection = {"_id", "body", "type", "address", "subject", "normalized_date_sent AS date_sent", "normalized_date_received AS date_received", "m_type", "msg_box", "transport_type", "COUNT(_id) AS group_size", mmsGroupSentCount + " AS mms_group_sent_count", mmsGroupSentFailedCount + " AS mms_group_sent_failed_count", smsGroupSentCount + " AS sms_group_sent_count", smsGroupSentFailedCount + " AS sms_group_sent_failed_count", smsCaseSecurity + " AS sms_collate", mmsCaseSecurity + " AS mms_collate"}; String[] projection = {"_id", "body", "type", "address", "subject", "status", "normalized_date_sent AS date_sent", "normalized_date_received AS date_received", "m_type", "msg_box", "transport_type", "COUNT(_id) AS group_size", mmsGroupSentCount + " AS mms_group_sent_count", mmsGroupSentFailedCount + " AS mms_group_sent_failed_count", smsGroupSentCount + " AS sms_group_sent_count", smsGroupSentFailedCount + " AS sms_group_sent_failed_count", smsCaseSecurity + " AS sms_collate", mmsCaseSecurity + " AS mms_collate"};
String order = "normalized_date_received ASC"; String order = "normalized_date_received ASC";
String selection = "thread_id = " + threadId; String selection = "thread_id = " + threadId;
String groupBy = "normalized_date_sent / 1000, sms_collate, mms_collate"; String groupBy = "normalized_date_sent / 1000, sms_collate, mms_collate";