commit 49714ee0ffc830f9bcd1116e74d61116dedd190f
author Evan Millar <emillar@google.com> Wed Sep 02 16:42:47 2009 -0700
committer Evan Millar <emillar@google.com> Wed Sep 02 18:19:43 2009 -0700
tree 1e6a326d1904fc299eac60e58b8ecd448cf50925
parent f19104cc70fba290e000c379e06fb16f1e021a0f

Add Organization and Note kinds to Exchange viewing/editing

Also add placeholder "chat" string to show as label for exchange im
items.

Fixes bug 2072710 and 2092920

Change-Id: I5c3ba0c73160f93b6d06b5b6a2ca20a84f56da18

src/com/android/contacts/ViewContactActivity.java

diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index b29a44c..36d9ee6 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -22,6 +22,7 @@
 import com.android.contacts.model.ContactsSource;
 import com.android.contacts.model.Sources;
 import com.android.contacts.model.ContactsSource.DataKind;
+import com.android.contacts.model.HardCodedSources.SimpleInflater;
 import com.android.contacts.ui.FastTrackWindow;
 import com.android.contacts.util.NotifyingAsyncQueryHandler;
 import com.android.internal.telephony.ITelephony;
@@ -993,6 +994,13 @@
                             entry.secondaryIntent = new Intent(Intent.ACTION_SENDTO,
                                     Uri.fromParts("sms", entry.data, null));
                             entry.data = PhoneNumberUtils.stripSeparators(entry.data);
+
+                            // If data is empty, don't show it.
+                            if (TextUtils.isEmpty(entry.data)) {
+                                Log.w(TAG, "empty data for contact method " + id);
+                                continue;
+                            }
+
                             entry.isPrimary = isSuperPrimary;
                             mPhoneEntries.add(entry);
 
@@ -1007,6 +1015,10 @@
                             // Build email entries
                             entry.intent = new Intent(Intent.ACTION_SENDTO,
                                     Uri.fromParts("mailto", entry.data, null));
+                            // Temporary hack until we get real label resources for exchange.
+                            if (TextUtils.isEmpty(entry.label)) {
+                                entry.label = getString(R.string.email).toLowerCase();
+                            }
                             entry.isPrimary = isSuperPrimary;
                             mEmailEntries.add(entry);
                         } else if (CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE.
@@ -1020,6 +1032,10 @@
                             Object protocolObj = entryValues.getAsInteger(Data.DATA5);
                             String host = null;
 
+                            if (TextUtils.isEmpty(entry.label)) {
+                                entry.label = getString(R.string.im).toLowerCase();
+                            }
+
                             if (protocolObj instanceof Number) {
                                 int protocol = ((Number) protocolObj).intValue();
                                 host = ContactsUtils.lookupProviderNameFromId(