diff options
Diffstat (limited to 'src/com/android/dialer/lookup/zabasearch/ZabaSearchReverseLookup.java')
-rw-r--r-- | src/com/android/dialer/lookup/zabasearch/ZabaSearchReverseLookup.java | 42 |
1 files changed, 8 insertions, 34 deletions
diff --git a/src/com/android/dialer/lookup/zabasearch/ZabaSearchReverseLookup.java b/src/com/android/dialer/lookup/zabasearch/ZabaSearchReverseLookup.java index e0395214a..afe9961ac 100644 --- a/src/com/android/dialer/lookup/zabasearch/ZabaSearchReverseLookup.java +++ b/src/com/android/dialer/lookup/zabasearch/ZabaSearchReverseLookup.java @@ -21,11 +21,6 @@ import com.android.dialer.lookup.ContactBuilder; import com.android.dialer.lookup.ReverseLookup; import android.content.Context; -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; @@ -44,17 +39,10 @@ public class ZabaSearchReverseLookup 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) { + public ContactInfo lookupNumber(Context context, + String normalizedNumber, String formattedNumber) throws IOException { ZabaSearchApi zsa = new ZabaSearchApi(normalizedNumber); - ZabaSearchApi.ContactInfo info = null; - - try { - info = zsa.getContactInfo(); - } catch (IOException e) { - return null; - } - + ZabaSearchApi.ContactInfo info = zsa.getContactInfo(); if (info.name == null) { return null; } @@ -63,27 +51,13 @@ public class ZabaSearchReverseLookup 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(); } } |