summaryrefslogtreecommitdiffstats
path: root/src/com/android/bluetooth/map/BluetoothMapContent.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/bluetooth/map/BluetoothMapContent.java')
-rw-r--r--src/com/android/bluetooth/map/BluetoothMapContent.java306
1 files changed, 219 insertions, 87 deletions
diff --git a/src/com/android/bluetooth/map/BluetoothMapContent.java b/src/com/android/bluetooth/map/BluetoothMapContent.java
index 19447980c..6710f3414 100644
--- a/src/com/android/bluetooth/map/BluetoothMapContent.java
+++ b/src/com/android/bluetooth/map/BluetoothMapContent.java
@@ -41,6 +41,8 @@ import android.provider.Telephony.Threads;
import android.telephony.TelephonyManager;
import android.util.Log;
import android.text.format.Time;
+import android.text.util.Rfc822Token;
+import android.text.util.Rfc822Tokenizer;
import android.util.TimeFormatException;
import com.android.emailcommon.provider.EmailContent;
import com.android.emailcommon.provider.EmailContent.Message;
@@ -50,10 +52,11 @@ import com.android.emailcommon.provider.EmailContent.SyncColumns;
import com.android.bluetooth.map.BluetoothMapUtils.TYPE;
import com.google.android.mms.pdu.CharacterSets;
+import com.google.android.mms.pdu.PduHeaders;
import android.database.sqlite.SQLiteException;
-import java.util.List;
-import java.util.ArrayList;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.apache.commons.codec.net.QuotedPrintableCodec;
import org.apache.commons.codec.DecoderException;
@@ -264,7 +267,7 @@ public class BluetoothMapContent {
selection,
null, null);
- if (c.moveToFirst()) {
+ if (c !=null && c.moveToFirst()) {
do {
String add = c.getString(c.getColumnIndex("address"));
Integer type = c.getInt(c.getColumnIndex("type"));
@@ -313,7 +316,7 @@ public class BluetoothMapContent {
null, null);
if (D) Log.d(TAG, " parts:");
- if (c.moveToFirst()) {
+ if (c !=null && c.moveToFirst()) {
do {
Long partid = c.getLong(c.getColumnIndex(BaseColumns._ID));
String ct = c.getString(c.getColumnIndex("ct"));
@@ -357,9 +360,9 @@ public class BluetoothMapContent {
printMmsAddr(id);
printMmsParts(id);
}
+ c.close();
} else {
Log.d(TAG, "query failed");
- c.close();
}
}
@@ -374,9 +377,9 @@ public class BluetoothMapContent {
while (c.moveToNext()) {
printSms(c);
}
+ c.close();
} else {
Log.d(TAG, "query failed");
- c.close();
}
}
@@ -561,8 +564,15 @@ public class BluetoothMapContent {
private void setPriority(BluetoothMapMessageListingElement e, Cursor c,
FilterInfo fi, BluetoothMapAppParams ap) {
+ String priority = "no";
if ((ap.getParameterMask() & MASK_PRIORITY) != 0) {
- String priority = "no";
+ int pri = 0;
+ if (fi.msgType == FilterInfo.TYPE_MMS) {
+ pri = c.getInt(c.getColumnIndex(Mms.PRIORITY));
+ }
+ if (pri == PduHeaders.PRIORITY_HIGH) {
+ priority = "yes";
+ }
if (D) Log.d(TAG, "setPriority: " + priority);
e.setPriority(priority);
}
@@ -714,7 +724,7 @@ public class BluetoothMapContent {
} else {
int toIndex = c.getColumnIndex(MessageColumns.TO_LIST);
address = c.getString(toIndex);
- if (address.contains("")) {
+ if (address != null && address.contains("")) {
String[] recepientAddrStr = address.split("");
if (recepientAddrStr !=null && recepientAddrStr.length > 0) {
if (V){
@@ -724,7 +734,7 @@ public class BluetoothMapContent {
e.setRecipientAddressing(recepientAddrStr[0].trim()); }
} else {
if (D) Log.d(TAG, "setRecipientAddressing: " + address);
- e.setRecipientAddressing(address.trim());
+ e.setRecipientAddressing(address);
}
return;
}
@@ -1035,7 +1045,9 @@ public class BluetoothMapContent {
name = c.getString(c.getColumnIndex(Contacts.DISPLAY_NAME));
}
- c.close();
+ if (c != null) {
+ c.close();
+ }
return name;
}
@@ -1450,9 +1462,13 @@ public class BluetoothMapContent {
if (!c.isLast()) {
where += " OR ";
}
- p.close();
+ if (p != null) {
+ p.close();
+ }
+ }
+ if (c != null) {
+ c.close();
}
- c.close();
if (str != null && str.length() > 0) {
if (where.length() > 0) {
@@ -1499,6 +1515,23 @@ public class BluetoothMapContent {
return where;
}
+ private String setWhereFilterPriority(BluetoothMapAppParams ap, FilterInfo fi) {
+ String where = "";
+ int pri = ap.getFilterPriority();
+ /*only MMS have priority info */
+ if(fi.msgType == FilterInfo.TYPE_MMS)
+ {
+ if(pri == 0x0002)
+ {
+ where += " AND " + Mms.PRIORITY + "<=" +
+ Integer.toString(PduHeaders.PRIORITY_NORMAL);
+ }else if(pri == 0x0001) {
+ where += " AND " + Mms.PRIORITY + "=" +
+ Integer.toString(PduHeaders.PRIORITY_HIGH);
+ }
+ }
+ return where;
+ }
private String setWhereFilterRecipient(BluetoothMapAppParams ap,
FilterInfo fi) {
@@ -1565,6 +1598,7 @@ public class BluetoothMapContent {
where += setWhereFilterFolderType(folder, fi);
where += setWhereFilterReadStatus(ap, fi);
where += setWhereFilterPeriod(ap, fi);
+ where += setWhereFilterPriority(ap,fi);
/* where += setWhereFilterOriginator(ap, fi); */
/* where += setWhereFilterRecipient(ap, fi); */
@@ -1706,6 +1740,76 @@ public class BluetoothMapContent {
return folderName;
}
+ /**
+ * Since email app returns addresses as RFC822 formatted strings and Rfc822Tokens are expected
+ * this will tear apart the string to return the components we want to put into
+ * an Rfc822Token
+ * @param part = what you want to return: "name" or "address": returns null if neither
+ * @param emailString = raw string from the email provider that is RFC822 formatted
+ * @return string type of the requested part
+ */
+ private String deTokenizeEmail (String part, String emailString) {
+ final Matcher sEmailMatcher =
+ Pattern.compile("\\\"?([^\"<]*?)\\\"?\\s*<(.*)>").matcher("");
+ String name, address;
+ Matcher m = sEmailMatcher.reset(emailString.trim());
+ if (m.matches()) {
+ name = m.group(1);
+ address = m.group(2);
+ if (name == null) {
+ name = "";
+ } else {
+ name = Html.fromHtml(name.trim()).toString();
+ }
+ if (address == null) {
+ address = "";
+ } else {
+ address = Html.fromHtml(address).toString();
+ }
+ } else {
+ // Try and tokenize the string
+ final Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(emailString.trim());
+ if (tokens.length > 0) {
+ final String tokenizedName = tokens[0].getName();
+ name = tokenizedName != null ? Html.fromHtml(tokenizedName.trim()).toString() : "";
+ address = Html.fromHtml(tokens[0].getAddress()).toString();
+ } else {
+ name = "";
+ address = Html.fromHtml(emailString.trim()).toString();
+ }
+ }
+ String output = null;
+ if (part == "name") {
+ output = name.replace("'", ""); //single quote from gmail likes to slip through
+ }
+ else if (part == "address") {
+ output = address;
+ }
+ return output;
+ }
+
+ private String getNameFromEmail(String emailAddress) {
+ String contactName = null;
+ Cursor p;
+
+ Uri uri = Uri.withAppendedPath(ContactsContract.CommonDataKinds.Email.CONTENT_LOOKUP_URI,
+ Uri.encode(emailAddress));
+
+ String[] projection = {Contacts._ID, Contacts.DISPLAY_NAME};
+ String selection = Contacts.IN_VISIBLE_GROUP + "=1";
+ String orderBy = Contacts._ID + " ASC";
+
+ // Get the contact _ID and name
+ p = mResolver.query(uri, projection, selection, null, orderBy);
+ if (p != null && p.getCount() >= 1) {
+ //Resolved an email to a contact so lets use it
+ p.moveToFirst();
+ contactName = p.getString(p.getColumnIndex(Contacts.DISPLAY_NAME));
+ if(V) Log.v(TAG,"Phone book lookup resolved " + emailAddress + " to " + contactName);
+ }
+ p.close();
+ return contactName;
+ }
private void extractEmailAddresses(long id, BluetoothMapbMessageMmsEmail message) {
if (V) Log.v(TAG, "extractEmailAddresses with id " + id);
@@ -1713,23 +1817,34 @@ public class BluetoothMapContent {
Uri uriEmail = Uri.parse(urlEmail);
StringTokenizer emailId;
String tempEmail = null;
+ String emailComponent, nameComponent = null, contactsName;
Cursor c = mResolver.query(uriEmail, EMAIL_PROJECTION, "_id = " + id, null, null);
if (c != null && c.moveToFirst()) {
String senderName = null;
if((senderName = c.getString(c.getColumnIndex(MessageColumns.FROM_LIST))) != null ) {
if(V) Log.v(TAG, " senderName " + senderName);
if(senderName.contains("")){
- String[] senderStr = senderName.split("");
- if(senderStr !=null && senderStr.length > 0){
- if(V) Log.v(TAG, " senderStr[1] " + senderStr[1].trim());
- if(V) Log.v(TAG, " senderStr[0] " + senderStr[0].trim());
- setVCardFromEmailAddress(message, senderStr[1].trim(), true);
- message.addFrom(null, senderStr[0].trim());
- }
+ String[] senderStr = senderName.split("");
+ if(senderStr !=null && senderStr.length > 0){
+ emailComponent = senderStr[1].trim(); //should be email
+ nameComponent = senderStr[0].trim(); //should be name
+ if(V){
+ Log.v(TAG, " senderStr[1] " + emailComponent);
+ Log.v(TAG, " senderStr[0] " + nameComponent);
+ }
+ contactsName = getNameFromEmail(emailComponent);
+ if (contactsName != null) nameComponent = contactsName;
+ setVCardFromEmailAddress(message, nameComponent, emailComponent, true);
+ message.addFrom(nameComponent,emailComponent);
+ }
} else {
- if(V) Log.v(TAG, " senderStr is" + senderName.trim());
- setVCardFromEmailAddress(message, senderName.trim(), true);
- message.addFrom(null, senderName.trim());
+ if(V) Log.v(TAG, " senderStr is" + senderName.trim());
+ nameComponent = deTokenizeEmail("name", senderName.trim());
+ emailComponent = deTokenizeEmail("address", senderName.trim());
+ contactsName = getNameFromEmail(emailComponent);
+ if (contactsName != null) nameComponent = contactsName;
+ setVCardFromEmailAddress(message, nameComponent, emailComponent, true);
+ message.addFrom(nameComponent,emailComponent);
}
}
String recipientName = null;
@@ -1737,48 +1852,66 @@ public class BluetoothMapContent {
if((recipientName = c.getString(c.getColumnIndex(MessageColumns.TO_LIST))) != null){
if(V) Log.v(TAG, " recipientName " + recipientName);
if(recipientName.contains("")){
- String[] recepientStr = recipientName.split("");
- if(recepientStr !=null && recepientStr.length > 0){
- if (V){
- Log.v(TAG, " recepientStr[1] " + recepientStr[1].trim());
- Log.v(TAG, " recepientStr[0] " + recepientStr[0].trim());
- }
- setVCardFromEmailAddress(message, recepientStr[1].trim(), false);
- message.addTo(recepientStr[1].trim(), recepientStr[0].trim());
- }
+ String[] recepientStr = recipientName.split("");
+ if(recepientStr !=null && recepientStr.length > 0){
+ emailComponent = recepientStr[1].trim(); //should be email
+ nameComponent = recepientStr[0].trim(); //should be name
+ if (V){
+ Log.v(TAG, " recepientStr[1] " + emailComponent);
+ Log.v(TAG, " recepientStr[0] " + nameComponent);
+ }
+ contactsName = getNameFromEmail(emailComponent);
+ if (contactsName != null) nameComponent = contactsName;
+ setVCardFromEmailAddress(message, nameComponent, emailComponent, false);
+ message.addTo(nameComponent,emailComponent);
+ }
} else if(recipientName.contains("")){
- multiRecepients = recipientName.replace('', ';');
- if(multiRecepients != null){
- if (V){
- Log.v(TAG, " Setting ::Recepient name :: " + multiRecepients.trim());
- }
- emailId = new StringTokenizer(multiRecepients.trim(),";");
- do {
- setVCardFromEmailAddress(message, emailId.nextElement().toString(), false);
- } while(emailId.hasMoreElements());
-
- message.addTo(multiRecepients.trim(), multiRecepients.trim());
- }
+ multiRecepients = recipientName.replace('', ';');
+ if(multiRecepients != null){
+ if (V){
+ Log.v(TAG, " Setting::M Recepient name: " + multiRecepients.trim());
+ }
+ emailId = new StringTokenizer(multiRecepients.trim(),";");
+ do {
+ tempEmail = emailId.nextElement().toString();
+ nameComponent = deTokenizeEmail("name", tempEmail);
+ emailComponent = deTokenizeEmail("address", tempEmail);
+ contactsName = getNameFromEmail(emailComponent);
+ if (contactsName != null) nameComponent = contactsName;
+ setVCardFromEmailAddress(message, nameComponent, emailComponent,
+ false);
+ message.addTo(nameComponent,emailComponent);
+ } while(emailId.hasMoreElements());
+ }
} else if(recipientName.contains(",")){
- multiRecepients = recipientName.replace(',', ';');
- if(multiRecepients != null){
- if (V){
- Log.v(TAG, "Setting ::Recepient name :: " + multiRecepients.trim());
- }
- emailId = new StringTokenizer(multiRecepients.trim(),";");
- do {
+ multiRecepients = recipientName.replace(", \"", "; \"");
+ if(multiRecepients != null){
+ if (V){
+ Log.v(TAG, "Setting::M2 Recepient name : " + multiRecepients.trim());
+ }
+ emailId = new StringTokenizer(multiRecepients.trim(),";");
+ do {
tempEmail = emailId.nextElement().toString();
- setVCardFromEmailAddress(message, tempEmail, false);
- message.addTo(null, tempEmail);
- } while(emailId.hasMoreElements());
- }
+ nameComponent = deTokenizeEmail("name", tempEmail);
+ emailComponent = deTokenizeEmail("address", tempEmail);
+ contactsName = getNameFromEmail(emailComponent);
+ if (contactsName != null) nameComponent = contactsName;
+ setVCardFromEmailAddress(message, nameComponent, emailComponent,
+ false);
+ message.addTo(nameComponent,emailComponent);
+ } while(emailId.hasMoreElements());
+ }
} else {
- Log.v(TAG, " Setting ::Recepient name :: " + recipientName.trim());
- setVCardFromEmailAddress(message, recipientName.trim(), false);
- message.addTo(null, recipientName.trim());
- }
- }
- }
+ Log.v(TAG, " Setting ::Single Recepient name :: " + recipientName.trim());
+ nameComponent = deTokenizeEmail("name", recipientName.trim());
+ emailComponent = deTokenizeEmail("address", recipientName.trim());
+ contactsName = getNameFromEmail(emailComponent);
+ if (contactsName != null) nameComponent = contactsName;
+ setVCardFromEmailAddress(message, nameComponent, emailComponent, false);
+ message.addTo(nameComponent,emailComponent);
+ }
+ }
+ }
}
/**
@@ -2055,21 +2188,22 @@ public class BluetoothMapContent {
if (smsSelected(fi, ap)) {
fi.msgType = FilterInfo.TYPE_SMS;
+ if(ap.getFilterPriority() != 1){ /*SMS cannot have high priority*/
+ String where = setWhereFilter(folder, fi, ap);
- String where = setWhereFilter(folder, fi, ap);
-
- Cursor c = mResolver.query(Sms.CONTENT_URI,
- SMS_PROJECTION, where, null, "date DESC");
+ Cursor c = mResolver.query(Sms.CONTENT_URI,
+ SMS_PROJECTION, where, null, "date DESC");
- if (c != null) {
- while (c.moveToNext()) {
- if (matchAddresses(c, fi, ap)) {
- printSms(c);
- e = element(c, fi, ap);
- bmList.add(e);
+ if (c != null) {
+ while (c.moveToNext()) {
+ if (matchAddresses(c, fi, ap)) {
+ printSms(c);
+ e = element(c, fi, ap);
+ bmList.add(e);
+ }
}
+ c.close();
}
- c.close();
}
}
@@ -2156,7 +2290,7 @@ public class BluetoothMapContent {
where += " AND read=0 ";
where += setWhereFilterPeriod(ap, fi);
Cursor c = mResolver.query(Sms.CONTENT_URI,
- SMS_PROJECTION, where, null, "date DESC");
+ SMS_PROJECTION, where, null, "date DESC");
if (c != null) {
cnt = c.getCount();
@@ -2237,24 +2371,21 @@ public class BluetoothMapContent {
throw new IllegalArgumentException("Invalid message handle.");
}
- private void setVCardFromEmailAddress(BluetoothMapbMessage message, String emailAddr, boolean incoming) {
- if(D) Log.d(TAG, "setVCardFromEmailAddress, emailAdress is " +emailAddr);
- String contactId = null, contactName = null;
+ private void setVCardFromEmailAddress(BluetoothMapbMessage message,
+ String contactName, String emailAddress, boolean incoming) {
+ if(D) Log.d(TAG, "setVCardFromEmailAddress, emailAdress is " +emailAddress);
String[] phoneNumbers = {""};
String[] emailAddresses = new String[1];
- StringTokenizer emailId;
- Cursor p;
-
if(incoming == true) {
- emailAddresses[0] = emailAddr;
- if(V) Log.v(TAG,"Adding addOriginator " + emailAddresses[0]);
- message.addOriginator(emailAddr, phoneNumbers, emailAddresses);
+ emailAddresses[0] = emailAddress;
+ if(V) Log.v(TAG,"Adding addOriginator " + contactName + " " + emailAddresses[0]);
+ message.addOriginator(contactName, phoneNumbers, emailAddresses);
}
else
{
- emailAddresses[0] = emailAddr;
- if(V) Log.v(TAG,"Adding Receipient " + emailAddresses[0]);
- message.addRecipient(emailAddr, phoneNumbers, emailAddresses);
+ emailAddresses[0] = emailAddress;
+ if(V) Log.v(TAG,"Adding Receipient " + contactName + " " + emailAddresses[0]);
+ message.addRecipient(contactName, phoneNumbers, emailAddresses);
}
}
@@ -2278,7 +2409,8 @@ public class BluetoothMapContent {
contactId = p.getString(p.getColumnIndex(Contacts._ID));
contactName = p.getString(p.getColumnIndex(Contacts.DISPLAY_NAME));
}
- p.close();
+ if (p != null)
+ p.close();
// The phone number we got is the one we will use
phoneNumbers = new String[1];
@@ -2377,7 +2509,7 @@ public class BluetoothMapContent {
selection,
null, null);
/* TODO: Change the setVCard...() to return the vCard, and use the name in message.addXxx() */
- if (c.moveToFirst()) {
+ if (c != null && c.moveToFirst()) {
do {
String address = c.getString(c.getColumnIndex("address"));
Integer type = c.getInt(c.getColumnIndex("type"));
@@ -2458,7 +2590,7 @@ public class BluetoothMapContent {
selection,
null, null);
- if (c.moveToFirst()) {
+ if (c != null && c.moveToFirst()) {
do {
Long partId = c.getLong(c.getColumnIndex(BaseColumns._ID));
String contentType = c.getString(c.getColumnIndex("ct"));
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 02:24:29 +0000