Merge "Dont use the default locale when formatting SQL statements"
diff --git a/src/com/android/providers/telephony/MmsSmsProvider.java b/src/com/android/providers/telephony/MmsSmsProvider.java
index 31f5062..f715cdb 100644
--- a/src/com/android/providers/telephony/MmsSmsProvider.java
+++ b/src/com/android/providers/telephony/MmsSmsProvider.java
@@ -175,6 +175,33 @@
Mms.MESSAGE_TYPE + " = " + PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF + " OR " +
Mms.MESSAGE_TYPE + " = " + PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND + "))";
+ // Search on the words table but return the rows from the corresponding sms table
+ private static final String SMS_QUERY =
+ "SELECT sms._id AS _id,thread_id,address,body,date,index_text,words._id " +
+ "FROM sms,words WHERE (words MATCH ? " +
+ "AND sms._id=words.source_id AND words.table_to_use=1)";
+
+ // Search on the words table but return the rows from the corresponding parts table
+ private static final String MMS_QUERY =
+ "SELECT pdu._id,thread_id,addr.address,part.text " +
+ "AS body,pdu.date,index_text,words._id " +
+ "FROM pdu,part,addr,words WHERE ((part.mid=pdu._id) AND " +
+ "(addr.msg_id=pdu._id) AND " +
+ "(addr.type=" + PduHeaders.TO + ") AND " +
+ "(part.ct='text/plain') AND " +
+ "(words MATCH ?) AND " +
+ "(part._id = words.source_id) AND " +
+ "(words.table_to_use=2))";
+
+ // This code queries the sms and mms tables and returns a unified result set
+ // of text matches. We query the sms table which is pretty simple. We also
+ // query the pdu, part and addr table to get the mms result. Note that we're
+ // using a UNION so we have to have the same number of result columns from
+ // both queries.
+ private static final String SMS_MMS_QUERY =
+ SMS_QUERY + " UNION " + MMS_QUERY +
+ " GROUP BY thread_id ORDER BY thread_id ASC, date DESC";
+
private static final String AUTHORITY = "mms-sms";
static {
@@ -349,46 +376,10 @@
"with this query");
}
- // This code queries the sms and mms tables and returns a unified result set
- // of text matches. We query the sms table which is pretty simple. We also
- // query the pdu, part and addr table to get the mms result. Note that we're
- // using a UNION so we have to have the same number of result columns from
- // both queries.
-
String searchString = uri.getQueryParameter("pattern") + "*";
- String smsProjection = "sms._id as _id,thread_id,address,body,date," +
- "index_text,words._id";
- String mmsProjection = "pdu._id,thread_id,addr.address,part.text as " + "" +
- "body,pdu.date,index_text,words._id";
-
- // search on the words table but return the rows from the corresponding sms table
- String smsQuery = String.format(
- "SELECT %s FROM sms,words WHERE (words MATCH ? " +
- " AND sms._id=words.source_id AND words.table_to_use=1) ",
- smsProjection);
-
- // search on the words table but return the rows from the corresponding parts table
- String mmsQuery = String.format(
- "SELECT %s FROM pdu,part,addr,words WHERE ((part.mid=pdu._id) AND " +
- "(addr.msg_id=pdu._id) AND " +
- "(addr.type=%d) AND " +
- "(part.ct='text/plain') AND " +
- "(words MATCH ?) AND " +
- "(part._id = words.source_id) AND " +
- "(words.table_to_use=2))",
- mmsProjection,
- PduHeaders.TO);
-
- // join the results from sms and part (mms)
- String rawQuery = String.format(
- "%s UNION %s GROUP BY %s ORDER BY %s",
- smsQuery,
- mmsQuery,
- "thread_id",
- "thread_id ASC, date DESC");
try {
- cursor = db.rawQuery(rawQuery, new String[] { searchString, searchString });
+ cursor = db.rawQuery(SMS_MMS_QUERY, new String[] { searchString, searchString });
} catch (Exception ex) {
Log.e(LOG_TAG, "got exception: " + ex.toString());
}
@@ -461,8 +452,8 @@
if (isEmail) {
selectionArgs = new String[] { refinedAddress };
} else {
- selection += " OR " + String.format("PHONE_NUMBERS_EQUAL(address, ?, %d)",
- (mUseStrictPhoneNumberComparation ? 1 : 0));
+ selection += " OR PHONE_NUMBERS_EQUAL(address, ?, " +
+ (mUseStrictPhoneNumberComparation ? 1 : 0) + ")";
selectionArgs = new String[] { refinedAddress, refinedAddress };
}