/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 14:04:51 UTC
  • Revision ID: edam@waxworlds.org-20110530140451-d99fy3zoi6zq1jf2
- renamed VCFImporter to VcardImporter and VCard to Vcard

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
 
 
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
 
396
                        // build a cache of existing contacts
434
397
                        _contacts_cache = new ContactsCache();
435
 
                        _backend.populateCache( _contacts_cache );
 
398
                        _contacts_cache.buildCache( _doit );
436
399
 
437
400
                        // do the import
438
401
                        onImport();
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( max_progress ) ) );
569
532
        }
570
533
 
571
534
        protected void setTmpProgress( int tmp_progress )
574
537
                checkAbort();
575
538
                _doit._handler.sendMessage( Message.obtain(
576
539
                        _doit._handler, Doit.MESSAGE_SETTMPPROGRESS,
577
 
                        Integer.valueOf( tmp_progress ) ) );
 
540
                        new Integer( tmp_progress ) ) );
578
541
        }
579
542
 
580
543
        protected void setProgress( int progress ) throws AbortImportException
582
545
                checkAbort();
583
546
                _doit._handler.sendMessage( Message.obtain(
584
547
                        _doit._handler, Doit.MESSAGE_SETPROGRESS,
585
 
                        Integer.valueOf( progress ) ) );
 
548
                        new Integer( progress ) ) );
586
549
        }
587
550
 
588
551
        protected void finish( int action ) throws AbortImportException
606
569
                return _doit.getText( res );
607
570
        }
608
571
 
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
 
572
        protected boolean isImportRequired( ContactData contact )
 
573
                        throws AbortImportException, ContactNeedsMoreInfoException
 
574
        {
 
575
                checkAbort();
 
576
                return isImportRequired( contact, _merge_setting );
 
577
        }
 
578
 
 
579
        synchronized private boolean isImportRequired(
 
580
                ContactData contact, int merge_setting )
 
581
                throws AbortImportException, ContactNeedsMoreInfoException
620
582
        {
621
583
                _last_merge_decision = merge_setting;
622
584
 
 
585
                // create a cache identifier which we can use to detect if this contact
 
586
                // is valid for importing
 
587
                ContactsCache.CacheIdentifier identifier =
 
588
                        ContactsCache.createIdentifier( contact );
 
589
                if( identifier == null )
 
590
                        throw new ContactNeedsMoreInfoException();
 
591
 
623
592
                // handle special cases
624
593
                switch( merge_setting )
625
594
                {
626
595
                case Doit.ACTION_KEEP:
627
 
                        // if we are skipping on a duplicate, check for one
628
 
                        return exists;
 
596
                        // if we keep contacts on duplicate, we better check for one
 
597
                        return !_contacts_cache.canLookup( identifier );
629
598
 
630
599
                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;
 
600
                        // if we are prompting on duplicate, we better check for one and if
 
601
                        // the contact doesn'te exist, we want to import it
 
602
                        if( !_contacts_cache.canLookup( identifier ) )
 
603
                                return true;
634
604
 
635
 
                        // ok, duplicate exists, so do prompt
 
605
                        // ok, it exists, so do prompt
636
606
                        _doit._handler.sendMessage( Message.obtain( _doit._handler,
637
 
                                Doit.MESSAGE_MERGEPROMPT, contact_detail ) );
 
607
                                Doit.MESSAGE_MERGEPROMPT, identifier.getDetail() ) );
638
608
                        try {
639
609
                                wait();
640
610
                        }
648
618
                                _merge_setting = _response;
649
619
 
650
620
                        // recurse, with our new merge setting
651
 
                        return shouldWeSkipContact( contact_detail, exists, _response );
 
621
                        return isImportRequired( contact, _response );
652
622
                }
653
623
 
654
 
                // for all other cases (either overwriting or merging) we don't skip
655
 
                return false;
 
624
                // for all other cases (either overwriting or merging) we will need the
 
625
                // imported data
 
626
                return true;
656
627
        }
657
628
 
658
629
        protected void skipContact() throws AbortImportException
659
630
        {
660
631
                checkAbort();
661
 
 
662
 
                // show that we're skipping a new contact
663
632
                _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTSKIPPED );
664
633
        }
665
634
 
668
637
        {
669
638
                checkAbort();
670
639
 
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
640
//              if( !showContinue( "====[ IMPORTING ]====\n: " + contact._name ) )
678
641
//                      finish( ACTION_ABORT );
679
642
 
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 ) )
 
643
                ContentValues values = new ContentValues();
 
644
                boolean ui_informed = false;
 
645
                Long id = null;
 
646
 
 
647
                // give the contact a chance to finalise it's data
 
648
                contact.finalise();
 
649
 
 
650
                // create something, from the contact data, that we can use to identify
 
651
                // a cache entry and attempt to lookup the id of an existing contact in
 
652
                // the cache with it
 
653
                ContactsCache.CacheIdentifier identifier =
 
654
                        ContactsCache.createIdentifier( contact );
 
655
                if( identifier != null ) id = (Long)_contacts_cache.lookup( identifier );
 
656
 
 
657
                // does contact exist already?
 
658
                if( id != null )
687
659
                {
688
 
                        // show that we're skipping a contact
689
 
                        _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTSKIPPED );
690
 
                        return;
 
660
                        // should we skip this import altogether?
 
661
                        if( _last_merge_decision == Doit.ACTION_KEEP ) return;
 
662
 
 
663
                        // get contact's URI
 
664
                        Uri contact_uri = ContentUris.withAppendedId(
 
665
                                Contacts.People.CONTENT_URI, id );
 
666
 
 
667
                        // should we destroy the existing contact before importing?
 
668
                        if( _last_merge_decision == Doit.ACTION_OVERWRITE )
 
669
                        {
 
670
                                // remove from device
 
671
                                _doit.getContentResolver().delete( contact_uri, null, null );
 
672
 
 
673
                                // update cache
 
674
                                _contacts_cache.removeLookup( identifier );
 
675
                                _contacts_cache.removeAssociatedData( id );
 
676
 
 
677
                                // show that we're overwriting a contact
 
678
                                _doit._handler.sendEmptyMessage(
 
679
                                                Doit.MESSAGE_CONTACTOVERWRITTEN );
 
680
                                ui_informed = true;
 
681
 
 
682
                                // discard the contact id
 
683
                                id = null;
 
684
                        }
691
685
                }
692
686
 
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 )
 
687
                // if we don't have a contact id yet (or if we did, but we destroyed it
 
688
                // when we deleted the contact), we'll have to create a new contact
 
689
                if( id == null )
697
690
                {
698
 
                        contact_deleted = true;
 
691
                        // create a new contact
 
692
                        values.put( Contacts.People.NAME, contact._name );
 
693
                        Uri contact_uri = _doit.getContentResolver().insert(
 
694
                                Contacts.People.CONTENT_URI, values );
 
695
                        id = ContentUris.parseId( contact_uri );
 
696
                        if( id == null || id <= 0 )
 
697
                                showError( R.string.error_unabletoaddcontact );
699
698
 
700
 
                        // remove from device
701
 
                        _backend.deleteContact( id );
 
699
                        // try to add them to the "My Contacts" group
 
700
                        try {
 
701
                                Contacts.People.addToMyContactsGroup(
 
702
                                        _doit.getContentResolver(), id );
 
703
                        }
 
704
                        catch( IllegalStateException e ) {
 
705
                                // ignore any failure
 
706
                        }
702
707
 
703
708
                        // 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 );
 
709
                        _contacts_cache.addLookup(
 
710
                                ContactsCache.createIdentifier( contact ), id );
 
711
 
 
712
                        // if we haven't already shown that we're overwriting a contact,
 
713
                        // show that we're creating a new contact
 
714
                        if( !ui_informed ) {
 
715
                                _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTCREATED );
 
716
                                ui_informed = true;
730
717
                        }
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
 
                }
 
718
                }
 
719
 
 
720
                // if we haven't already shown that we're overwriting or creating a
 
721
                // contact show that we're merging a contact
 
722
                if( !ui_informed )
 
723
                        _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTMERGED );
 
724
 
 
725
                // import contact parts
 
726
                if( contact.hasNumbers() )
 
727
                        importContactPhones( id, contact.getNumbers() );
 
728
                if( contact.hasEmails() )
 
729
                        importContactEmails( id, contact.getEmails() );
 
730
                if( contact.hasAddresses() )
 
731
                        importContactAddresses( id, contact.getAddresses() );
 
732
                if( contact.hasOrganisations() )
 
733
                        importContactOrganisations( id, contact.getOrganisations() );
749
734
        }
750
735
 
751
736
        private void importContactPhones( Long id,
752
 
                HashMap< String, ContactData.PreferredDetail > datas )
753
 
                throws ContactCreationException
 
737
                        HashMap< String, ContactData.PreferredDetail > datas )
754
738
        {
 
739
                // get URI to contact's phones
 
740
                Uri contact_phones_uri = Uri.withAppendedPath(
 
741
                        ContentUris.withAppendedId( Contacts.People.CONTENT_URI, id ),
 
742
                        Contacts.People.Phones.CONTENT_DIRECTORY );
 
743
                Set< String > datas_keys = datas.keySet();
 
744
 
755
745
                // add phone numbers
756
 
                Set< String > datas_keys = datas.keySet();
757
746
                Iterator< String > i = datas_keys.iterator();
758
747
                while( i.hasNext() ) {
759
748
                        String number = i.next();
770
759
                                continue;
771
760
 
772
761
                        // add phone number
773
 
                        _backend.addContactPhone( id, number, data );
 
762
                        ContentValues values = new ContentValues();
 
763
                        values.put( Contacts.Phones.TYPE, data.getType() );
 
764
                        values.put( Contacts.Phones.NUMBER, number );
 
765
                        if( data.isPreferred() )
 
766
                                values.put( Contacts.Phones.ISPRIMARY, 1 );
 
767
                        _doit.getContentResolver().insert( contact_phones_uri, values );
774
768
 
775
769
                        // and add this address to the cache to prevent a addition of
776
770
                        // duplicate date from another file
779
773
        }
780
774
 
781
775
        private void importContactEmails( Long id,
782
 
                HashMap< String, ContactData.PreferredDetail > datas )
783
 
                throws ContactCreationException
 
776
                        HashMap< String, ContactData.PreferredDetail > datas )
784
777
        {
 
778
                // get URI to contact's contact methods
 
779
                Uri contact_contact_methods_uri = Uri.withAppendedPath(
 
780
                        ContentUris.withAppendedId( Contacts.People.CONTENT_URI, id ),
 
781
                        Contacts.People.ContactMethods.CONTENT_DIRECTORY );
 
782
                Set< String > datas_keys = datas.keySet();
 
783
 
785
784
                // add email addresses
786
 
                Set< String > datas_keys = datas.keySet();
787
785
                Iterator< String > i = datas_keys.iterator();
788
786
                while( i.hasNext() ) {
789
787
                        String email = i.next();
795
793
                                continue;
796
794
 
797
795
                        // add phone number
798
 
                        _backend.addContactEmail( id, email, data );
 
796
                        ContentValues values = new ContentValues();
 
797
                        values.put( Contacts.ContactMethods.KIND, Contacts.KIND_EMAIL );
 
798
                        values.put( Contacts.ContactMethods.DATA, email );
 
799
                        values.put( Contacts.ContactMethods.TYPE, data.getType() );
 
800
                        if( data.isPreferred() )
 
801
                                values.put( Contacts.ContactMethods.ISPRIMARY, 1 );
 
802
                        _doit.getContentResolver().insert( contact_contact_methods_uri,
 
803
                                values );
799
804
 
800
805
                        // and add this address to the cache to prevent a addition of
801
806
                        // duplicate date from another file
805
810
 
806
811
        private void importContactAddresses( Long id,
807
812
                HashMap< String, ContactData.TypeDetail > datas )
808
 
                throws ContactCreationException
809
813
        {
 
814
                // get URI to contact's contact methods
 
815
                Uri contact_contact_methods_uri = Uri.withAppendedPath(
 
816
                        ContentUris.withAppendedId( Contacts.People.CONTENT_URI, id ),
 
817
                        Contacts.People.ContactMethods.CONTENT_DIRECTORY );
 
818
 
810
819
                // add addresses
811
820
                Set< String > datas_keys = datas.keySet();
812
821
                Iterator< String > i = datas_keys.iterator();
820
829
                                continue;
821
830
 
822
831
                        // add postal address
823
 
                        _backend.addContactAddresses( id, address, data );
 
832
                        ContentValues values = new ContentValues();
 
833
                        values.put( Contacts.ContactMethods.KIND, Contacts.KIND_POSTAL );
 
834
                        values.put( Contacts.ContactMethods.DATA, address );
 
835
                        values.put( Contacts.ContactMethods.TYPE, data.getType() );
 
836
                        _doit.getContentResolver().insert( contact_contact_methods_uri,
 
837
                                values );
824
838
 
825
839
                        // and add this address to the cache to prevent a addition of
826
840
                        // duplicate date from another file
830
844
 
831
845
        private void importContactOrganisations( Long id,
832
846
                HashMap< String, ContactData.ExtraDetail > datas )
833
 
                throws ContactCreationException
834
847
        {
835
848
                // add addresses
836
849
                Set< String > datas_keys = datas.keySet();
845
858
                                continue;
846
859
 
847
860
                        // add organisation address
848
 
                        _backend.addContactOrganisation( id, organisation, data );
 
861
                        ContentValues values = new ContentValues();
 
862
                        values.put( Contacts.Organizations.PERSON_ID, id );
 
863
                        values.put( Contacts.Organizations.COMPANY, organisation );
 
864
                        values.put( Contacts.ContactMethods.TYPE,
 
865
                                Contacts.OrganizationColumns.TYPE_WORK );
 
866
                        if( data.getExtra() != null )
 
867
                                values.put( Contacts.Organizations.TITLE, data.getExtra() );
 
868
                        _doit.getContentResolver().insert(
 
869
                                Contacts.Organizations.CONTENT_URI, values );
849
870
 
850
871
                        // and add this address to the cache to prevent a addition of
851
872
                        // duplicate date from another file