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