commit f9d5c0e24d1b11527475227549f9530127e9dc07
author Paul Soulos <psoulos@google.com> Wed Jul 09 11:25:59 2014 -0700
committer Paul Soulos <psoulos@google.com> Wed Jul 09 11:25:59 2014 -0700
tree 0e2aadab4f3af136379ac937918209d05cbfd352
parent 8ab5d0a630da1909beb9d3414d2dfc13c51fec6e

Fixes NPE in QuickContactActivity

Bug: 16164625
Change-Id: Ief58d7dcbe36a18ee10ea1630af8d9dd5efb0d34

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 4e9d036..4c57e46 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -984,8 +984,10 @@
                 intent = new Intent(Intent.ACTION_VIEW).setData(builder.build());
             }
             header = getResources().getString(R.string.header_event_entry);
-            subHeader = getResources().getString(Event.getTypeResource(
-                    event.getKindTypeColumn(kind)));
+            if (event.hasKindTypeColumn(kind)) {
+                subHeader = getResources().getString(Event.getTypeResource(
+                        event.getKindTypeColumn(kind)));
+            }
             text = DateUtils.formatDate(this, dataString);
         } else if (dataItem instanceof RelationDataItem) {
             final RelationDataItem relation = (RelationDataItem) dataItem;
@@ -997,14 +999,18 @@
             }
             header = getResources().getString(R.string.header_relation_entry);
             subHeader = relation.getName();
-            text = Relation.getTypeLabel(getResources(), relation.getKindTypeColumn(kind),
-                    relation.getLabel()).toString();
+            if (relation.hasKindTypeColumn(kind)) {
+                text = Relation.getTypeLabel(getResources(), relation.getKindTypeColumn(kind),
+                        relation.getLabel()).toString();
+            }
         } else if (dataItem instanceof PhoneDataItem) {
             final PhoneDataItem phone = (PhoneDataItem) dataItem;
             if (!TextUtils.isEmpty(phone.getNumber())) {
                 header = phone.buildDataString(this, kind);
-                text = Phone.getTypeLabel(getResources(), phone.getKindTypeColumn(kind),
-                        phone.getLabel()).toString();
+                if (phone.hasKindTypeColumn(kind)) {
+                    text = Phone.getTypeLabel(getResources(), phone.getKindTypeColumn(kind),
+                            phone.getLabel()).toString();
+                }
                 icon = getResources().getDrawable(R.drawable.ic_phone_24dp);
                 if (PhoneCapabilityTester.isPhone(this)) {
                     intent = CallUtil.getCallIntent(phone.getNumber());
@@ -1017,8 +1023,10 @@
                 final Uri mailUri = Uri.fromParts(CallUtil.SCHEME_MAILTO, address, null);
                 intent = new Intent(Intent.ACTION_SENDTO, mailUri);
                 header = email.getAddress();
-                text = Email.getTypeLabel(getResources(), email.getKindTypeColumn(kind),
-                        email.getLabel()).toString();
+                if (email.hasKindTypeColumn(kind)) {
+                    text = Email.getTypeLabel(getResources(), email.getKindTypeColumn(kind),
+                            email.getLabel()).toString();
+                }
                 icon = getResources().getDrawable(R.drawable.ic_email_24dp);
             }
         } else if (dataItem instanceof StructuredPostalDataItem) {
@@ -1027,8 +1035,10 @@
             if (!TextUtils.isEmpty(postalAddress)) {
                 intent = StructuredPostalUtils.getViewPostalAddressIntent(postalAddress);
                 header = postal.getFormattedAddress();
-                text = StructuredPostal.getTypeLabel(getResources(), postal.getKindTypeColumn(kind),
-                        postal.getLabel()).toString();
+                if (postal.hasKindTypeColumn(kind)) {
+                    text = StructuredPostal.getTypeLabel(getResources(),
+                            postal.getKindTypeColumn(kind), postal.getLabel()).toString();
+                }
                 icon = getResources().getDrawable(R.drawable.ic_place_24dp);
             }
         } else if (dataItem instanceof SipAddressDataItem) {