/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

1
1
/*
2
2
 * Importer.java
3
3
 *
4
 
 * Copyright (C) 2009 to 2011 Tim Marston <tim@ed.am>
 
4
 * Copyright (C) 2009 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
27
import java.util.HashSet;
29
28
import java.util.Iterator;
34
33
import android.content.ContentUris;
35
34
import android.content.ContentValues;
36
35
import android.content.SharedPreferences;
 
36
import android.database.Cursor;
37
37
import android.net.Uri;
38
38
import android.os.Message;
39
39
import android.provider.Contacts;
40
 
import android.provider.Contacts.PhonesColumns;
41
 
 
42
40
 
43
41
public class Importer extends Thread
44
42
{
53
51
 
54
52
        private Doit _doit;
55
53
        private int _response;
56
 
        private int _response_extra;
57
 
        private int _merge_setting;
58
 
        private int _last_merge_decision;
 
54
        private int _responseExtra;
 
55
        private HashMap< String, Long > _contacts;
 
56
        private HashMap< Long, HashSet< String > > _contactNumbers;
 
57
        private HashMap< Long, HashSet< String > > _contactEmails;
 
58
        private int _mergeSetting;
 
59
        private int _lastMergeDecision;
59
60
        private boolean _abort = false;
60
 
        private boolean _is_finished = false;
61
 
        private ContactsCache _contacts_cache = null;
 
61
        private boolean _isFinished = false;
62
62
 
63
 
        /**
64
 
         * Data about a contact
65
 
         */
66
63
        public class ContactData
67
64
        {
68
 
                class TypeDetail
69
 
                {
70
 
                        protected int _type;
71
 
 
72
 
                        public TypeDetail( int type )
73
 
                        {
74
 
                                _type = type;
75
 
                        }
76
 
 
77
 
                        public int getType()
78
 
                        {
79
 
                                return _type;
80
 
                        }
81
 
                }
82
 
 
83
 
                class PreferredDetail extends TypeDetail
84
 
                {
85
 
                        protected boolean _is_preferred;
86
 
 
87
 
                        public PreferredDetail( int type, boolean is_preferred )
88
 
                        {
89
 
                                super( type );
90
 
                                _is_preferred = is_preferred;
91
 
                        }
92
 
 
93
 
                        public boolean isPreferred()
94
 
                        {
95
 
                                return _is_preferred;
96
 
                        }
97
 
                }
98
 
 
99
 
                class ExtraDetail extends PreferredDetail
100
 
                {
101
 
                        protected String _extra;
102
 
 
103
 
                        public ExtraDetail( int type, boolean is_preferred, String extra )
104
 
                        {
105
 
                                super( type, is_preferred );
106
 
 
107
 
                                if( extra != null ) extra = extra.trim();
108
 
                                _extra = extra;
109
 
                        }
110
 
 
111
 
                        public String getExtra()
112
 
                        {
113
 
                                return _extra;
114
 
                        }
115
 
 
116
 
                        public void setExtra( String extra )
117
 
                        {
118
 
                                if( extra != null ) extra = extra.trim();
119
 
                                _extra = extra;
120
 
                        }
121
 
                }
122
 
 
123
 
                @SuppressWarnings("serial")
124
 
                protected class ContactNotIdentifiableException extends Exception
125
 
                {
126
 
                }
127
 
 
128
 
                protected String _name = null;
129
 
                protected String _primary_organisation = null;
130
 
                protected boolean _primary_organisation_is_preferred;
131
 
                protected String _primary_number = null;
132
 
                protected int _primary_number_type;
133
 
                protected boolean _primary_number_is_preferred;
134
 
                protected String _primary_email = null;
135
 
                protected boolean _primary_email_is_preferred;
136
 
                protected HashMap< String, ExtraDetail > _organisations = null;
137
 
                protected HashMap< String, PreferredDetail > _numbers = null;
138
 
                protected HashMap< String, PreferredDetail > _emails = null;
139
 
                protected HashMap< String, TypeDetail > _addresses = null;
140
 
 
141
 
                private ContactsCache.CacheIdentifier _cache_identifier = null;
 
65
                class PhoneData
 
66
                {
 
67
                        public String _number;
 
68
                        public int _type;
 
69
                        public boolean _isPreferred;
 
70
 
 
71
                        public PhoneData( String number, int type, boolean isPreferred ) {
 
72
                                _number = number;
 
73
                                _type = type;
 
74
                                _isPreferred = isPreferred;
 
75
                        }
 
76
 
 
77
                        public String getNumber() {
 
78
                                return _number;
 
79
                        }
 
80
 
 
81
                        public int getType() {
 
82
                                return _type;
 
83
                        }
 
84
 
 
85
                        public boolean isPreferred() {
 
86
                                return _isPreferred;
 
87
                        }
 
88
                }
 
89
 
 
90
                class EmailData
 
91
                {
 
92
                        private String _email;
 
93
                        public int _type;
 
94
                        private boolean _isPreferred;
 
95
 
 
96
                        public EmailData( String email, int type, boolean isPreferred ) {
 
97
                                _email = email;
 
98
                                _type = type;
 
99
                                _isPreferred = isPreferred;
 
100
                        }
 
101
 
 
102
                        public String getAddress() {
 
103
                                return _email;
 
104
                        }
 
105
 
 
106
                        public int getType() {
 
107
                                return _type;
 
108
                        }
 
109
 
 
110
                        public boolean isPreferred() {
 
111
                                return _isPreferred;
 
112
                        }
 
113
                }
 
114
 
 
115
                public String _name = null;
 
116
                public HashMap< String, PhoneData > _phones = null;
 
117
                public HashMap< String, EmailData > _emails = null;
142
118
 
143
119
                protected void setName( String name )
144
120
                {
145
121
                        _name = name;
146
122
                }
147
123
 
148
 
                public boolean hasName()
149
 
                {
150
 
                        return _name != null;
151
 
                }
152
 
 
153
124
                public String getName()
154
125
                {
155
126
                        return _name;
156
127
                }
157
128
 
158
 
                protected void addOrganisation( String organisation, String title,
159
 
                        boolean is_preferred )
160
 
                {
161
 
                        organisation = organisation.trim();
162
 
                        if( organisation.length() <= 0 )
163
 
                        {
164
 
                                // TODO: warn that an imported organisation is being ignored
165
 
                                return;
166
 
                        }
167
 
 
168
 
                        if( title != null ) {
169
 
                                title = title.trim();
170
 
                                if( title.length() <= 0 ) title = null;
171
 
                        }
172
 
 
173
 
                        // add the organisation, as non-preferred (we prefer only one
174
 
                        // organisation in finalise() after they're all imported)
175
 
                        if( _organisations == null )
176
 
                                _organisations = new HashMap< String, ExtraDetail >();
177
 
                        if( !_organisations.containsKey( organisation ) )
178
 
                                _organisations.put( organisation,
179
 
                                        new ExtraDetail( 0, false, title ) );
180
 
 
181
 
                        // if this is the first organisation added, or it's a preferred
182
 
                        // organisation and the current primary organisation isn't, then
183
 
                        // record this as the primary organisation.
184
 
                        if( _primary_organisation == null ||
185
 
                                ( is_preferred && !_primary_organisation_is_preferred ) )
186
 
                        {
187
 
                                _primary_organisation = organisation;
188
 
                                _primary_organisation_is_preferred = is_preferred;
189
 
                        }
190
 
                }
191
 
 
192
 
                public boolean hasOrganisations()
193
 
                {
194
 
                        return _organisations != null && _organisations.size() > 0;
195
 
                }
196
 
 
197
 
                public HashMap< String, ExtraDetail > getOrganisations()
198
 
                {
199
 
                        return _organisations;
200
 
                }
201
 
 
202
 
                public boolean hasPrimaryOrganisation()
203
 
                {
204
 
                        return _primary_organisation != null;
205
 
                }
206
 
 
207
 
                public String getPrimaryOrganisation()
208
 
                {
209
 
                        return _primary_organisation;
210
 
                }
211
 
 
212
 
                protected void addNumber( String number, int type,
213
 
                        boolean is_preferred )
214
 
                {
215
 
                        number = sanitisePhoneNumber( number );
216
 
                        if( number == null )
217
 
                        {
218
 
                                // TODO: warn that an imported phone number is being ignored
219
 
                                return;
220
 
                        }
221
 
 
222
 
                        // add the number, as non-preferred (we prefer only one number
223
 
                        // in finalise() after they're all imported)
224
 
                        if( _numbers == null )
225
 
                                _numbers = new HashMap< String, PreferredDetail >();
226
 
                        if( !_numbers.containsKey( number ) )
227
 
                                _numbers.put( number,
228
 
                                        new PreferredDetail( type, false ) );
229
 
 
230
 
                        final Set< Integer > non_voice_types = new HashSet< Integer >(
231
 
                                Arrays.asList( PhonesColumns.TYPE_FAX_HOME,
232
 
                                        PhonesColumns.TYPE_FAX_WORK, PhonesColumns.TYPE_PAGER ) );
233
 
 
234
 
                        // if this is the first number added, or it's a preferred number
235
 
                        // and the current primary number isn't, or this number is on equal
236
 
                        // standing with the primary number in terms of preference and it is
237
 
                        // a voice number and the primary number isn't, then record this as
238
 
                        // the primary number.
239
 
                        if( _primary_number == null ||
240
 
                                ( is_preferred && !_primary_number_is_preferred ) ||
241
 
                                ( is_preferred == _primary_number_is_preferred &&
242
 
                                        !non_voice_types.contains( type ) &&
243
 
                                        non_voice_types.contains( _primary_number_type ) ) )
244
 
                        {
245
 
                                _primary_number = number;
246
 
                                _primary_number_type = type;
247
 
                                _primary_number_is_preferred = is_preferred;
248
 
                        }
249
 
                }
250
 
 
251
 
                public boolean hasNumbers()
252
 
                {
253
 
                        return _numbers != null && _numbers.size() > 0;
254
 
                }
255
 
 
256
 
                public HashMap< String, PreferredDetail > getNumbers()
257
 
                {
258
 
                        return _numbers;
259
 
                }
260
 
 
261
 
                public boolean hasPrimaryNumber()
262
 
                {
263
 
                        return _primary_number != null;
264
 
                }
265
 
 
266
 
                public String getPrimaryNumber()
267
 
                {
268
 
                        return _primary_number;
269
 
                }
270
 
 
271
 
                protected void addEmail( String email, int type, boolean is_preferred )
272
 
                {
273
 
 
274
 
                        email = sanitisesEmailAddress( email );
275
 
                        if( email == null )
276
 
                        {
277
 
                                // TODO: warn that an imported email addtrss is being ignored
278
 
                                return;
279
 
                        }
280
 
 
281
 
                        // add the email, as non-preferred (we prefer only one email in
282
 
                        // finalise() after they're all imported)
283
 
                        if( _emails == null )
284
 
                                _emails = new HashMap< String, PreferredDetail >();
 
129
                protected void addPhone( String number, int type, boolean isPreferred )
 
130
                {
 
131
                        if( _phones == null ) _phones = new HashMap< String, PhoneData >();
 
132
                        if( !_phones.containsKey( number ) )
 
133
                                _phones.put( number,
 
134
                                        new PhoneData( number, type, isPreferred ) );
 
135
                }
 
136
 
 
137
                protected void addEmail( String email, int type, boolean isPreferred )
 
138
                {
 
139
                        if( _emails == null ) _emails = new HashMap< String, EmailData >();
285
140
                        if( !_emails.containsKey( email ) )
286
 
                                _emails.put( email, new PreferredDetail( type, false ) );
287
 
 
288
 
                        // if this is the first email added, or it's a preferred email and
289
 
                        // the current primary organisation isn't, then record this as the
290
 
                        // primary email.
291
 
                        if( _primary_email == null ||
292
 
                                ( is_preferred && !_primary_email_is_preferred ) )
293
 
                        {
294
 
                                _primary_email = email;
295
 
                                _primary_email_is_preferred = is_preferred;
296
 
                        }
297
 
                }
298
 
 
299
 
                public boolean hasEmails()
300
 
                {
301
 
                        return _emails != null && _emails.size() > 0;
302
 
                }
303
 
 
304
 
                public HashMap< String, PreferredDetail > getEmails()
305
 
                {
306
 
                        return _emails;
307
 
                }
308
 
 
309
 
                public boolean hasPrimaryEmail()
310
 
                {
311
 
                        return _primary_email != null;
312
 
                }
313
 
 
314
 
                public String getPrimaryEmail()
315
 
                {
316
 
                        return _primary_email;
317
 
                }
318
 
 
319
 
                protected void addAddress( String address, int type )
320
 
                {
321
 
                        address = address.trim();
322
 
                        if( address.length() <= 0 )
323
 
                        {
324
 
                                // TODO: warn that an imported address is being ignored
325
 
                                return;
326
 
                        }
327
 
 
328
 
                        if( _addresses == null ) _addresses =
329
 
                                new HashMap< String, TypeDetail >();
330
 
                        if( !_addresses.containsKey( address ) )
331
 
                                _addresses.put( address, new TypeDetail( type ) );
332
 
                }
333
 
 
334
 
                public boolean hasAddresses()
335
 
                {
336
 
                        return _addresses != null && _addresses.size() > 0;
337
 
                }
338
 
 
339
 
                public HashMap< String, TypeDetail > getAddresses()
340
 
                {
341
 
                        return _addresses;
342
 
                }
343
 
 
344
 
                protected void finalise()
345
 
                        throws ContactNotIdentifiableException
346
 
                {
347
 
                        // ensure that if there is a primary number, it is preferred so
348
 
                        // that there is always one preferred number. Android will assign
349
 
                        // preference to one anyway so we might as well decide one sensibly.
350
 
                        if( _primary_number != null ) {
351
 
                                PreferredDetail data = _numbers.get( _primary_number );
352
 
                                _numbers.put( _primary_number,
353
 
                                        new PreferredDetail( data.getType(), true ) );
354
 
                        }
355
 
 
356
 
                        // do the same for the primary email
357
 
                        if( _primary_email != null ) {
358
 
                                PreferredDetail data = _emails.get( _primary_email );
359
 
                                _emails.put( _primary_email,
360
 
                                        new PreferredDetail( data.getType(), true ) );
361
 
                        }
362
 
 
363
 
                        // do the same for the primary organisation
364
 
                        if( _primary_organisation != null ) {
365
 
                                ExtraDetail data = _organisations.get( _primary_organisation );
366
 
                                _organisations.put( _primary_organisation,
367
 
                                        new ExtraDetail( 0, true, data.getExtra() ) );
368
 
                        }
369
 
 
370
 
                        // create a cache identifier from this contact data, which can be
371
 
                        // used to look-up an existing contact
372
 
                        _cache_identifier = ContactsCache.createIdentifier( this );
373
 
                        if( _cache_identifier == null )
374
 
                                throw new ContactNotIdentifiableException();
375
 
                }
376
 
 
377
 
                public ContactsCache.CacheIdentifier getCacheIdentifier()
378
 
                {
379
 
                        return _cache_identifier;
380
 
                }
381
 
 
382
 
                private String sanitisePhoneNumber( String number )
383
 
                {
384
 
                        number = number.trim();
385
 
                        Pattern p = Pattern.compile( "^[-\\(\\) \\+0-9#*]+" );
386
 
                        Matcher m = p.matcher( number );
387
 
                        if( m.lookingAt() ) return m.group( 0 );
388
 
                        return null;
389
 
                }
390
 
 
391
 
                private String sanitisesEmailAddress( String email )
392
 
                {
393
 
                        email = email.trim();
394
 
                        Pattern p = Pattern.compile(
395
 
                                "^[^ @]+@[a-zA-Z]([-a-zA-Z0-9]*[a-zA-z0-9])?(\\.[a-zA-Z]([-a-zA-Z0-9]*[a-zA-z0-9])?)+$" );
396
 
                        Matcher m = p.matcher( email );
397
 
                        if( m.matches() ) {
398
 
                                String[] bits = email.split( "@" );
399
 
                                return bits[ 0 ] + "@" + bits[ 1 ].toLowerCase();
400
 
                        }
401
 
                        return null;
 
141
                                _emails.put( email, new EmailData( email, type, isPreferred ) );
402
142
                }
403
143
        }
404
144
 
410
150
                _doit = doit;
411
151
 
412
152
                SharedPreferences prefs = getSharedPreferences();
413
 
                _merge_setting = prefs.getInt( "merge_setting", Doit.ACTION_PROMPT );
 
153
                _mergeSetting = prefs.getInt( "merge_setting", Doit.ACTION_PROMPT );
414
154
        }
415
155
 
416
156
        @Override
418
158
        {
419
159
                try
420
160
                {
421
 
                        // update UI
422
 
                        setProgressMessage( R.string.doit_caching );
423
 
 
424
 
                        // build a cache of existing contacts
425
 
                        _contacts_cache = new ContactsCache();
426
 
                        _contacts_cache.buildCache( _doit );
 
161
                        // cache current contact names
 
162
                        buildContactsCache();
427
163
 
428
164
                        // do the import
429
165
                        onImport();
440
176
 
441
177
        synchronized private void setIsFinished()
442
178
        {
443
 
                _is_finished = true;
 
179
                _isFinished = true;
444
180
        }
445
181
 
446
182
        protected void onImport() throws AbortImportException
457
193
                wake( response, RESPONSEEXTRA_NONE );
458
194
        }
459
195
 
460
 
        synchronized public void wake( int response, int response_extra )
 
196
        synchronized public void wake( int response, int responseExtra )
461
197
        {
462
198
                _response = response;
463
 
                _response_extra = response_extra;
 
199
                _responseExtra = responseExtra;
464
200
                notify();
465
201
        }
466
202
 
467
203
        synchronized public boolean setAbort()
468
204
        {
469
 
                if( !_is_finished && !_abort ) {
 
205
                if( !_isFinished && !_abort ) {
470
206
                        _abort = true;
471
207
                        notify();
472
208
                        return true;
550
286
                        Doit.MESSAGE_SETPROGRESSMESSAGE, getText( res ) ) );
551
287
        }
552
288
 
553
 
        protected void setProgressMax( int max_progress )
 
289
        protected void setProgressMax( int maxProgress )
554
290
                        throws AbortImportException
555
291
        {
556
292
                checkAbort();
557
293
                _doit._handler.sendMessage( Message.obtain(
558
294
                        _doit._handler, Doit.MESSAGE_SETMAXPROGRESS,
559
 
                        new Integer( max_progress ) ) );
 
295
                        new Integer( maxProgress ) ) );
560
296
        }
561
297
 
562
 
        protected void setTmpProgress( int tmp_progress )
563
 
                throws AbortImportException
 
298
        protected void setTmpProgress( int tmpProgress ) throws AbortImportException
564
299
        {
565
300
                checkAbort();
566
301
                _doit._handler.sendMessage( Message.obtain(
567
302
                        _doit._handler, Doit.MESSAGE_SETTMPPROGRESS,
568
 
                        new Integer( tmp_progress ) ) );
 
303
                        new Integer( tmpProgress ) ) );
569
304
        }
570
305
 
571
306
        protected void setProgress( int progress ) throws AbortImportException
597
332
                return _doit.getText( res );
598
333
        }
599
334
 
600
 
        synchronized private boolean checkForDuplicate(
601
 
                ContactsCache.CacheIdentifier cache_identifier, int merge_setting )
602
 
                throws AbortImportException
 
335
        protected boolean isImportRequired( String name )
 
336
                        throws AbortImportException
603
337
        {
604
 
                _last_merge_decision = merge_setting;
 
338
                checkAbort();
 
339
                return isImportRequired( name, _mergeSetting );
 
340
        }
605
341
 
606
 
                // it is ok to use contact.getCacheIdentifier(). The contact has already
607
 
                // been finalised, which means a valid cache identifier will have been
608
 
                // created for it (or it would have been skipped)
 
342
        synchronized private boolean isImportRequired( String name,
 
343
                        int mergeSetting ) throws AbortImportException
 
344
        {
 
345
                _lastMergeDecision = mergeSetting;
609
346
 
610
347
                // handle special cases
611
 
                switch( merge_setting )
 
348
                switch( mergeSetting )
612
349
                {
613
350
                case Doit.ACTION_KEEP:
614
351
                        // if we keep contacts on duplicate, we better check for one
615
 
                        return !_contacts_cache.canLookup( cache_identifier );
 
352
                        return !_contacts.containsKey( name );
616
353
 
617
354
                case Doit.ACTION_PROMPT:
618
 
                        // if we are prompting on duplicate, we better check for one and if
619
 
                        // the contact doesn'te exist, we want to import it
620
 
                        if( !_contacts_cache.canLookup( cache_identifier ) )
 
355
                        // if we are prompting on duplicate, we better check for one
 
356
                        if( !_contacts.containsKey( name ) )
621
357
                                return true;
622
358
 
623
359
                        // ok, it exists, so do prompt
624
 
                        _doit._handler.sendMessage( Message.obtain( _doit._handler,
625
 
                                Doit.MESSAGE_MERGEPROMPT, cache_identifier.getDetail() ) );
 
360
                        _doit._handler.sendMessage( Message.obtain(
 
361
                                _doit._handler, Doit.MESSAGE_MERGEPROMPT, name ) );
626
362
                        try {
627
363
                                wait();
628
364
                        }
631
367
                        // check if an abortion happened during the wait
632
368
                        checkAbort();
633
369
 
634
 
                        // if "always" was selected, make choice permanent
635
 
                        if( _response_extra == RESPONSEEXTRA_ALWAYS )
636
 
                                _merge_setting = _response;
 
370
                        // if "always" was selected, make choice permenant
 
371
                        if( _responseExtra == RESPONSEEXTRA_ALWAYS )
 
372
                                _mergeSetting = _response;
637
373
 
638
374
                        // recurse, with our new merge setting
639
 
                        return checkForDuplicate( cache_identifier, _response );
 
375
                        return isImportRequired( name, _response );
640
376
                }
641
377
 
642
378
                // for all other cases (either overwriting or merging) we will need the
655
391
        {
656
392
                checkAbort();
657
393
 
658
 
                // It is expected that we use contact.getCacheIdentifier() here. The
659
 
                // contact we are passed should have been successfully finalise()d,
660
 
                // which includes generating a valid cache identifier.
661
 
                ContactsCache.CacheIdentifier cache_identifier =
662
 
                        contact.getCacheIdentifier();
663
 
 
664
 
                // check to see if this contact is a duplicate and should be skipped
665
 
                if( !checkForDuplicate( cache_identifier, _merge_setting ) ) {
666
 
                        skipContact();
667
 
                        return;
668
 
                }
669
 
 
670
394
//              if( !showContinue( "====[ IMPORTING ]====\n: " + contact._name ) )
671
395
//                      finish( ACTION_ABORT );
672
396
 
673
 
                // keep track of whether we've informed the UI of what we're doing
674
 
                boolean ui_informed = false;
675
 
 
676
 
                // attempt to lookup the id of an existing contact in the cache with
677
 
                // this contact data's cache identifier
678
 
                Long id = (Long)_contacts_cache.lookup( cache_identifier );
 
397
                ContentValues values = new ContentValues();
 
398
                boolean uiInformed = false;
679
399
 
680
400
                // does contact exist already?
681
 
                if( id != null )
 
401
                Uri contactUri = null;
 
402
                Long id;
 
403
                if( ( id = (Long)_contacts.get( contact._name ) ) != null )
682
404
                {
683
405
                        // should we skip this import altogether?
684
 
                        if( _last_merge_decision == Doit.ACTION_KEEP ) return;
 
406
                        if( _lastMergeDecision == Doit.ACTION_KEEP ) return;
685
407
 
686
408
                        // get contact's URI
687
 
                        Uri contact_uri = ContentUris.withAppendedId(
 
409
                        contactUri = ContentUris.withAppendedId(
688
410
                                Contacts.People.CONTENT_URI, id );
689
411
 
690
412
                        // should we destroy the existing contact before importing?
691
 
                        if( _last_merge_decision == Doit.ACTION_OVERWRITE )
692
 
                        {
693
 
                                // remove from device
694
 
                                _doit.getContentResolver().delete( contact_uri, null, null );
695
 
 
696
 
                                // update cache
697
 
                                _contacts_cache.removeLookup( contact.getCacheIdentifier() );
698
 
                                _contacts_cache.removeAssociatedData( id );
699
 
 
700
 
                                // show that we're overwriting a contact
 
413
                        if( _lastMergeDecision == Doit.ACTION_OVERWRITE ) {
 
414
                                _doit.getContentResolver().delete( contactUri, null, null );
 
415
                                contactUri = null;
 
416
 
 
417
                                // update the UI
701
418
                                _doit._handler.sendEmptyMessage(
702
419
                                                Doit.MESSAGE_CONTACTOVERWRITTEN );
703
 
                                ui_informed = true;
 
420
                                uiInformed = true;
704
421
 
705
 
                                // discard the contact id
706
 
                                id = null;
 
422
                                // update cache
 
423
                                _contacts.remove( contact._name );
707
424
                        }
708
425
                }
709
426
 
710
 
                // if we don't have a contact id yet (or if we did, but we destroyed it
711
 
                // when we deleted the contact), we'll have to create a new contact
712
 
                if( id == null )
 
427
                // if we don't have a contact URI it is because the contact never
 
428
                // existed or because we deleted it
 
429
                if( contactUri == null )
713
430
                {
714
431
                        // create a new contact
715
 
                        ContentValues values = new ContentValues();
716
432
                        values.put( Contacts.People.NAME, contact._name );
717
 
                        Uri contact_uri = _doit.getContentResolver().insert(
 
433
                        contactUri = _doit.getContentResolver().insert(
718
434
                                Contacts.People.CONTENT_URI, values );
719
 
                        id = ContentUris.parseId( contact_uri );
720
 
                        if( id == null || id <= 0 )
721
 
                                showError( R.string.error_unabletoaddcontact );
 
435
                        id = ContentUris.parseId( contactUri );
 
436
                        if( id <= 0 ) return;   // shouldn't happen!
722
437
 
723
438
                        // try to add them to the "My Contacts" group
724
439
                        try {
730
445
                        }
731
446
 
732
447
                        // update cache
733
 
                        _contacts_cache.addLookup(
734
 
                                ContactsCache.createIdentifier( contact ), id );
 
448
                        _contacts.put( contact._name, id );
735
449
 
736
 
                        // if we haven't already shown that we're overwriting a contact,
737
 
                        // show that we're creating a new contact
738
 
                        if( !ui_informed ) {
 
450
                        // update UI
 
451
                        if( !uiInformed ) {
739
452
                                _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTCREATED );
740
 
                                ui_informed = true;
 
453
                                uiInformed = true;
741
454
                        }
742
455
                }
743
456
 
744
 
                // if we haven't already shown that we're overwriting or creating a
745
 
                // contact, show that we're merging a contact
746
 
                if( !ui_informed )
 
457
                // update UI
 
458
                if( !uiInformed )
747
459
                        _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTMERGED );
748
460
 
749
461
                // import contact parts
750
 
                if( contact.hasNumbers() )
751
 
                        importContactPhones( id, contact.getNumbers() );
752
 
                if( contact.hasEmails() )
753
 
                        importContactEmails( id, contact.getEmails() );
754
 
                if( contact.hasAddresses() )
755
 
                        importContactAddresses( id, contact.getAddresses() );
756
 
                if( contact.hasOrganisations() )
757
 
                        importContactOrganisations( id, contact.getOrganisations() );
 
462
                if( contact._phones != null )
 
463
                        importContactPhones( contactUri, contact._phones );
 
464
                if( contact._emails != null )
 
465
                        importContactEmails( contactUri, contact._emails );
758
466
        }
759
467
 
760
 
        private void importContactPhones( Long id,
761
 
                        HashMap< String, ContactData.PreferredDetail > datas )
 
468
        private void importContactPhones( Uri contactUri,
 
469
                        HashMap< String, ContactData.PhoneData > phones )
762
470
        {
763
 
                // get URI to contact's phones
764
 
                Uri contact_phones_uri = Uri.withAppendedPath(
765
 
                        ContentUris.withAppendedId( Contacts.People.CONTENT_URI, id ),
766
 
                        Contacts.People.Phones.CONTENT_DIRECTORY );
767
 
                Set< String > datas_keys = datas.keySet();
 
471
                Long contactId = ContentUris.parseId( contactUri );
 
472
                Uri contactPhonesUri = Uri.withAppendedPath( contactUri,
 
473
                                Contacts.People.Phones.CONTENT_DIRECTORY );
 
474
                Set< String > phonesKeys = phones.keySet();
768
475
 
769
476
                // add phone numbers
770
 
                Iterator< String > i = datas_keys.iterator();
 
477
                Iterator< String > i = phonesKeys.iterator();
771
478
                while( i.hasNext() ) {
772
 
                        String number = i.next();
773
 
                        ContactData.PreferredDetail data = datas.get( number );
 
479
                        ContactData.PhoneData phone = phones.get( i.next() );
774
480
 
775
481
                        // we don't want to add this number if it's crap, or it already
776
482
                        // exists (which would cause a duplicate to be created). We don't
779
485
                        // if the number exists at all, it doesn't need importing. Because
780
486
                        // of this, we also can't update the cache (which we don't need to
781
487
                        // anyway, so it's not a problem).
782
 
                        if( _contacts_cache.hasAssociatedNumber( id, number ) )
783
 
                                continue;
 
488
                        String number = sanitisePhoneNumber( phone._number );
 
489
                        if( number == null ) continue;
 
490
                        HashSet< String > numbers = _contactNumbers.get( contactId );
 
491
                        if( numbers != null && numbers.contains( number ) ) continue;
784
492
 
785
493
                        // add phone number
786
494
                        ContentValues values = new ContentValues();
787
 
                        values.put( Contacts.Phones.TYPE, data.getType() );
788
 
                        values.put( Contacts.Phones.NUMBER, number );
789
 
                        if( data.isPreferred() )
790
 
                                values.put( Contacts.Phones.ISPRIMARY, 1 );
791
 
                        _doit.getContentResolver().insert( contact_phones_uri, values );
792
 
 
793
 
                        // and add this address to the cache to prevent a addition of
794
 
                        // duplicate date from another file
795
 
                        _contacts_cache.addAssociatedNumber( id, number );
 
495
                        values.put( Contacts.Phones.TYPE, phone._type );
 
496
                        values.put( Contacts.Phones.NUMBER, phone._number );
 
497
                        if( phone._isPreferred ) values.put( Contacts.Phones.ISPRIMARY, 1 );
 
498
                        _doit.getContentResolver().insert( contactPhonesUri, values );
 
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
                        }
796
516
                }
797
517
        }
798
518
 
799
 
        private void importContactEmails( Long id,
800
 
                        HashMap< String, ContactData.PreferredDetail > datas )
 
519
        private void importContactEmails( Uri contactUri,
 
520
                        HashMap< String, ContactData.EmailData > emails )
801
521
        {
802
 
                // get URI to contact's contact methods
803
 
                Uri contact_contact_methods_uri = Uri.withAppendedPath(
804
 
                        ContentUris.withAppendedId( Contacts.People.CONTENT_URI, id ),
805
 
                        Contacts.People.ContactMethods.CONTENT_DIRECTORY );
806
 
                Set< String > datas_keys = datas.keySet();
 
522
                Long contactId = ContentUris.parseId( contactUri );
 
523
                Uri contactContactMethodsUri = Uri.withAppendedPath( contactUri,
 
524
                                Contacts.People.ContactMethods.CONTENT_DIRECTORY );
 
525
                Set< String > emailsKeys = emails.keySet();
807
526
 
808
527
                // add email addresses
809
 
                Iterator< String > i = datas_keys.iterator();
 
528
                Iterator< String > i = emailsKeys.iterator();
810
529
                while( i.hasNext() ) {
811
 
                        String email = i.next();
812
 
                        ContactData.PreferredDetail data = datas.get( email );
 
530
                        ContactData.EmailData email = emails.get( i.next() );
813
531
 
814
 
                        // we don't want to add this email address if it exists already or
815
 
                        // we would introduce duplicates.
816
 
                        if( _contacts_cache.hasAssociatedEmail( id, email ) )
817
 
                                continue;
 
532
                        // like with phone numbers, we don't want to add this email address
 
533
                        // if it exists already or we would introduce duplicates.
 
534
                        String address = sanitiseEmailAddress( email.getAddress() );
 
535
                        if( address == null ) continue;
 
536
                        HashSet< String > addresses = _contactEmails.get( contactId );
 
537
                        if( addresses != null && addresses.contains( address ) ) continue;
818
538
 
819
539
                        // add phone number
820
540
                        ContentValues values = new ContentValues();
821
541
                        values.put( Contacts.ContactMethods.KIND, Contacts.KIND_EMAIL );
822
 
                        values.put( Contacts.ContactMethods.DATA, email );
823
 
                        values.put( Contacts.ContactMethods.TYPE, data.getType() );
824
 
                        if( data.isPreferred() )
 
542
                        values.put( Contacts.ContactMethods.DATA, email.getAddress() );
 
543
                        values.put( Contacts.ContactMethods.TYPE, email.getType() );
 
544
                        if( email.isPreferred() )
825
545
                                values.put( Contacts.ContactMethods.ISPRIMARY, 1 );
826
 
                        _doit.getContentResolver().insert( contact_contact_methods_uri,
827
 
                                values );
828
 
 
829
 
                        // and add this address to the cache to prevent a addition of
830
 
                        // duplicate date from another file
831
 
                        _contacts_cache.addAssociatedEmail( id, email );
832
 
                }
833
 
        }
834
 
 
835
 
        private void importContactAddresses( Long id,
836
 
                HashMap< String, ContactData.TypeDetail > datas )
837
 
        {
838
 
                // get URI to contact's contact methods
839
 
                Uri contact_contact_methods_uri = Uri.withAppendedPath(
840
 
                        ContentUris.withAppendedId( Contacts.People.CONTENT_URI, id ),
841
 
                        Contacts.People.ContactMethods.CONTENT_DIRECTORY );
842
 
 
843
 
                // add addresses
844
 
                Set< String > datas_keys = datas.keySet();
845
 
                Iterator< String > i = datas_keys.iterator();
846
 
                while( i.hasNext() ) {
847
 
                        String address = i.next();
848
 
                        ContactData.TypeDetail data = datas.get( address );
849
 
 
850
 
                        // we don't want to add this address if it exists already or we
851
 
                        // would introduce duplicates
852
 
                        if( _contacts_cache.hasAssociatedAddress( id, address ) )
853
 
                                continue;
854
 
 
855
 
                        // add postal address
856
 
                        ContentValues values = new ContentValues();
857
 
                        values.put( Contacts.ContactMethods.KIND, Contacts.KIND_POSTAL );
858
 
                        values.put( Contacts.ContactMethods.DATA, address );
859
 
                        values.put( Contacts.ContactMethods.TYPE, data.getType() );
860
 
                        _doit.getContentResolver().insert( contact_contact_methods_uri,
861
 
                                values );
862
 
 
863
 
                        // and add this address to the cache to prevent a addition of
864
 
                        // duplicate date from another file
865
 
                        _contacts_cache.addAssociatedAddress( id, address );
866
 
                }
867
 
        }
868
 
 
869
 
        private void importContactOrganisations( Long id,
870
 
                HashMap< String, ContactData.ExtraDetail > datas )
871
 
        {
872
 
                // add addresses
873
 
                Set< String > datas_keys = datas.keySet();
874
 
                Iterator< String > i = datas_keys.iterator();
875
 
                while( i.hasNext() ) {
876
 
                        String organisation = i.next();
877
 
                        ContactData.ExtraDetail data = datas.get( organisation );
878
 
 
879
 
                        // we don't want to add this address if it exists already or we
880
 
                        // would introduce duplicates
881
 
                        if( _contacts_cache.hasAssociatedOrganisation( id, organisation ) )
882
 
                                continue;
883
 
 
884
 
                        // add organisation address
885
 
                        ContentValues values = new ContentValues();
886
 
                        values.put( Contacts.Organizations.PERSON_ID, id );
887
 
                        values.put( Contacts.Organizations.COMPANY, organisation );
888
 
                        values.put( Contacts.ContactMethods.TYPE,
889
 
                                Contacts.OrganizationColumns.TYPE_WORK );
890
 
                        if( data.getExtra() != null )
891
 
                                values.put( Contacts.Organizations.TITLE, data.getExtra() );
892
 
                        _doit.getContentResolver().insert(
893
 
                                Contacts.Organizations.CONTENT_URI, values );
894
 
 
895
 
                        // and add this address to the cache to prevent a addition of
896
 
                        // duplicate date from another file
897
 
                        _contacts_cache.addAssociatedOrganisation( id, organisation );
 
546
                        _doit.getContentResolver().insert( contactContactMethodsUri,
 
547
                                values );
 
548
                }
 
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();
 
553
                while( i.hasNext() ) {
 
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
                        }
898
565
                }
899
566
        }
900
567
 
905
572
                        throw new AbortImportException();
906
573
                }
907
574
        }
 
575
 
 
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 )
 
652
        {
 
653
                number = number.replaceAll( "[-\\(\\) ]", "" );
 
654
                Pattern p = Pattern.compile( "^[\\+0-9#*]+" );
 
655
                Matcher m = p.matcher( number );
 
656
                if( m.lookingAt() ) return m.group( 0 );
 
657
                return null;
 
658
        }
 
659
 
 
660
        private String sanitiseEmailAddress( String address )
 
661
        {
 
662
                address = address.trim();
 
663
                Pattern p = Pattern.compile(
 
664
                        "^[^ @]+@[a-zA-Z]([-a-zA-Z0-9]*[a-zA-z0-9])?(\\.[a-zA-Z]([-a-zA-Z0-9]*[a-zA-z0-9])?)+$" );
 
665
                Matcher m = p.matcher( address );
 
666
                if( m.matches() ) {
 
667
                        String[] bits = address.split( "@" );
 
668
                        return bits[ 0 ] + "@" + bits[ 1 ].toLowerCase();
 
669
                }
 
670
                return null;
 
671
        }
908
672
}