Removing handling of primary phone/email on Contact.

Adding code to compute HAS_PHONE_NUMBER on a Contact.

1 files changed, 44 insertions, 51 deletions

diff --git a/tests/assets/expected_contacts.txt b/tests/assets/expected_contacts.txt
index 6a752588..1f1232f1 100644
--- a/tests/assets/expected_contacts.txt
+++ b/tests/assets/expected_contacts.txt
@@ -2,54 +2,47 @@
 2    _id=1
 3    display_name=Test Android
 4    photo_id=null
-5    primary_phone_id=null
-6    primary_email_id=null
-7    times_contacted=0
-8    last_time_contacted=0
-9    custom_ringtone=null
-10    send_to_voicemail=0
-11    starred=0
-12    in_visible_group=0
-13 }
-14 1 {
-15    _id=2
-16    display_name=Jane Doe
-17    photo_id=32
-18    primary_phone_id=7
-19    primary_email_id=17
-20    times_contacted=1
-21    last_time_contacted=1249177384979
-22    custom_ringtone=null
-23    send_to_voicemail=0
-24    starred=1
-25    in_visible_group=1
-26 }
-27 2 {
-28    _id=3
-29    display_name=John Doe
-30    photo_id=33
-31    primary_phone_id=null
-32    primary_email_id=29
-33    times_contacted=0
-34    last_time_contacted=0
-35    custom_ringtone=content://media/internal/audio/media/80
-36    send_to_voicemail=1
-37    starred=1
-38    in_visible_group=1
-39 }
-40 3 {
-41    _id=4
-42    display_name=Added On Android
-43    photo_id=null
-44    primary_phone_id=16
-45    primary_email_id=null
-46    times_contacted=0
-47    last_time_contacted=0
-48    custom_ringtone=null
-49    send_to_voicemail=0
-50    starred=0
-51    in_visible_group=1
-52 }
-
-
-
+5    times_contacted=0
+6    last_time_contacted=0
+7    custom_ringtone=null
+8    send_to_voicemail=0
+9    starred=0
+10    in_visible_group=0
+11    has_phone_number=0
+12 }
+13 1 {
+14    _id=2
+15    display_name=Jane Doe
+16    photo_id=32
+17    times_contacted=1
+18    last_time_contacted=1249177384979
+19    custom_ringtone=null
+20    send_to_voicemail=0
+21    starred=1
+22    in_visible_group=1
+23    has_phone_number=1
+24 }
+25 2 {
+26    _id=3
+27    display_name=John Doe
+28    photo_id=33
+29    times_contacted=0
+30    last_time_contacted=0
+31    custom_ringtone=content://media/internal/audio/media/80
+32    send_to_voicemail=1
+33    starred=1
+34    in_visible_group=1
+35    has_phone_number=1
+36 }
+37 3 {
+38    _id=4
+39    display_name=Added On Android
+40    photo_id=null
+41    times_contacted=0
+42    last_time_contacted=0
+43    custom_ringtone=null
+44    send_to_voicemail=0
+45    starred=0
+46    in_visible_group=1
+47    has_phone_number=1
+48 }