/android/import-contacts

To get this branch, use:
bzr branch http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to src/org/waxworlds/edam/importcontacts/Importer.java

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

Show diffs side-by-side

added added

removed removed

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