/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-03-19 20:33:09 UTC
  • Revision ID: edam@waxworlds.org-20110319203309-5dzfyqrxwk94jtin
- formatting: removed some double-indents on overrunning lines
- updated TODO and NEWS
- rewrote central logic of parser so it makes more sense, looks nicer and has a small optimisation (getting name and params from line only when necessary)
- optimised unnecessary mutliple converting of lines to US-ASCII
- re-wrote line extraction from vcards so that we can lookahead for v3 folded lines
- added support for v3 folded lines

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/edam/importcontacts/Importer.java
24
24
package org.waxworlds.edam.importcontacts;
25
25
 
26
26
import java.util.HashMap;
 
27
import java.util.HashSet;
27
28
import java.util.Iterator;
28
29
import java.util.Set;
29
30
import java.util.regex.Matcher;
32
33
import android.content.ContentUris;
33
34
import android.content.ContentValues;
34
35
import android.content.SharedPreferences;
 
36
import android.database.Cursor;
35
37
import android.net.Uri;
36
38
import android.os.Message;
37
39
import android.provider.Contacts;
38
40
 
39
 
 
40
41
public class Importer extends Thread
41
42
{
42
43
        public final static int ACTION_ABORT = 1;
51
52
        private Doit _doit;
52
53
        private int _response;
53
54
        private int _responseExtra;
 
55
        private HashMap< String, Long > _contacts;
 
56
        private HashMap< Long, HashSet< String > > _contactNumbers;
 
57
        private HashMap< Long, HashSet< String > > _contactEmails;
54
58
        private int _mergeSetting;
55
59
        private int _lastMergeDecision;
56
60
        private boolean _abort = false;
57
61
        private boolean _isFinished = false;
58
 
        private ContactsCache _contactsCache = null;
59
62
 
60
63
        public class ContactData
61
64
        {
109
112
                        }
110
113
                }
111
114
 
112
 
                class AddressData
113
 
                {
114
 
                        private String _address;
115
 
                        public int _type;
116
 
 
117
 
                        public AddressData( String address, int type ) {
118
 
                                _address = address;
119
 
                                _type = type;
120
 
                        }
121
 
 
122
 
                        public String getAddress() {
123
 
                                return _address;
124
 
                        }
125
 
 
126
 
                        public int getType() {
127
 
                                return _type;
128
 
                        }
129
 
                }
130
 
 
131
115
                public String _name = null;
132
116
                public HashMap< String, PhoneData > _phones = null;
133
117
                public HashMap< String, EmailData > _emails = null;
134
 
                public HashMap< String, AddressData > _addresses = null;
135
118
 
136
119
                protected void setName( String name )
137
120
                {
157
140
                        if( !_emails.containsKey( email ) )
158
141
                                _emails.put( email, new EmailData( email, type, isPreferred ) );
159
142
                }
160
 
 
161
 
                protected void addAddress( String address, int type )
162
 
                {
163
 
                        if( _addresses == null ) _addresses =
164
 
                                new HashMap< String, AddressData >();
165
 
                        if( !_addresses.containsKey( address ) )
166
 
                                _addresses.put( address, new AddressData( address, type ) );
167
 
                }
168
143
        }
169
144
 
170
145
        @SuppressWarnings("serial")
183
158
        {
184
159
                try
185
160
                {
186
 
                        // update UI
187
 
                        setProgressMessage( R.string.doit_caching );
188
 
 
189
 
                        // build a cache of existing contacts
190
 
                        _contactsCache = new ContactsCache();
191
 
                        _contactsCache.buildCache( _doit );
 
161
                        // cache current contact names
 
162
                        buildContactsCache();
192
163
 
193
164
                        // do the import
194
165
                        onImport();
378
349
                {
379
350
                case Doit.ACTION_KEEP:
380
351
                        // if we keep contacts on duplicate, we better check for one
381
 
                        return !_contactsCache.exists( name );
 
352
                        return !_contacts.containsKey( name );
382
353
 
383
354
                case Doit.ACTION_PROMPT:
384
355
                        // if we are prompting on duplicate, we better check for one
385
 
                        if( !_contactsCache.exists( name ) )
 
356
                        if( !_contacts.containsKey( name ) )
386
357
                                return true;
387
358
 
388
359
                        // ok, it exists, so do prompt
429
400
                // does contact exist already?
430
401
                Uri contactUri = null;
431
402
                Long id;
432
 
                if( ( id = (Long)_contactsCache.getId( contact._name ) ) != null )
 
403
                if( ( id = (Long)_contacts.get( contact._name ) ) != null )
433
404
                {
434
405
                        // should we skip this import altogether?
435
406
                        if( _lastMergeDecision == Doit.ACTION_KEEP ) return;
449
420
                                uiInformed = true;
450
421
 
451
422
                                // update cache
452
 
                                _contactsCache.remove( contact._name );
 
423
                                _contacts.remove( contact._name );
453
424
                        }
454
425
                }
455
426
 
474
445
                        }
475
446
 
476
447
                        // update cache
477
 
                        _contactsCache.put( id, contact._name );
 
448
                        _contacts.put( contact._name, id );
478
449
 
479
450
                        // update UI
480
451
                        if( !uiInformed ) {
492
463
                        importContactPhones( contactUri, contact._phones );
493
464
                if( contact._emails != null )
494
465
                        importContactEmails( contactUri, contact._emails );
495
 
                if( contact._addresses != null )
496
 
                        importContactAddresses( contactUri, contact._addresses );
497
466
        }
498
467
 
499
468
        private void importContactPhones( Uri contactUri,
518
487
                        // anyway, so it's not a problem).
519
488
                        String number = sanitisePhoneNumber( phone._number );
520
489
                        if( number == null ) continue;
521
 
                        if( _contactsCache.hasNumber( contactId, number ) ) continue;
 
490
                        HashSet< String > numbers = _contactNumbers.get( contactId );
 
491
                        if( numbers != null && numbers.contains( number ) ) continue;
522
492
 
523
493
                        // add phone number
524
494
                        ContentValues values = new ContentValues();
526
496
                        values.put( Contacts.Phones.NUMBER, phone._number );
527
497
                        if( phone._isPreferred ) values.put( Contacts.Phones.ISPRIMARY, 1 );
528
498
                        _doit.getContentResolver().insert( contactPhonesUri, values );
529
 
 
530
 
                        // and add this address to the cache to prevent a addition of
531
 
                        // duplicate date from another file
532
 
                        _contactsCache.addNumber( contactId, number );
 
499
                }
 
500
 
 
501
                // now add those phone numbers to the cache to prevent the addition of
 
502
                // duplicate data from another file
 
503
                i = phonesKeys.iterator();
 
504
                while( i.hasNext() ) {
 
505
                        ContactData.PhoneData phone = phones.get( i.next() );
 
506
 
 
507
                        String number = sanitisePhoneNumber( phone._number );
 
508
                        if( number != null ) {
 
509
                                HashSet< String > numbers = _contactNumbers.get( contactId );
 
510
                                if( numbers == null ) {
 
511
                                        _contactNumbers.put( contactId, new HashSet< String >() );
 
512
                                        numbers = _contactNumbers.get( contactId );
 
513
                                }
 
514
                                numbers.add( number );
 
515
                        }
533
516
                }
534
517
        }
535
518
 
546
529
                while( i.hasNext() ) {
547
530
                        ContactData.EmailData email = emails.get( i.next() );
548
531
 
549
 
                        // we don't want to add this email address if it exists already or
550
 
                        // we would introduce duplicates.
 
532
                        // like with phone numbers, we don't want to add this email address
 
533
                        // if it exists already or we would introduce duplicates.
551
534
                        String address = sanitiseEmailAddress( email.getAddress() );
552
535
                        if( address == null ) continue;
553
 
                        if( _contactsCache.hasEmail( contactId, address ) ) continue;
 
536
                        HashSet< String > addresses = _contactEmails.get( contactId );
 
537
                        if( addresses != null && addresses.contains( address ) ) continue;
554
538
 
555
539
                        // add phone number
556
540
                        ContentValues values = new ContentValues();
561
545
                                values.put( Contacts.ContactMethods.ISPRIMARY, 1 );
562
546
                        _doit.getContentResolver().insert( contactContactMethodsUri,
563
547
                                values );
564
 
 
565
 
                        // and add this address to the cache to prevent a addition of
566
 
                        // duplicate date from another file
567
 
                        _contactsCache.addEmail( contactId, address );
568
548
                }
569
 
        }
570
 
 
571
 
        private void importContactAddresses( Uri contactUri,
572
 
                HashMap< String, ContactData.AddressData > addresses )
573
 
        {
574
 
                Long contactId = ContentUris.parseId( contactUri );
575
 
                Uri contactContactMethodsUri = Uri.withAppendedPath( contactUri,
576
 
                                Contacts.People.ContactMethods.CONTENT_DIRECTORY );
577
 
                Set< String > addressesKeys = addresses.keySet();
578
 
 
579
 
                // add addresses
580
 
                Iterator< String > i = addressesKeys.iterator();
 
549
 
 
550
                // now add those email addresses to the cache to prevent the addition of
 
551
                // duplicate data from another file
 
552
                i = emailsKeys.iterator();
581
553
                while( i.hasNext() ) {
582
 
                        ContactData.AddressData address = addresses.get( i.next() );
583
 
 
584
 
                        // we don't want to add this address if it exists already or we
585
 
                        // would introduce duplicates
586
 
                        if( address == null ) continue;
587
 
                        if( _contactsCache.hasAddress( contactId, address.getAddress() ) )
588
 
                                continue;
589
 
 
590
 
                        // add postal address
591
 
                        ContentValues values = new ContentValues();
592
 
                        values.put( Contacts.ContactMethods.KIND, Contacts.KIND_POSTAL );
593
 
                        values.put( Contacts.ContactMethods.DATA, address.getAddress() );
594
 
                        values.put( Contacts.ContactMethods.TYPE, address.getType() );
595
 
                        _doit.getContentResolver().insert( contactContactMethodsUri,
596
 
                                values );
597
 
 
598
 
                        // and add this address to the cache to prevent a addition of
599
 
                        // duplicate date from another file
600
 
                        _contactsCache.addAddress( contactId, address.getAddress() );
 
554
                        ContactData.EmailData email = emails.get( i.next() );
 
555
 
 
556
                        String address = sanitiseEmailAddress( email.getAddress() );
 
557
                        if( address != null ) {
 
558
                                HashSet< String > addresses = _contactEmails.get( contactId );
 
559
                                if( addresses == null ) {
 
560
                                        _contactEmails.put( contactId, new HashSet< String >() );
 
561
                                        addresses = _contactEmails.get( contactId );
 
562
                                }
 
563
                                addresses.add( address );
 
564
                        }
601
565
                }
602
566
        }
603
567
 
609
573
                }
610
574
        }
611
575
 
612
 
        static public String sanitisePhoneNumber( String number )
 
576
        private void buildContactsCache() throws AbortImportException
 
577
        {
 
578
                // update UI
 
579
                setProgressMessage( R.string.doit_caching );
 
580
 
 
581
                String[] cols;
 
582
                Cursor cur;
 
583
 
 
584
                // init contacts caches
 
585
                _contacts = new HashMap< String, Long >();
 
586
                _contactNumbers = new HashMap< Long, HashSet< String > >();
 
587
                _contactEmails = new HashMap< Long, HashSet< String > >();
 
588
 
 
589
                // query and store map of contact names to ids
 
590
                cols = new String[] { Contacts.People._ID, Contacts.People.NAME };
 
591
                cur = _doit.managedQuery( Contacts.People.CONTENT_URI,
 
592
                        cols, null, null, null);
 
593
                if( cur.moveToFirst() ) {
 
594
                        int idCol = cur.getColumnIndex( Contacts.People._ID );
 
595
                        int nameCol = cur.getColumnIndex( Contacts.People.NAME );
 
596
                        do {
 
597
                                _contacts.put( cur.getString( nameCol ), cur.getLong( idCol ) );
 
598
                        } while( cur.moveToNext() );
 
599
                }
 
600
 
 
601
                // query and store map of contact ids to sets of phone numbers
 
602
                cols = new String[] { Contacts.Phones.PERSON_ID,
 
603
                                Contacts.Phones.NUMBER };
 
604
                cur = _doit.managedQuery( Contacts.Phones.CONTENT_URI,
 
605
                        cols, null, null, null);
 
606
                if( cur.moveToFirst() ) {
 
607
                        int personIdCol = cur.getColumnIndex( Contacts.Phones.PERSON_ID );
 
608
                        int numberCol = cur.getColumnIndex( Contacts.Phones.NUMBER );
 
609
                        do {
 
610
                                Long id = cur.getLong( personIdCol );
 
611
                                String number = sanitisePhoneNumber(
 
612
                                                cur.getString( numberCol ) );
 
613
                                if( number != null ) {
 
614
                                        HashSet< String > numbers = _contactNumbers.get( id );
 
615
                                        if( numbers == null ) {
 
616
                                                _contactNumbers.put( id, new HashSet< String >() );
 
617
                                                numbers = _contactNumbers.get( id );
 
618
                                        }
 
619
                                        numbers.add( number );
 
620
                                }
 
621
                        } while( cur.moveToNext() );
 
622
                }
 
623
 
 
624
                // query and store map of contact ids to sets of email addresses
 
625
                cols = new String[] { Contacts.ContactMethods.PERSON_ID,
 
626
                                Contacts.ContactMethods.DATA };
 
627
                cur = _doit.managedQuery( Contacts.ContactMethods.CONTENT_URI,
 
628
                                cols, Contacts.ContactMethods.KIND + " = ?",
 
629
                                new String[] { "" + Contacts.KIND_EMAIL }, null );
 
630
                if( cur.moveToFirst() ) {
 
631
                        int personIdCol = cur.getColumnIndex(
 
632
                                Contacts.ContactMethods.PERSON_ID );
 
633
                        int addressCol = cur.getColumnIndex(
 
634
                                Contacts.ContactMethods.DATA );
 
635
                        do {
 
636
                                Long id = cur.getLong( personIdCol );
 
637
                                String address = sanitiseEmailAddress(
 
638
                                        cur.getString( addressCol ) );
 
639
                                if( address != null ) {
 
640
                                        HashSet< String > addresses = _contactEmails.get( id );
 
641
                                        if( addresses == null ) {
 
642
                                                _contactEmails.put( id, new HashSet< String >() );
 
643
                                                addresses = _contactEmails.get( id );
 
644
                                        }
 
645
                                        addresses.add( address );
 
646
                                }
 
647
                        } while( cur.moveToNext() );
 
648
                }
 
649
        }
 
650
 
 
651
        private String sanitisePhoneNumber( String number )
613
652
        {
614
653
                number = number.replaceAll( "[-\\(\\) ]", "" );
615
654
                Pattern p = Pattern.compile( "^[\\+0-9#*]+" );
618
657
                return null;
619
658
        }
620
659
 
621
 
        static public String sanitiseEmailAddress( String address )
 
660
        private String sanitiseEmailAddress( String address )
622
661
        {
623
662
                address = address.trim();
624
663
                Pattern p = Pattern.compile(