/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-30 15:33:01 UTC
  • Revision ID: edam@waxworlds.org-20110530153301-oor6ci9b3hf9clul
- refactored some code to do with how contacts are imported
- Vcards (and ContactData) instances now generate a CacheIdentifier when they are finalised so that ContactData instances that do not have enough information to identify them can be discovered then
- importContact() now calls the private method checkForDuplicate(), renamed from isImportRequired(), and return if it is not
- importContact() and checkForDuplicate() now use the ContactData's generated CacheIdentifier

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
{
55
56
        private boolean _abort = false;
56
57
        private boolean _is_finished = false;
57
58
        private ContactsCache _contacts_cache = null;
58
 
        private Backend _backend = null;
59
59
 
60
60
        /**
61
61
         * Data about a contact
62
62
         */
63
63
        public class ContactData
64
64
        {
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
65
                class TypeDetail
73
66
                {
74
67
                        protected int _type;
131
124
 
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
 
                protected HashSet< String > _notes = null;
145
136
 
146
137
                private ContactsCache.CacheIdentifier _cache_identifier = null;
147
138
 
184
175
                                        new ExtraDetail( 0, false, title ) );
185
176
 
186
177
                        // if this is the first organisation added, or it's a preferred
187
 
                        // organisation and the current primary organisation isn't, then
188
 
                        // record this as the primary organisation.
 
178
                        // organisation and a previous organisation wasn't, then remember
 
179
                        // that this is the "primary organisation".
189
180
                        if( _primary_organisation == null ||
190
181
                                ( is_preferred && !_primary_organisation_is_preferred ) )
191
182
                        {
232
223
                                _numbers.put( number,
233
224
                                        new PreferredDetail( type, false ) );
234
225
 
235
 
                        final Set< Integer > non_voice_types = new HashSet< Integer >(
236
 
                                Arrays.asList( TYPE_FAX_HOME, TYPE_FAX_WORK, TYPE_PAGER ) );
237
 
 
238
226
                        // if this is the first number added, or it's a preferred number
239
 
                        // and the current primary number isn't, or this number is on equal
240
 
                        // standing with the primary number in terms of preference and it is
241
 
                        // a voice number and the primary number isn't, then record this as
242
 
                        // the primary number.
 
227
                        // and a previous number wasn't, then remember that this is the
 
228
                        // "primary number".
243
229
                        if( _primary_number == null ||
244
 
                                ( is_preferred && !_primary_number_is_preferred ) ||
245
 
                                ( is_preferred == _primary_number_is_preferred &&
246
 
                                        !non_voice_types.contains( type ) &&
247
 
                                        non_voice_types.contains( _primary_number_type ) ) )
 
230
                                ( is_preferred && !_primary_number_is_preferred ) )
248
231
                        {
249
232
                                _primary_number = number;
250
 
                                _primary_number_type = type;
251
233
                                _primary_number_is_preferred = is_preferred;
252
234
                        }
253
235
                }
278
260
                        email = sanitisesEmailAddress( email );
279
261
                        if( email == null )
280
262
                        {
281
 
                                // TODO: warn that an imported email address is being ignored
 
263
                                // TODO: warn that an imported email addtrss is being ignored
282
264
                                return;
283
265
                        }
284
266
 
289
271
                        if( !_emails.containsKey( email ) )
290
272
                                _emails.put( email, new PreferredDetail( type, false ) );
291
273
 
292
 
                        // if this is the first email added, or it's a preferred email and
293
 
                        // the current primary organisation isn't, then record this as the
294
 
                        // primary email.
 
274
                        // if this is the first email added, or it's a preferred email
 
275
                        // and a previous email wasn't, then remember that this is the
 
276
                        // "primary email".
295
277
                        if( _primary_email == null ||
296
278
                                ( is_preferred && !_primary_email_is_preferred ) )
297
279
                        {
345
327
                        return _addresses;
346
328
                }
347
329
 
348
 
                protected void addNote( String note )
349
 
                {
350
 
                        if( _notes == null ) _notes = new HashSet< String >();
351
 
                        if( !_notes.contains( note ) )
352
 
                                _notes.add( note );
353
 
                }
354
 
 
355
 
                public boolean hasNotes()
356
 
                {
357
 
                        return _notes != null && _notes.size() > 0;
358
 
                }
359
 
 
360
 
                public HashSet< String > getNotes()
361
 
                {
362
 
                        return _notes;
363
 
                }
364
 
 
365
330
                protected void finalise()
366
331
                        throws ContactNotIdentifiableException
367
332
                {
390
355
 
391
356
                        // create a cache identifier from this contact data, which can be
392
357
                        // used to look-up an existing contact
393
 
                        _cache_identifier = ContactsCache.CacheIdentifier.factory( this );
 
358
                        _cache_identifier = ContactsCache.createIdentifier( this );
394
359
                        if( _cache_identifier == null )
395
360
                                throw new ContactNotIdentifiableException();
396
361
                }
417
382
                        Matcher m = p.matcher( email );
418
383
                        if( m.matches() ) {
419
384
                                String[] bits = email.split( "@" );
420
 
                                return bits[ 0 ] + "@" + bits[ 1 ].toLowerCase( Locale.US );
 
385
                                return bits[ 0 ] + "@" + bits[ 1 ].toLowerCase();
421
386
                        }
422
387
                        return null;
423
388
                }
442
407
                        // update UI
443
408
                        setProgressMessage( R.string.doit_caching );
444
409
 
445
 
                        // create the appropriate backend
446
 
                        if( Integer.parseInt( android.os.Build.VERSION.SDK ) >= 5 )
447
 
                                _backend = new ContactsContractBackend( _doit );
448
 
                        else
449
 
                                _backend = new ContactsBackend( _doit );
450
 
 
451
 
                        // create a cache of existing contacts and populate it
 
410
                        // build a cache of existing contacts
452
411
                        _contacts_cache = new ContactsCache();
453
 
                        _backend.populateCache( _contacts_cache );
 
412
                        _contacts_cache.buildCache( _doit );
454
413
 
455
414
                        // do the import
456
415
                        onImport();
583
542
                checkAbort();
584
543
                _doit._handler.sendMessage( Message.obtain(
585
544
                        _doit._handler, Doit.MESSAGE_SETMAXPROGRESS,
586
 
                        Integer.valueOf( max_progress ) ) );
 
545
                        new Integer( max_progress ) ) );
587
546
        }
588
547
 
589
548
        protected void setTmpProgress( int tmp_progress )
592
551
                checkAbort();
593
552
                _doit._handler.sendMessage( Message.obtain(
594
553
                        _doit._handler, Doit.MESSAGE_SETTMPPROGRESS,
595
 
                        Integer.valueOf( tmp_progress ) ) );
 
554
                        new Integer( tmp_progress ) ) );
596
555
        }
597
556
 
598
557
        protected void setProgress( int progress ) throws AbortImportException
600
559
                checkAbort();
601
560
                _doit._handler.sendMessage( Message.obtain(
602
561
                        _doit._handler, Doit.MESSAGE_SETPROGRESS,
603
 
                        Integer.valueOf( progress ) ) );
 
562
                        new Integer( progress ) ) );
604
563
        }
605
564
 
606
565
        protected void finish( int action ) throws AbortImportException
624
583
                return _doit.getText( res );
625
584
        }
626
585
 
627
 
        /**
628
 
         * Should we skip a contact, given whether it exists or not and the current
629
 
         * merge setting?  This routine handles throwing up a prompt, if required.
630
 
         * @param contact_detail the display name of the contact
631
 
         * @param exists true if this contact matches one in the cache
632
 
         * @param merge_setting the merge setting to use
633
 
         * @return true if the contact should be skipped outright
634
 
         * @throws AbortImportException
635
 
         */
636
 
        synchronized private boolean shouldWeSkipContact( String contact_detail,
637
 
                boolean exists, int merge_setting ) throws AbortImportException
 
586
        synchronized private boolean checkForDuplicate(
 
587
                ContactsCache.CacheIdentifier cache_identifier, int merge_setting )
 
588
                throws AbortImportException
638
589
        {
639
590
                _last_merge_decision = merge_setting;
640
591
 
 
592
                // it is ok to use contact.getCacheIdentifier(). The contact has already
 
593
                // been finalised, which means a valid cache identifier will have been
 
594
                // created for it (or it would have been skipped)
 
595
 
641
596
                // handle special cases
642
597
                switch( merge_setting )
643
598
                {
644
599
                case Doit.ACTION_KEEP:
645
 
                        // if we are skipping on a duplicate, check for one
646
 
                        return exists;
 
600
                        // if we keep contacts on duplicate, we better check for one
 
601
                        return !_contacts_cache.canLookup( cache_identifier );
647
602
 
648
603
                case Doit.ACTION_PROMPT:
649
 
                        // if we are prompting on duplicate, then we can say that we won't
650
 
                        // skip if there isn't one
651
 
                        if( !exists ) return false;
 
604
                        // if we are prompting on duplicate, we better check for one and if
 
605
                        // the contact doesn'te exist, we want to import it
 
606
                        if( !_contacts_cache.canLookup( cache_identifier ) )
 
607
                                return true;
652
608
 
653
 
                        // ok, duplicate exists, so do prompt
 
609
                        // ok, it exists, so do prompt
654
610
                        _doit._handler.sendMessage( Message.obtain( _doit._handler,
655
 
                                Doit.MESSAGE_MERGEPROMPT, contact_detail ) );
 
611
                                Doit.MESSAGE_MERGEPROMPT, cache_identifier.getDetail() ) );
656
612
                        try {
657
613
                                wait();
658
614
                        }
666
622
                                _merge_setting = _response;
667
623
 
668
624
                        // recurse, with our new merge setting
669
 
                        return shouldWeSkipContact( contact_detail, exists, _response );
 
625
                        return checkForDuplicate( cache_identifier, _response );
670
626
                }
671
627
 
672
 
                // for all other cases (either overwriting or merging) we don't skip
673
 
                return false;
 
628
                // for all other cases (either overwriting or merging) we will need the
 
629
                // imported data
 
630
                return true;
674
631
        }
675
632
 
676
633
        protected void skipContact() throws AbortImportException
677
634
        {
678
635
                checkAbort();
679
 
 
680
 
                // show that we're skipping a new contact
681
636
                _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTSKIPPED );
682
637
        }
683
638
 
692
647
                ContactsCache.CacheIdentifier cache_identifier =
693
648
                        contact.getCacheIdentifier();
694
649
 
 
650
                // check to see if this contact is a duplicate and should be skipped
 
651
                if( !checkForDuplicate( cache_identifier, _merge_setting ) ) {
 
652
                        skipContact();
 
653
                        return;
 
654
                }
 
655
 
695
656
//              if( !showContinue( "====[ IMPORTING ]====\n: " + contact._name ) )
696
657
//                      finish( ACTION_ABORT );
697
658
 
 
659
                // keep track of whether we've informed the UI of what we're doing
 
660
                boolean ui_informed = false;
 
661
 
698
662
                // attempt to lookup the id of an existing contact in the cache with
699
663
                // this contact data's cache identifier
700
664
                Long id = (Long)_contacts_cache.lookup( cache_identifier );
701
665
 
702
 
                // check to see if this contact should be skipped
703
 
                if( shouldWeSkipContact( cache_identifier.getDetail(), id != null,
704
 
                        _merge_setting ) )
 
666
                // does contact exist already?
 
667
                if( id != null )
705
668
                {
706
 
                        // show that we're skipping a contact
707
 
                        _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTSKIPPED );
708
 
                        return;
 
669
                        // should we skip this import altogether?
 
670
                        if( _last_merge_decision == Doit.ACTION_KEEP ) return;
 
671
 
 
672
                        // get contact's URI
 
673
                        Uri contact_uri = ContentUris.withAppendedId(
 
674
                                Contacts.People.CONTENT_URI, id );
 
675
 
 
676
                        // should we destroy the existing contact before importing?
 
677
                        if( _last_merge_decision == Doit.ACTION_OVERWRITE )
 
678
                        {
 
679
                                // remove from device
 
680
                                _doit.getContentResolver().delete( contact_uri, null, null );
 
681
 
 
682
                                // update cache
 
683
                                _contacts_cache.removeLookup( contact.getCacheIdentifier() );
 
684
                                _contacts_cache.removeAssociatedData( id );
 
685
 
 
686
                                // show that we're overwriting a contact
 
687
                                _doit._handler.sendEmptyMessage(
 
688
                                                Doit.MESSAGE_CONTACTOVERWRITTEN );
 
689
                                ui_informed = true;
 
690
 
 
691
                                // discard the contact id
 
692
                                id = null;
 
693
                        }
709
694
                }
710
695
 
711
 
                // if a contact exists, and we're overwriting, destroy the existing
712
 
                // contact before importing
713
 
                boolean contact_deleted = false;
714
 
                if( id != null && _last_merge_decision == Doit.ACTION_OVERWRITE )
 
696
                // if we don't have a contact id yet (or if we did, but we destroyed it
 
697
                // when we deleted the contact), we'll have to create a new contact
 
698
                if( id == null )
715
699
                {
716
 
                        contact_deleted = true;
 
700
                        // create a new contact
 
701
                        ContentValues values = new ContentValues();
 
702
                        values.put( Contacts.People.NAME, contact._name );
 
703
                        Uri contact_uri = _doit.getContentResolver().insert(
 
704
                                Contacts.People.CONTENT_URI, values );
 
705
                        id = ContentUris.parseId( contact_uri );
 
706
                        if( id == null || id <= 0 )
 
707
                                showError( R.string.error_unabletoaddcontact );
717
708
 
718
 
                        // remove from device
719
 
                        _backend.deleteContact( id );
 
709
                        // try to add them to the "My Contacts" group
 
710
                        try {
 
711
                                Contacts.People.addToMyContactsGroup(
 
712
                                        _doit.getContentResolver(), id );
 
713
                        }
 
714
                        catch( IllegalStateException e ) {
 
715
                                // ignore any failure
 
716
                        }
720
717
 
721
718
                        // update cache
722
 
                        _contacts_cache.removeLookup( cache_identifier );
723
 
                        _contacts_cache.removeAssociatedData( id );
724
 
 
725
 
                        // show that we're overwriting a contact
726
 
                        _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTOVERWRITTEN );
727
 
 
728
 
                        // discard the contact id
729
 
                        id = null;
730
 
                }
731
 
 
732
 
                try {
733
 
                        // if we don't have a contact id yet (or we did, but we destroyed it
734
 
                        // when we deleted the contact), we'll have to create a new contact
735
 
                        if( id == null )
736
 
                        {
737
 
                                // create a new contact
738
 
                                id = _backend.addContact( contact._name );
739
 
 
740
 
                                // update cache
741
 
                                _contacts_cache.addLookup( cache_identifier, id );
742
 
 
743
 
                                // if we haven't already shown that we're overwriting a contact,
744
 
                                // show that we're creating a new contact
745
 
                                if( !contact_deleted )
746
 
                                        _doit._handler.sendEmptyMessage(
747
 
                                                Doit.MESSAGE_CONTACTCREATED );
 
719
                        _contacts_cache.addLookup(
 
720
                                ContactsCache.createIdentifier( contact ), id );
 
721
 
 
722
                        // if we haven't already shown that we're overwriting a contact,
 
723
                        // show that we're creating a new contact
 
724
                        if( !ui_informed ) {
 
725
                                _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTCREATED );
 
726
                                ui_informed = true;
748
727
                        }
749
 
                        else
750
 
                                // show that we're merging with an existing contact
751
 
                                _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTMERGED );
752
 
 
753
 
                        // import contact parts
754
 
                        if( contact.hasNumbers() )
755
 
                                importContactPhones( id, contact.getNumbers() );
756
 
                        if( contact.hasEmails() )
757
 
                                importContactEmails( id, contact.getEmails() );
758
 
                        if( contact.hasAddresses() )
759
 
                                importContactAddresses( id, contact.getAddresses() );
760
 
                        if( contact.hasOrganisations() )
761
 
                                importContactOrganisations( id, contact.getOrganisations() );
762
 
                        if( contact.hasNotes() )
763
 
                                importContactNotes( id, contact.getNotes() );
764
 
                }
765
 
                catch( Backend.ContactCreationException e )
766
 
                {
767
 
                        showError( R.string.error_unabletoaddcontact );
768
 
                }
 
728
                }
 
729
 
 
730
                // if we haven't already shown that we're overwriting or creating a
 
731
                // contact, show that we're merging a contact
 
732
                if( !ui_informed )
 
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() );
769
744
        }
770
745
 
771
746
        private void importContactPhones( Long id,
772
 
                HashMap< String, ContactData.PreferredDetail > datas )
773
 
                throws ContactCreationException
 
747
                        HashMap< String, ContactData.PreferredDetail > datas )
774
748
        {
 
749
                // get URI to contact's phones
 
750
                Uri contact_phones_uri = Uri.withAppendedPath(
 
751
                        ContentUris.withAppendedId( Contacts.People.CONTENT_URI, id ),
 
752
                        Contacts.People.Phones.CONTENT_DIRECTORY );
 
753
                Set< String > datas_keys = datas.keySet();
 
754
 
775
755
                // add phone numbers
776
 
                Set< String > datas_keys = datas.keySet();
777
756
                Iterator< String > i = datas_keys.iterator();
778
757
                while( i.hasNext() ) {
779
758
                        String number = i.next();
790
769
                                continue;
791
770
 
792
771
                        // add phone number
793
 
                        _backend.addContactPhone( id, number, data );
 
772
                        ContentValues values = new ContentValues();
 
773
                        values.put( Contacts.Phones.TYPE, data.getType() );
 
774
                        values.put( Contacts.Phones.NUMBER, number );
 
775
                        if( data.isPreferred() )
 
776
                                values.put( Contacts.Phones.ISPRIMARY, 1 );
 
777
                        _doit.getContentResolver().insert( contact_phones_uri, values );
794
778
 
795
779
                        // and add this address to the cache to prevent a addition of
796
780
                        // duplicate date from another file
799
783
        }
800
784
 
801
785
        private void importContactEmails( Long id,
802
 
                HashMap< String, ContactData.PreferredDetail > datas )
803
 
                throws ContactCreationException
 
786
                        HashMap< String, ContactData.PreferredDetail > datas )
804
787
        {
 
788
                // get URI to contact's contact methods
 
789
                Uri contact_contact_methods_uri = Uri.withAppendedPath(
 
790
                        ContentUris.withAppendedId( Contacts.People.CONTENT_URI, id ),
 
791
                        Contacts.People.ContactMethods.CONTENT_DIRECTORY );
 
792
                Set< String > datas_keys = datas.keySet();
 
793
 
805
794
                // add email addresses
806
 
                Set< String > datas_keys = datas.keySet();
807
795
                Iterator< String > i = datas_keys.iterator();
808
796
                while( i.hasNext() ) {
809
797
                        String email = i.next();
815
803
                                continue;
816
804
 
817
805
                        // add phone number
818
 
                        _backend.addContactEmail( id, email, data );
 
806
                        ContentValues values = new ContentValues();
 
807
                        values.put( Contacts.ContactMethods.KIND, Contacts.KIND_EMAIL );
 
808
                        values.put( Contacts.ContactMethods.DATA, email );
 
809
                        values.put( Contacts.ContactMethods.TYPE, data.getType() );
 
810
                        if( data.isPreferred() )
 
811
                                values.put( Contacts.ContactMethods.ISPRIMARY, 1 );
 
812
                        _doit.getContentResolver().insert( contact_contact_methods_uri,
 
813
                                values );
819
814
 
820
815
                        // and add this address to the cache to prevent a addition of
821
816
                        // duplicate date from another file
825
820
 
826
821
        private void importContactAddresses( Long id,
827
822
                HashMap< String, ContactData.TypeDetail > datas )
828
 
                throws ContactCreationException
829
823
        {
 
824
                // get URI to contact's contact methods
 
825
                Uri contact_contact_methods_uri = Uri.withAppendedPath(
 
826
                        ContentUris.withAppendedId( Contacts.People.CONTENT_URI, id ),
 
827
                        Contacts.People.ContactMethods.CONTENT_DIRECTORY );
 
828
 
830
829
                // add addresses
831
830
                Set< String > datas_keys = datas.keySet();
832
831
                Iterator< String > i = datas_keys.iterator();
840
839
                                continue;
841
840
 
842
841
                        // add postal address
843
 
                        _backend.addContactAddresses( id, address, data );
 
842
                        ContentValues values = new ContentValues();
 
843
                        values.put( Contacts.ContactMethods.KIND, Contacts.KIND_POSTAL );
 
844
                        values.put( Contacts.ContactMethods.DATA, address );
 
845
                        values.put( Contacts.ContactMethods.TYPE, data.getType() );
 
846
                        _doit.getContentResolver().insert( contact_contact_methods_uri,
 
847
                                values );
844
848
 
845
849
                        // and add this address to the cache to prevent a addition of
846
850
                        // duplicate date from another file
850
854
 
851
855
        private void importContactOrganisations( Long id,
852
856
                HashMap< String, ContactData.ExtraDetail > datas )
853
 
                throws ContactCreationException
854
857
        {
855
858
                // add addresses
856
859
                Set< String > datas_keys = datas.keySet();
865
868
                                continue;
866
869
 
867
870
                        // add organisation address
868
 
                        _backend.addContactOrganisation( id, organisation, data );
 
871
                        ContentValues values = new ContentValues();
 
872
                        values.put( Contacts.Organizations.PERSON_ID, id );
 
873
                        values.put( Contacts.Organizations.COMPANY, organisation );
 
874
                        values.put( Contacts.ContactMethods.TYPE,
 
875
                                Contacts.OrganizationColumns.TYPE_WORK );
 
876
                        if( data.getExtra() != null )
 
877
                                values.put( Contacts.Organizations.TITLE, data.getExtra() );
 
878
                        _doit.getContentResolver().insert(
 
879
                                Contacts.Organizations.CONTENT_URI, values );
869
880
 
870
881
                        // and add this address to the cache to prevent a addition of
871
882
                        // duplicate date from another file
873
884
                }
874
885
        }
875
886
 
876
 
        private void importContactNotes( Long id,
877
 
                HashSet< String > datas )
878
 
                throws ContactCreationException
879
 
        {
880
 
                // add notes
881
 
                Iterator< String > i = datas.iterator();
882
 
                while( i.hasNext() ) {
883
 
                        String note = i.next();
884
 
 
885
 
                        // we don't want to add this note if it exists already or we would
886
 
                        // introduce duplicates
887
 
                        if( _contacts_cache.hasAssociatedNote( id, note ) )
888
 
                                continue;
889
 
 
890
 
                        // add note
891
 
                        _backend.addContactNote( id, note );
892
 
 
893
 
                        // and add this note to the cache to prevent a addition of duplicate
894
 
                        // date from another file
895
 
                        _contacts_cache.addAssociatedNote( id, note );
896
 
                }
897
 
 
898
 
        }
899
 
 
900
887
        synchronized protected void checkAbort() throws AbortImportException
901
888
        {
902
889
                if( _abort ) {