/android/import-contacts

To get this branch, use:
bzr branch http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to src/org/waxworlds/edam/importcontacts/Importer.java

  • Committer: edam
  • Date: 2011-05-02 18:28:24 UTC
  • Revision ID: edam@waxworlds.org-20110502182824-acgdi3qfxfzqgely
- fixed logic for vcard field types (home, work, cell, etc) so it works
- updated NEWS and TODO
- rewrote most of ContactsCache, including a new ContactIdentifier class to identify contacts in the cache and new cache building code
- contacts now identified in the same way that Andoid displays them (by name, or organisation, or number, or email, in that order)
- propper handling and support for organisations and titles
- validation of imported contact now done by Importer, not VcfImporter
- separated sanitisation and normalisation (for cache lookups)
- generacised PhoneData, EmailData and AddressData classes
- ContactData is now aware of primary numbers, emails and organisations (defaults to the first prefrred one seen, or the first one seen where none is preferred)

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/edam/importcontacts/Importer.java
1
1
/*
2
2
 * Importer.java
3
3
 *
4
 
 * Copyright (C) 2009 to 2012 Tim Marston <tim@ed.am>
 
4
 * Copyright (C) 2009 to 2011 Tim Marston <edam@waxworlds.org>
5
5
 *
6
6
 * This file is part of the Import Contacts program (hereafter referred
7
7
 * to as "this program"). For more information, see
8
 
 * http://ed.am/dev/android/import-contacts
 
8
 * http://www.waxworlds.org/edam/software/android/import-contacts
9
9
 *
10
10
 * This program is free software: you can redistribute it and/or modify
11
11
 * it under the terms of the GNU General Public License as published by
21
21
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
22
 */
23
23
 
24
 
package am.ed.importcontacts;
 
24
package org.waxworlds.edam.importcontacts;
25
25
 
26
 
import java.util.Arrays;
27
26
import java.util.HashMap;
28
 
import java.util.HashSet;
29
27
import java.util.Iterator;
30
 
import java.util.Locale;
31
28
import java.util.Set;
32
29
import java.util.regex.Matcher;
33
30
import java.util.regex.Pattern;
34
31
 
35
 
import am.ed.importcontacts.Backend.ContactCreationException;
 
32
import android.content.ContentUris;
 
33
import android.content.ContentValues;
36
34
import android.content.SharedPreferences;
 
35
import android.net.Uri;
37
36
import android.os.Message;
 
37
import android.provider.Contacts;
 
38
 
38
39
 
39
40
public class Importer extends Thread
40
41
{
54
55
        private int _last_merge_decision;
55
56
        private boolean _abort = false;
56
57
        private boolean _is_finished = false;
57
 
        private ContactsCache _contacts_cache = null;
58
 
        private Backend _backend = null;
 
58
        private ContactsCache _contactsCache = null;
 
59
 
 
60
        @SuppressWarnings("serial")
 
61
        protected class ContactNeedsMoreInfoException extends Exception
 
62
        {
 
63
        }
59
64
 
60
65
        /**
61
66
         * Data about a contact
62
67
         */
63
68
        public class ContactData
64
69
        {
65
 
                public final static int TYPE_HOME = 0;
66
 
                public final static int TYPE_WORK = 1;
67
 
                public final static int TYPE_MOBILE = 2;        // only used with phones
68
 
                public final static int TYPE_FAX_HOME = 3;      // only used with phones
69
 
                public final static int TYPE_FAX_WORK = 4;      // only used with phones
70
 
                public final static int TYPE_PAGER = 5;         // only used with phones
71
 
 
72
70
                class TypeDetail
73
71
                {
74
72
                        protected int _type;
124
122
                        }
125
123
                }
126
124
 
127
 
                @SuppressWarnings("serial")
128
 
                protected class ContactNotIdentifiableException extends Exception
129
 
                {
130
 
                }
131
 
 
132
125
                protected String _name = null;
133
126
                protected String _primary_organisation = null;
134
 
                protected boolean _primary_organisation_is_preferred;
 
127
                protected boolean _primary_organisation_is_preferred = false;
135
128
                protected String _primary_number = null;
136
 
                protected int _primary_number_type;
137
 
                protected boolean _primary_number_is_preferred;
 
129
                protected boolean _primary_number_is_preferred = false;
138
130
                protected String _primary_email = null;
139
 
                protected boolean _primary_email_is_preferred;
 
131
                protected boolean _primary_email_is_preferred = false;
140
132
                protected HashMap< String, ExtraDetail > _organisations = null;
141
133
                protected HashMap< String, PreferredDetail > _numbers = null;
142
134
                protected HashMap< String, PreferredDetail > _emails = null;
143
135
                protected HashMap< String, TypeDetail > _addresses = null;
144
136
 
145
 
                private ContactsCache.CacheIdentifier _cache_identifier = null;
146
 
 
147
137
                protected void setName( String name )
148
138
                {
149
139
                        _name = name;
183
173
                                        new ExtraDetail( 0, false, title ) );
184
174
 
185
175
                        // if this is the first organisation added, or it's a preferred
186
 
                        // organisation and the current primary organisation isn't, then
187
 
                        // record this as the primary organisation.
 
176
                        // organisation and a previous organisation wasn't, then remember
 
177
                        // that this is the "primary organisation".
188
178
                        if( _primary_organisation == null ||
189
179
                                ( is_preferred && !_primary_organisation_is_preferred ) )
190
180
                        {
231
221
                                _numbers.put( number,
232
222
                                        new PreferredDetail( type, false ) );
233
223
 
234
 
                        final Set< Integer > non_voice_types = new HashSet< Integer >(
235
 
                                Arrays.asList( TYPE_FAX_HOME, TYPE_FAX_WORK, TYPE_PAGER ) );
236
 
 
237
224
                        // if this is the first number added, or it's a preferred number
238
 
                        // and the current primary number isn't, or this number is on equal
239
 
                        // standing with the primary number in terms of preference and it is
240
 
                        // a voice number and the primary number isn't, then record this as
241
 
                        // the primary number.
 
225
                        // and a previous number wasn't, then remember that this is the
 
226
                        // "primary number".
242
227
                        if( _primary_number == null ||
243
 
                                ( is_preferred && !_primary_number_is_preferred ) ||
244
 
                                ( is_preferred == _primary_number_is_preferred &&
245
 
                                        !non_voice_types.contains( type ) &&
246
 
                                        non_voice_types.contains( _primary_number_type ) ) )
 
228
                                ( is_preferred && !_primary_number_is_preferred ) )
247
229
                        {
248
230
                                _primary_number = number;
249
 
                                _primary_number_type = type;
250
231
                                _primary_number_is_preferred = is_preferred;
251
232
                        }
252
233
                }
277
258
                        email = sanitisesEmailAddress( email );
278
259
                        if( email == null )
279
260
                        {
280
 
                                // TODO: warn that an imported email address is being ignored
 
261
                                // TODO: warn that an imported email addtrss is being ignored
281
262
                                return;
282
263
                        }
283
264
 
288
269
                        if( !_emails.containsKey( email ) )
289
270
                                _emails.put( email, new PreferredDetail( type, false ) );
290
271
 
291
 
                        // if this is the first email added, or it's a preferred email and
292
 
                        // the current primary organisation isn't, then record this as the
293
 
                        // primary email.
 
272
                        // if this is the first email added, or it's a preferred email
 
273
                        // and a previous email wasn't, then remember that this is the
 
274
                        // "primary email".
294
275
                        if( _primary_email == null ||
295
276
                                ( is_preferred && !_primary_email_is_preferred ) )
296
277
                        {
345
326
                }
346
327
 
347
328
                protected void finalise()
348
 
                        throws ContactNotIdentifiableException
349
329
                {
350
330
                        // ensure that if there is a primary number, it is preferred so
351
331
                        // that there is always one preferred number. Android will assign
369
349
                                _organisations.put( _primary_organisation,
370
350
                                        new ExtraDetail( 0, true, data.getExtra() ) );
371
351
                        }
372
 
 
373
 
                        // create a cache identifier from this contact data, which can be
374
 
                        // used to look-up an existing contact
375
 
                        _cache_identifier = ContactsCache.createIdentifier( this );
376
 
                        if( _cache_identifier == null )
377
 
                                throw new ContactNotIdentifiableException();
378
 
                }
379
 
 
380
 
                public ContactsCache.CacheIdentifier getCacheIdentifier()
381
 
                {
382
 
                        return _cache_identifier;
383
352
                }
384
353
 
385
354
                private String sanitisePhoneNumber( String number )
399
368
                        Matcher m = p.matcher( email );
400
369
                        if( m.matches() ) {
401
370
                                String[] bits = email.split( "@" );
402
 
                                return bits[ 0 ] + "@" + bits[ 1 ].toLowerCase( Locale.US );
 
371
                                return bits[ 0 ] + "@" + bits[ 1 ].toLowerCase();
403
372
                        }
404
373
                        return null;
405
374
                }
424
393
                        // update UI
425
394
                        setProgressMessage( R.string.doit_caching );
426
395
 
427
 
                        // create the appropriate backend
428
 
                        if( Integer.parseInt( android.os.Build.VERSION.SDK ) >= 5 )
429
 
                                _backend = new ContactsContractBackend( _doit );
430
 
                        else
431
 
                                _backend = new ContactsBackend( _doit );
432
 
 
433
 
                        // create a cache of existing contacts and populate it
434
 
                        _contacts_cache = new ContactsCache();
435
 
                        _backend.populateCache( _contacts_cache );
 
396
                        // build a cache of existing contacts
 
397
                        _contactsCache = new ContactsCache();
 
398
                        _contactsCache.buildCache( _doit );
436
399
 
437
400
                        // do the import
438
401
                        onImport();
559
522
                        Doit.MESSAGE_SETPROGRESSMESSAGE, getText( res ) ) );
560
523
        }
561
524
 
562
 
        protected void setProgressMax( int max_progress )
 
525
        protected void setProgressMax( int maxProgress )
563
526
                        throws AbortImportException
564
527
        {
565
528
                checkAbort();
566
529
                _doit._handler.sendMessage( Message.obtain(
567
530
                        _doit._handler, Doit.MESSAGE_SETMAXPROGRESS,
568
 
                        Integer.valueOf( max_progress ) ) );
 
531
                        new Integer( maxProgress ) ) );
569
532
        }
570
533
 
571
 
        protected void setTmpProgress( int tmp_progress )
572
 
                throws AbortImportException
 
534
        protected void setTmpProgress( int tmpProgress ) throws AbortImportException
573
535
        {
574
536
                checkAbort();
575
537
                _doit._handler.sendMessage( Message.obtain(
576
538
                        _doit._handler, Doit.MESSAGE_SETTMPPROGRESS,
577
 
                        Integer.valueOf( tmp_progress ) ) );
 
539
                        new Integer( tmpProgress ) ) );
578
540
        }
579
541
 
580
542
        protected void setProgress( int progress ) throws AbortImportException
582
544
                checkAbort();
583
545
                _doit._handler.sendMessage( Message.obtain(
584
546
                        _doit._handler, Doit.MESSAGE_SETPROGRESS,
585
 
                        Integer.valueOf( progress ) ) );
 
547
                        new Integer( progress ) ) );
586
548
        }
587
549
 
588
550
        protected void finish( int action ) throws AbortImportException
606
568
                return _doit.getText( res );
607
569
        }
608
570
 
609
 
        /**
610
 
         * Should we skip a contact, given whether it exists or not and the current
611
 
         * merge setting?  This routine handles throwing up a prompt, if required.
612
 
         * @param contact_detail the display name of the contact
613
 
         * @param exists true if this contact matches one in the cache
614
 
         * @param merge_setting the merge setting to use
615
 
         * @return true if the contact should be skipped outright
616
 
         * @throws AbortImportException
617
 
         */
618
 
        synchronized private boolean shouldWeSkipContact( String contact_detail,
619
 
                boolean exists, int merge_setting ) throws AbortImportException
 
571
        protected boolean isImportRequired( ContactData contact )
 
572
                        throws AbortImportException, ContactNeedsMoreInfoException
 
573
        {
 
574
                checkAbort();
 
575
                return isImportRequired( contact, _merge_setting );
 
576
        }
 
577
 
 
578
        synchronized private boolean isImportRequired(
 
579
                ContactData contact, int merge_setting )
 
580
                throws AbortImportException, ContactNeedsMoreInfoException
620
581
        {
621
582
                _last_merge_decision = merge_setting;
622
583
 
 
584
                // create a cache identifier which we can use to detect if this contact
 
585
                // is valid for importing
 
586
                ContactsCache.CacheIdentifier identifier =
 
587
                        ContactsCache.createIdentifier( contact );
 
588
                if( identifier == null )
 
589
                        throw new ContactNeedsMoreInfoException();
 
590
 
623
591
                // handle special cases
624
592
                switch( merge_setting )
625
593
                {
626
594
                case Doit.ACTION_KEEP:
627
 
                        // if we are skipping on a duplicate, check for one
628
 
                        return exists;
 
595
                        // if we keep contacts on duplicate, we better check for one
 
596
                        return !_contactsCache.canLookup( identifier );
629
597
 
630
598
                case Doit.ACTION_PROMPT:
631
 
                        // if we are prompting on duplicate, then we can say that we won't
632
 
                        // skip if there isn't one
633
 
                        if( !exists ) return false;
 
599
                        // if we are prompting on duplicate, we better check for one and if
 
600
                        // the contact doesn'te exist, we want to import it
 
601
                        if( !_contactsCache.canLookup( identifier ) )
 
602
                                return true;
634
603
 
635
 
                        // ok, duplicate exists, so do prompt
 
604
                        // ok, it exists, so do prompt
636
605
                        _doit._handler.sendMessage( Message.obtain( _doit._handler,
637
 
                                Doit.MESSAGE_MERGEPROMPT, contact_detail ) );
 
606
                                Doit.MESSAGE_MERGEPROMPT, identifier.getDetail() ) );
638
607
                        try {
639
608
                                wait();
640
609
                        }
648
617
                                _merge_setting = _response;
649
618
 
650
619
                        // recurse, with our new merge setting
651
 
                        return shouldWeSkipContact( contact_detail, exists, _response );
 
620
                        return isImportRequired( contact, _response );
652
621
                }
653
622
 
654
 
                // for all other cases (either overwriting or merging) we don't skip
655
 
                return false;
 
623
                // for all other cases (either overwriting or merging) we will need the
 
624
                // imported data
 
625
                return true;
656
626
        }
657
627
 
658
628
        protected void skipContact() throws AbortImportException
659
629
        {
660
630
                checkAbort();
661
 
 
662
 
                // show that we're skipping a new contact
663
631
                _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTSKIPPED );
664
632
        }
665
633
 
668
636
        {
669
637
                checkAbort();
670
638
 
671
 
                // It is expected that we use contact.getCacheIdentifier() here. The
672
 
                // contact we are passed should have been successfully finalise()d,
673
 
                // which includes generating a valid cache identifier.
674
 
                ContactsCache.CacheIdentifier cache_identifier =
675
 
                        contact.getCacheIdentifier();
676
 
 
677
639
//              if( !showContinue( "====[ IMPORTING ]====\n: " + contact._name ) )
678
640
//                      finish( ACTION_ABORT );
679
641
 
680
 
                // attempt to lookup the id of an existing contact in the cache with
681
 
                // this contact data's cache identifier
682
 
                Long id = (Long)_contacts_cache.lookup( cache_identifier );
683
 
 
684
 
                // check to see if this contact should be skipped
685
 
                if( shouldWeSkipContact( cache_identifier.getDetail(), id != null,
686
 
                        _merge_setting ) )
 
642
                ContentValues values = new ContentValues();
 
643
                boolean uiInformed = false;
 
644
                Long id = null;
 
645
 
 
646
                // give the contact a chance to finalise it's data
 
647
                contact.finalise();
 
648
 
 
649
                // create something, from the contact data, that we can use to identify
 
650
                // a cache entry and attempt to lookup the id of an existing contact in
 
651
                // the cache with it
 
652
                ContactsCache.CacheIdentifier identifier =
 
653
                        ContactsCache.createIdentifier( contact );
 
654
                if( identifier != null ) id = (Long)_contactsCache.lookup( identifier );
 
655
 
 
656
                // does contact exist already?
 
657
                if( id != null )
687
658
                {
688
 
                        // show that we're skipping a contact
689
 
                        _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTSKIPPED );
690
 
                        return;
 
659
                        // should we skip this import altogether?
 
660
                        if( _last_merge_decision == Doit.ACTION_KEEP ) return;
 
661
 
 
662
                        // get contact's URI
 
663
                        Uri contactUri = ContentUris.withAppendedId(
 
664
                                Contacts.People.CONTENT_URI, id );
 
665
 
 
666
                        // should we destroy the existing contact before importing?
 
667
                        if( _last_merge_decision == Doit.ACTION_OVERWRITE )
 
668
                        {
 
669
                                // remove from device
 
670
                                _doit.getContentResolver().delete( contactUri, null, null );
 
671
 
 
672
                                // update cache
 
673
                                _contactsCache.removeLookup( identifier );
 
674
                                _contactsCache.removeAssociatedData( id );
 
675
 
 
676
                                // show that we're overwriting a contact
 
677
                                _doit._handler.sendEmptyMessage(
 
678
                                                Doit.MESSAGE_CONTACTOVERWRITTEN );
 
679
                                uiInformed = true;
 
680
 
 
681
                                // discard the contact id
 
682
                                id = null;
 
683
                        }
691
684
                }
692
685
 
693
 
                // if a contact exists, and we're overwriting, destroy the existing
694
 
                // contact before importing
695
 
                boolean contact_deleted = false;
696
 
                if( id != null && _last_merge_decision == Doit.ACTION_OVERWRITE )
 
686
                // if we don't have a contact id yet (or if we did, but we destroyed it
 
687
                // when we deleted the contact), we'll have to create a new contact
 
688
                if( id == null )
697
689
                {
698
 
                        contact_deleted = true;
 
690
                        // create a new contact
 
691
                        values.put( Contacts.People.NAME, contact._name );
 
692
                        Uri contactUri = _doit.getContentResolver().insert(
 
693
                                Contacts.People.CONTENT_URI, values );
 
694
                        id = ContentUris.parseId( contactUri );
 
695
                        if( id == null || id <= 0 )
 
696
                                showError( R.string.error_unabletoaddcontact );
699
697
 
700
 
                        // remove from device
701
 
                        _backend.deleteContact( id );
 
698
                        // try to add them to the "My Contacts" group
 
699
                        try {
 
700
                                Contacts.People.addToMyContactsGroup(
 
701
                                        _doit.getContentResolver(), id );
 
702
                        }
 
703
                        catch( IllegalStateException e ) {
 
704
                                // ignore any failure
 
705
                        }
702
706
 
703
707
                        // update cache
704
 
                        _contacts_cache.removeLookup( cache_identifier );
705
 
                        _contacts_cache.removeAssociatedData( id );
706
 
 
707
 
                        // show that we're overwriting a contact
708
 
                        _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTOVERWRITTEN );
709
 
 
710
 
                        // discard the contact id
711
 
                        id = null;
712
 
                }
713
 
 
714
 
                try {
715
 
                        // if we don't have a contact id yet (or we did, but we destroyed it
716
 
                        // when we deleted the contact), we'll have to create a new contact
717
 
                        if( id == null )
718
 
                        {
719
 
                                // create a new contact
720
 
                                id = _backend.addContact( contact._name );
721
 
 
722
 
                                // update cache
723
 
                                _contacts_cache.addLookup( cache_identifier, id );
724
 
 
725
 
                                // if we haven't already shown that we're overwriting a contact,
726
 
                                // show that we're creating a new contact
727
 
                                if( !contact_deleted )
728
 
                                        _doit._handler.sendEmptyMessage(
729
 
                                                Doit.MESSAGE_CONTACTCREATED );
 
708
                        _contactsCache.addLookup(
 
709
                                ContactsCache.createIdentifier( contact ), id );
 
710
 
 
711
                        // if we haven't already shown that we're overwriting a contact,
 
712
                        // show that we're creating a new contact
 
713
                        if( !uiInformed ) {
 
714
                                _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTCREATED );
 
715
                                uiInformed = true;
730
716
                        }
731
 
                        else
732
 
                                // show that we're merging with an existing contact
733
 
                                _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTMERGED );
734
 
 
735
 
                        // import contact parts
736
 
                        if( contact.hasNumbers() )
737
 
                                importContactPhones( id, contact.getNumbers() );
738
 
                        if( contact.hasEmails() )
739
 
                                importContactEmails( id, contact.getEmails() );
740
 
                        if( contact.hasAddresses() )
741
 
                                importContactAddresses( id, contact.getAddresses() );
742
 
                        if( contact.hasOrganisations() )
743
 
                                importContactOrganisations( id, contact.getOrganisations() );
744
 
                }
745
 
                catch( Backend.ContactCreationException e )
746
 
                {
747
 
                        showError( R.string.error_unabletoaddcontact );
748
 
                }
 
717
                }
 
718
 
 
719
                // if we haven't already shown that we're overwriting or creating a
 
720
                // contact show that we're merging a contact
 
721
                if( !uiInformed )
 
722
                        _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTMERGED );
 
723
 
 
724
                // import contact parts
 
725
                if( contact.hasNumbers() )
 
726
                        importContactPhones( id, contact.getNumbers() );
 
727
                if( contact.hasEmails() )
 
728
                        importContactEmails( id, contact.getEmails() );
 
729
                if( contact.hasAddresses() )
 
730
                        importContactAddresses( id, contact.getAddresses() );
 
731
                if( contact.hasOrganisations() )
 
732
                        importContactOrganisations( id, contact.getOrganisations() );
749
733
        }
750
734
 
751
735
        private void importContactPhones( Long id,
752
 
                HashMap< String, ContactData.PreferredDetail > datas )
753
 
                throws ContactCreationException
 
736
                        HashMap< String, ContactData.PreferredDetail > datas )
754
737
        {
 
738
                // get URI to contact's phones
 
739
                Uri contactPhonesUri = Uri.withAppendedPath(
 
740
                        ContentUris.withAppendedId( Contacts.People.CONTENT_URI, id ),
 
741
                        Contacts.People.Phones.CONTENT_DIRECTORY );
 
742
                Set< String > datasKeys = datas.keySet();
 
743
 
755
744
                // add phone numbers
756
 
                Set< String > datas_keys = datas.keySet();
757
 
                Iterator< String > i = datas_keys.iterator();
 
745
                Iterator< String > i = datasKeys.iterator();
758
746
                while( i.hasNext() ) {
759
747
                        String number = i.next();
760
748
                        ContactData.PreferredDetail data = datas.get( number );
766
754
                        // if the number exists at all, it doesn't need importing. Because
767
755
                        // of this, we also can't update the cache (which we don't need to
768
756
                        // anyway, so it's not a problem).
769
 
                        if( _contacts_cache.hasAssociatedNumber( id, number ) )
 
757
                        if( _contactsCache.hasAssociatedNumber( id, number ) )
770
758
                                continue;
771
759
 
772
760
                        // add phone number
773
 
                        _backend.addContactPhone( id, number, data );
 
761
                        ContentValues values = new ContentValues();
 
762
                        values.put( Contacts.Phones.TYPE, data.getType() );
 
763
                        values.put( Contacts.Phones.NUMBER, number );
 
764
                        if( data.isPreferred() )
 
765
                                values.put( Contacts.Phones.ISPRIMARY, 1 );
 
766
                        _doit.getContentResolver().insert( contactPhonesUri, values );
774
767
 
775
768
                        // and add this address to the cache to prevent a addition of
776
769
                        // duplicate date from another file
777
 
                        _contacts_cache.addAssociatedNumber( id, number );
 
770
                        _contactsCache.addAssociatedNumber( id, number );
778
771
                }
779
772
        }
780
773
 
781
774
        private void importContactEmails( Long id,
782
 
                HashMap< String, ContactData.PreferredDetail > datas )
783
 
                throws ContactCreationException
 
775
                        HashMap< String, ContactData.PreferredDetail > datas )
784
776
        {
 
777
                // get URI to contact's contact methods
 
778
                Uri contactContactMethodsUri = Uri.withAppendedPath(
 
779
                        ContentUris.withAppendedId( Contacts.People.CONTENT_URI, id ),
 
780
                        Contacts.People.ContactMethods.CONTENT_DIRECTORY );
 
781
                Set< String > datasKeys = datas.keySet();
 
782
 
785
783
                // add email addresses
786
 
                Set< String > datas_keys = datas.keySet();
787
 
                Iterator< String > i = datas_keys.iterator();
 
784
                Iterator< String > i = datasKeys.iterator();
788
785
                while( i.hasNext() ) {
789
786
                        String email = i.next();
790
787
                        ContactData.PreferredDetail data = datas.get( email );
791
788
 
792
789
                        // we don't want to add this email address if it exists already or
793
790
                        // we would introduce duplicates.
794
 
                        if( _contacts_cache.hasAssociatedEmail( id, email ) )
 
791
                        if( _contactsCache.hasAssociatedEmail( id, email ) )
795
792
                                continue;
796
793
 
797
794
                        // add phone number
798
 
                        _backend.addContactEmail( id, email, data );
 
795
                        ContentValues values = new ContentValues();
 
796
                        values.put( Contacts.ContactMethods.KIND, Contacts.KIND_EMAIL );
 
797
                        values.put( Contacts.ContactMethods.DATA, email );
 
798
                        values.put( Contacts.ContactMethods.TYPE, data.getType() );
 
799
                        if( data.isPreferred() )
 
800
                                values.put( Contacts.ContactMethods.ISPRIMARY, 1 );
 
801
                        _doit.getContentResolver().insert( contactContactMethodsUri,
 
802
                                values );
799
803
 
800
804
                        // and add this address to the cache to prevent a addition of
801
805
                        // duplicate date from another file
802
 
                        _contacts_cache.addAssociatedEmail( id, email );
 
806
                        _contactsCache.addAssociatedEmail( id, email );
803
807
                }
804
808
        }
805
809
 
806
810
        private void importContactAddresses( Long id,
807
811
                HashMap< String, ContactData.TypeDetail > datas )
808
 
                throws ContactCreationException
809
812
        {
 
813
                // get URI to contact's contact methods
 
814
                Uri contactContactMethodsUri = Uri.withAppendedPath(
 
815
                        ContentUris.withAppendedId( Contacts.People.CONTENT_URI, id ),
 
816
                        Contacts.People.ContactMethods.CONTENT_DIRECTORY );
 
817
 
810
818
                // add addresses
811
 
                Set< String > datas_keys = datas.keySet();
812
 
                Iterator< String > i = datas_keys.iterator();
 
819
                Set< String > datasKeys = datas.keySet();
 
820
                Iterator< String > i = datasKeys.iterator();
813
821
                while( i.hasNext() ) {
814
822
                        String address = i.next();
815
823
                        ContactData.TypeDetail data = datas.get( address );
816
824
 
817
825
                        // we don't want to add this address if it exists already or we
818
826
                        // would introduce duplicates
819
 
                        if( _contacts_cache.hasAssociatedAddress( id, address ) )
 
827
                        if( _contactsCache.hasAssociatedAddress( id, address ) )
820
828
                                continue;
821
829
 
822
830
                        // add postal address
823
 
                        _backend.addContactAddresses( id, address, data );
 
831
                        ContentValues values = new ContentValues();
 
832
                        values.put( Contacts.ContactMethods.KIND, Contacts.KIND_POSTAL );
 
833
                        values.put( Contacts.ContactMethods.DATA, address );
 
834
                        values.put( Contacts.ContactMethods.TYPE, data.getType() );
 
835
                        _doit.getContentResolver().insert( contactContactMethodsUri,
 
836
                                values );
824
837
 
825
838
                        // and add this address to the cache to prevent a addition of
826
839
                        // duplicate date from another file
827
 
                        _contacts_cache.addAssociatedAddress( id, address );
 
840
                        _contactsCache.addAssociatedAddress( id, address );
828
841
                }
829
842
        }
830
843
 
831
844
        private void importContactOrganisations( Long id,
832
845
                HashMap< String, ContactData.ExtraDetail > datas )
833
 
                throws ContactCreationException
834
846
        {
835
847
                // add addresses
836
 
                Set< String > datas_keys = datas.keySet();
837
 
                Iterator< String > i = datas_keys.iterator();
 
848
                Set< String > datasKeys = datas.keySet();
 
849
                Iterator< String > i = datasKeys.iterator();
838
850
                while( i.hasNext() ) {
839
851
                        String organisation = i.next();
840
852
                        ContactData.ExtraDetail data = datas.get( organisation );
841
853
 
842
854
                        // we don't want to add this address if it exists already or we
843
855
                        // would introduce duplicates
844
 
                        if( _contacts_cache.hasAssociatedOrganisation( id, organisation ) )
 
856
                        if( _contactsCache.hasAssociatedOrganisation( id, organisation ) )
845
857
                                continue;
846
858
 
847
859
                        // add organisation address
848
 
                        _backend.addContactOrganisation( id, organisation, data );
 
860
                        ContentValues values = new ContentValues();
 
861
                        values.put( Contacts.Organizations.PERSON_ID, id );
 
862
                        values.put( Contacts.Organizations.COMPANY, organisation );
 
863
                        values.put( Contacts.ContactMethods.TYPE,
 
864
                                Contacts.OrganizationColumns.TYPE_WORK );
 
865
                        if( data.getExtra() != null )
 
866
                                values.put( Contacts.Organizations.TITLE, data.getExtra() );
 
867
                        _doit.getContentResolver().insert(
 
868
                                Contacts.Organizations.CONTENT_URI, values );
849
869
 
850
870
                        // and add this address to the cache to prevent a addition of
851
871
                        // duplicate date from another file
852
 
                        _contacts_cache.addAssociatedOrganisation( id, organisation );
 
872
                        _contactsCache.addAssociatedOrganisation( id, organisation );
853
873
                }
854
874
        }
855
875