/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/am/ed/importcontacts/Importer.java

  • Committer: edam
  • Date: 2012-12-19 17:51:35 UTC
  • Revision ID: tim@ed.am-20121219175135-1cpuafp76jg1ib1p
added preliminary (buggy) ContactsContract backend

Show diffs side-by-side

added added

removed removed

src/am/ed/importcontacts/Importer.java
1
1
/*
2
2
 * Importer.java
3
3
 *
4
 
 * Copyright (C) 2009 to 2011 Tim Marston <edam@waxworlds.org>
 
4
 * Copyright (C) 2009 to 2012 Tim Marston <tim@ed.am>
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://www.waxworlds.org/edam/software/android/import-contacts
 
8
 * http://ed.am/dev/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 org.waxworlds.edam.importcontacts;
 
24
package am.ed.importcontacts;
25
25
 
 
26
import java.util.Arrays;
26
27
import java.util.HashMap;
 
28
import java.util.HashSet;
27
29
import java.util.Iterator;
 
30
import java.util.Locale;
28
31
import java.util.Set;
29
32
import java.util.regex.Matcher;
30
33
import java.util.regex.Pattern;
31
34
 
32
 
import android.content.ContentUris;
33
 
import android.content.ContentValues;
 
35
import am.ed.importcontacts.Backend.ContactCreationException;
34
36
import android.content.SharedPreferences;
35
 
import android.net.Uri;
36
37
import android.os.Message;
37
 
import android.provider.Contacts;
38
 
 
39
38
 
40
39
public class Importer extends Thread
41
40
{
56
55
        private boolean _abort = false;
57
56
        private boolean _is_finished = false;
58
57
        private ContactsCache _contacts_cache = null;
59
 
 
60
 
        @SuppressWarnings("serial")
61
 
        protected class ContactNeedsMoreInfoException extends Exception
62
 
        {
63
 
        }
 
58
        private Backend _backend = null;
64
59
 
65
60
        /**
66
61
         * Data about a contact
67
62
         */
68
63
        public class ContactData
69
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
 
70
72
                class TypeDetail
71
73
                {
72
74
                        protected int _type;
122
124
                        }
123
125
                }
124
126
 
 
127
                @SuppressWarnings("serial")
 
128
                protected class ContactNotIdentifiableException extends Exception
 
129
                {
 
130
                }
 
131
 
125
132
                protected String _name = null;
126
133
                protected String _primary_organisation = null;
127
 
                protected boolean _primary_organisation_is_preferred = false;
 
134
                protected boolean _primary_organisation_is_preferred;
128
135
                protected String _primary_number = null;
129
 
                protected boolean _primary_number_is_preferred = false;
 
136
                protected int _primary_number_type;
 
137
                protected boolean _primary_number_is_preferred;
130
138
                protected String _primary_email = null;
131
 
                protected boolean _primary_email_is_preferred = false;
 
139
                protected boolean _primary_email_is_preferred;
132
140
                protected HashMap< String, ExtraDetail > _organisations = null;
133
141
                protected HashMap< String, PreferredDetail > _numbers = null;
134
142
                protected HashMap< String, PreferredDetail > _emails = null;
135
143
                protected HashMap< String, TypeDetail > _addresses = null;
136
144
 
 
145
                private ContactsCache.CacheIdentifier _cache_identifier = null;
 
146
 
137
147
                protected void setName( String name )
138
148
                {
139
149
                        _name = name;
173
183
                                        new ExtraDetail( 0, false, title ) );
174
184
 
175
185
                        // if this is the first organisation added, or it's a preferred
176
 
                        // organisation and a previous organisation wasn't, then remember
177
 
                        // that this is the "primary organisation".
 
186
                        // organisation and the current primary organisation isn't, then
 
187
                        // record this as the primary organisation.
178
188
                        if( _primary_organisation == null ||
179
189
                                ( is_preferred && !_primary_organisation_is_preferred ) )
180
190
                        {
221
231
                                _numbers.put( number,
222
232
                                        new PreferredDetail( type, false ) );
223
233
 
 
234
                        final Set< Integer > non_voice_types = new HashSet< Integer >(
 
235
                                Arrays.asList( TYPE_FAX_HOME, TYPE_FAX_WORK, TYPE_PAGER ) );
 
236
 
224
237
                        // if this is the first number added, or it's a preferred number
225
 
                        // and a previous number wasn't, then remember that this is the
226
 
                        // "primary 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.
227
242
                        if( _primary_number == null ||
228
 
                                ( is_preferred && !_primary_number_is_preferred ) )
 
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 ) ) )
229
247
                        {
230
248
                                _primary_number = number;
 
249
                                _primary_number_type = type;
231
250
                                _primary_number_is_preferred = is_preferred;
232
251
                        }
233
252
                }
258
277
                        email = sanitisesEmailAddress( email );
259
278
                        if( email == null )
260
279
                        {
261
 
                                // TODO: warn that an imported email addtrss is being ignored
 
280
                                // TODO: warn that an imported email address is being ignored
262
281
                                return;
263
282
                        }
264
283
 
269
288
                        if( !_emails.containsKey( email ) )
270
289
                                _emails.put( email, new PreferredDetail( type, false ) );
271
290
 
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".
 
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.
275
294
                        if( _primary_email == null ||
276
295
                                ( is_preferred && !_primary_email_is_preferred ) )
277
296
                        {
326
345
                }
327
346
 
328
347
                protected void finalise()
 
348
                        throws ContactNotIdentifiableException
329
349
                {
330
350
                        // ensure that if there is a primary number, it is preferred so
331
351
                        // that there is always one preferred number. Android will assign
349
369
                                _organisations.put( _primary_organisation,
350
370
                                        new ExtraDetail( 0, true, data.getExtra() ) );
351
371
                        }
 
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;
352
383
                }
353
384
 
354
385
                private String sanitisePhoneNumber( String number )
368
399
                        Matcher m = p.matcher( email );
369
400
                        if( m.matches() ) {
370
401
                                String[] bits = email.split( "@" );
371
 
                                return bits[ 0 ] + "@" + bits[ 1 ].toLowerCase();
 
402
                                return bits[ 0 ] + "@" + bits[ 1 ].toLowerCase( Locale.US );
372
403
                        }
373
404
                        return null;
374
405
                }
393
424
                        // update UI
394
425
                        setProgressMessage( R.string.doit_caching );
395
426
 
396
 
                        // build a cache of existing contacts
 
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
397
434
                        _contacts_cache = new ContactsCache();
398
 
                        _contacts_cache.buildCache( _doit );
 
435
                        _backend.populateCache( _contacts_cache );
399
436
 
400
437
                        // do the import
401
438
                        onImport();
528
565
                checkAbort();
529
566
                _doit._handler.sendMessage( Message.obtain(
530
567
                        _doit._handler, Doit.MESSAGE_SETMAXPROGRESS,
531
 
                        new Integer( max_progress ) ) );
 
568
                        Integer.valueOf( max_progress ) ) );
532
569
        }
533
570
 
534
571
        protected void setTmpProgress( int tmp_progress )
537
574
                checkAbort();
538
575
                _doit._handler.sendMessage( Message.obtain(
539
576
                        _doit._handler, Doit.MESSAGE_SETTMPPROGRESS,
540
 
                        new Integer( tmp_progress ) ) );
 
577
                        Integer.valueOf( tmp_progress ) ) );
541
578
        }
542
579
 
543
580
        protected void setProgress( int progress ) throws AbortImportException
545
582
                checkAbort();
546
583
                _doit._handler.sendMessage( Message.obtain(
547
584
                        _doit._handler, Doit.MESSAGE_SETPROGRESS,
548
 
                        new Integer( progress ) ) );
 
585
                        Integer.valueOf( progress ) ) );
549
586
        }
550
587
 
551
588
        protected void finish( int action ) throws AbortImportException
569
606
                return _doit.getText( res );
570
607
        }
571
608
 
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
 
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
582
620
        {
583
621
                _last_merge_decision = merge_setting;
584
622
 
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
 
 
592
623
                // handle special cases
593
624
                switch( merge_setting )
594
625
                {
595
626
                case Doit.ACTION_KEEP:
596
 
                        // if we keep contacts on duplicate, we better check for one
597
 
                        return !_contacts_cache.canLookup( identifier );
 
627
                        // if we are skipping on a duplicate, check for one
 
628
                        return exists;
598
629
 
599
630
                case Doit.ACTION_PROMPT:
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;
 
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;
604
634
 
605
 
                        // ok, it exists, so do prompt
 
635
                        // ok, duplicate exists, so do prompt
606
636
                        _doit._handler.sendMessage( Message.obtain( _doit._handler,
607
 
                                Doit.MESSAGE_MERGEPROMPT, identifier.getDetail() ) );
 
637
                                Doit.MESSAGE_MERGEPROMPT, contact_detail ) );
608
638
                        try {
609
639
                                wait();
610
640
                        }
618
648
                                _merge_setting = _response;
619
649
 
620
650
                        // recurse, with our new merge setting
621
 
                        return isImportRequired( contact, _response );
 
651
                        return shouldWeSkipContact( contact_detail, exists, _response );
622
652
                }
623
653
 
624
 
                // for all other cases (either overwriting or merging) we will need the
625
 
                // imported data
626
 
                return true;
 
654
                // for all other cases (either overwriting or merging) we don't skip
 
655
                return false;
627
656
        }
628
657
 
629
658
        protected void skipContact() throws AbortImportException
630
659
        {
631
660
                checkAbort();
 
661
 
 
662
                // show that we're skipping a new contact
632
663
                _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTSKIPPED );
633
664
        }
634
665
 
637
668
        {
638
669
                checkAbort();
639
670
 
 
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
 
640
677
//              if( !showContinue( "====[ IMPORTING ]====\n: " + contact._name ) )
641
678
//                      finish( ACTION_ABORT );
642
679
 
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 )
659
 
                {
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 )
 
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 ) )
 
687
                {
 
688
                        // show that we're skipping a contact
 
689
                        _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTSKIPPED );
 
690
                        return;
 
691
                }
 
692
 
 
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 )
 
697
                {
 
698
                        contact_deleted = true;
 
699
 
 
700
                        // remove from device
 
701
                        _backend.deleteContact( id );
 
702
 
 
703
                        // 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 )
669
718
                        {
670
 
                                // remove from device
671
 
                                _doit.getContentResolver().delete( contact_uri, null, null );
 
719
                                // create a new contact
 
720
                                id = _backend.addContact( contact._name );
672
721
 
673
722
                                // 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;
 
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 );
684
730
                        }
 
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() );
685
744
                }
686
 
 
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 )
 
745
                catch( Backend.ContactCreationException e )
690
746
                {
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 );
698
 
 
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
 
                        }
707
 
 
708
 
                        // update cache
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;
717
 
                        }
 
747
                        showError( R.string.error_unabletoaddcontact );
718
748
                }
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() );
734
749
        }
735
750
 
736
751
        private void importContactPhones( Long id,
737
 
                        HashMap< String, ContactData.PreferredDetail > datas )
 
752
                HashMap< String, ContactData.PreferredDetail > datas )
 
753
                throws ContactCreationException
738
754
        {
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
 
 
745
755
                // add phone numbers
 
756
                Set< String > datas_keys = datas.keySet();
746
757
                Iterator< String > i = datas_keys.iterator();
747
758
                while( i.hasNext() ) {
748
759
                        String number = i.next();
759
770
                                continue;
760
771
 
761
772
                        // add phone number
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 );
 
773
                        _backend.addContactPhone( id, number, data );
768
774
 
769
775
                        // and add this address to the cache to prevent a addition of
770
776
                        // duplicate date from another file
773
779
        }
774
780
 
775
781
        private void importContactEmails( Long id,
776
 
                        HashMap< String, ContactData.PreferredDetail > datas )
 
782
                HashMap< String, ContactData.PreferredDetail > datas )
 
783
                throws ContactCreationException
777
784
        {
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
 
 
784
785
                // add email addresses
 
786
                Set< String > datas_keys = datas.keySet();
785
787
                Iterator< String > i = datas_keys.iterator();
786
788
                while( i.hasNext() ) {
787
789
                        String email = i.next();
793
795
                                continue;
794
796
 
795
797
                        // add phone number
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 );
 
798
                        _backend.addContactEmail( id, email, data );
804
799
 
805
800
                        // and add this address to the cache to prevent a addition of
806
801
                        // duplicate date from another file
810
805
 
811
806
        private void importContactAddresses( Long id,
812
807
                HashMap< String, ContactData.TypeDetail > datas )
 
808
                throws ContactCreationException
813
809
        {
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
 
 
819
810
                // add addresses
820
811
                Set< String > datas_keys = datas.keySet();
821
812
                Iterator< String > i = datas_keys.iterator();
829
820
                                continue;
830
821
 
831
822
                        // add postal address
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 );
 
823
                        _backend.addContactAddresses( id, address, data );
838
824
 
839
825
                        // and add this address to the cache to prevent a addition of
840
826
                        // duplicate date from another file
844
830
 
845
831
        private void importContactOrganisations( Long id,
846
832
                HashMap< String, ContactData.ExtraDetail > datas )
 
833
                throws ContactCreationException
847
834
        {
848
835
                // add addresses
849
836
                Set< String > datas_keys = datas.keySet();
858
845
                                continue;
859
846
 
860
847
                        // add organisation address
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 );
 
848
                        _backend.addContactOrganisation( id, organisation, data );
870
849
 
871
850
                        // and add this address to the cache to prevent a addition of
872
851
                        // duplicate date from another file