1 files changed, 8 insertions, 35 deletions
diff --git a/src/com/android/dialer/lookup/whitepages/WhitePagesReverseLookup.java b/src/com/android/dialer/lookup/whitepages/WhitePagesReverseLookup.java
index 470758b9d..375c63f35 100644
--- a/src/com/android/dialer/lookup/whitepages/WhitePagesReverseLookup.java
+++ b/src/com/android/dialer/lookup/whitepages/WhitePagesReverseLookup.java
@@ -21,12 +21,6 @@ import com.android.dialer.lookup.ContactBuilder;
 import com.android.dialer.lookup.ReverseLookup;
 
 import android.content.Context;
-import android.net.Uri;
-import android.util.Pair;
-
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
-import android.provider.ContactsContract.CommonDataKinds.Website;
 
 import java.io.IOException;
 
@@ -45,16 +39,9 @@ public class WhitePagesReverseLookup extends ReverseLookup {
      * @param formattedNumber The formatted phone number
      * @return The phone number info object
      */
-    public Pair<ContactInfo, Object> lookupNumber(Context context,
-            String normalizedNumber, String formattedNumber) {
-        WhitePagesApi.ContactInfo info = null;
-
-        try {
-            info = WhitePagesApi.reverseLookup(context, normalizedNumber);
-        } catch (IOException e) {
-            return null;
-        }
-
+    public ContactInfo lookupNumber(Context context,
+            String normalizedNumber, String formattedNumber) throws IOException {
+        WhitePagesApi.ContactInfo info = WhitePagesApi.reverseLookup(context, normalizedNumber);
         if (info == null || info.name == null) {
             return null;
         }
@@ -63,27 +50,13 @@ public class WhitePagesReverseLookup extends ReverseLookup {
                 ContactBuilder.REVERSE_LOOKUP,
                 normalizedNumber, formattedNumber);
 
-        ContactBuilder.Name n = new ContactBuilder.Name();
-        n.displayName = info.name;
-        builder.setName(n);
-
-        ContactBuilder.PhoneNumber pn = new ContactBuilder.PhoneNumber();
-        pn.number = info.formattedNumber;
-        pn.type = Phone.TYPE_MAIN;
-        builder.addPhoneNumber(pn);
-
+        builder.setName(ContactBuilder.Name.createDisplayName(info.name));
+        builder.addPhoneNumber(ContactBuilder.PhoneNumber.createMainNumber(info.formattedNumber));
+        builder.addWebsite(ContactBuilder.WebsiteUrl.createProfile(info.website));
         if (info.address != null) {
-            ContactBuilder.Address a = new ContactBuilder.Address();
-            a.formattedAddress = info.address;
-            a.type = StructuredPostal.TYPE_HOME;
-            builder.addAddress(a);
+            builder.addAddress(ContactBuilder.Address.createFormattedHome(info.address));
         }
 
-        ContactBuilder.WebsiteUrl w = new ContactBuilder.WebsiteUrl();
-        w.url = info.website;
-        w.type = Website.TYPE_PROFILE;
-        builder.addWebsite(w);
-
-        return Pair.create(builder.build(), null);
+        return builder.build();
     }
 }