/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-04-22 15:36:06 UTC
  • Revision ID: edam@waxworlds.org-20110422153606-9x9l0nbmvx6oxfxu
- pulled contacts cache out in to seperate class

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 <edam@waxworlds.org>
 
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
50
50
 
51
51
        private Doit _doit;
52
52
        private int _response;
53
 
        private int _response_extra;
54
 
        private int _merge_setting;
55
 
        private int _last_merge_decision;
 
53
        private int _responseExtra;
 
54
        private int _mergeSetting;
 
55
        private int _lastMergeDecision;
56
56
        private boolean _abort = false;
57
 
        private boolean _is_finished = false;
 
57
        private boolean _isFinished = 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
 
         */
68
60
        public class ContactData
69
61
        {
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;
 
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;
136
135
 
137
136
                protected void setName( String name )
138
137
                {
139
138
                        _name = name;
140
139
                }
141
140
 
142
 
                public boolean hasName()
143
 
                {
144
 
                        return _name != null;
145
 
                }
146
 
 
147
141
                public String getName()
148
142
                {
149
143
                        return _name;
150
144
                }
151
145
 
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 >();
 
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 >();
269
157
                        if( !_emails.containsKey( email ) )
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;
 
158
                                _emails.put( email, new EmailData( email, type, isPreferred ) );
301
159
                }
302
160
 
303
161
                protected void addAddress( String address, int type )
304
162
                {
305
 
                        address = address.trim();
306
 
                        if( address.length() <= 0 )
307
 
                        {
308
 
                                // TODO: warn that an imported address is being ignored
309
 
                                return;
310
 
                        }
311
 
 
312
163
                        if( _addresses == null ) _addresses =
313
 
                                new HashMap< String, TypeDetail >();
 
164
                                new HashMap< String, AddressData >();
314
165
                        if( !_addresses.containsKey( address ) )
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;
 
166
                                _addresses.put( address, new AddressData( address, type ) );
374
167
                }
375
168
        }
376
169
 
382
175
                _doit = doit;
383
176
 
384
177
                SharedPreferences prefs = getSharedPreferences();
385
 
                _merge_setting = prefs.getInt( "merge_setting", Doit.ACTION_PROMPT );
 
178
                _mergeSetting = prefs.getInt( "merge_setting", Doit.ACTION_PROMPT );
386
179
        }
387
180
 
388
181
        @Override
412
205
 
413
206
        synchronized private void setIsFinished()
414
207
        {
415
 
                _is_finished = true;
 
208
                _isFinished = true;
416
209
        }
417
210
 
418
211
        protected void onImport() throws AbortImportException
429
222
                wake( response, RESPONSEEXTRA_NONE );
430
223
        }
431
224
 
432
 
        synchronized public void wake( int response, int response_extra )
 
225
        synchronized public void wake( int response, int responseExtra )
433
226
        {
434
227
                _response = response;
435
 
                _response_extra = response_extra;
 
228
                _responseExtra = responseExtra;
436
229
                notify();
437
230
        }
438
231
 
439
232
        synchronized public boolean setAbort()
440
233
        {
441
 
                if( !_is_finished && !_abort ) {
 
234
                if( !_isFinished && !_abort ) {
442
235
                        _abort = true;
443
236
                        notify();
444
237
                        return true;
568
361
                return _doit.getText( res );
569
362
        }
570
363
 
571
 
        protected boolean isImportRequired( ContactData contact )
572
 
                        throws AbortImportException, ContactNeedsMoreInfoException
 
364
        protected boolean isImportRequired( String name )
 
365
                        throws AbortImportException
573
366
        {
574
367
                checkAbort();
575
 
                return isImportRequired( contact, _merge_setting );
 
368
                return isImportRequired( name, _mergeSetting );
576
369
        }
577
370
 
578
 
        synchronized private boolean isImportRequired(
579
 
                ContactData contact, int merge_setting )
580
 
                throws AbortImportException, ContactNeedsMoreInfoException
 
371
        synchronized private boolean isImportRequired( String name,
 
372
                        int mergeSetting ) throws AbortImportException
581
373
        {
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();
 
374
                _lastMergeDecision = mergeSetting;
590
375
 
591
376
                // handle special cases
592
 
                switch( merge_setting )
 
377
                switch( mergeSetting )
593
378
                {
594
379
                case Doit.ACTION_KEEP:
595
380
                        // if we keep contacts on duplicate, we better check for one
596
 
                        return !_contactsCache.canLookup( identifier );
 
381
                        return !_contactsCache.exists( name );
597
382
 
598
383
                case Doit.ACTION_PROMPT:
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 ) )
 
384
                        // if we are prompting on duplicate, we better check for one
 
385
                        if( !_contactsCache.exists( name ) )
602
386
                                return true;
603
387
 
604
388
                        // ok, it exists, so do prompt
605
 
                        _doit._handler.sendMessage( Message.obtain( _doit._handler,
606
 
                                Doit.MESSAGE_MERGEPROMPT, identifier.getDetail() ) );
 
389
                        _doit._handler.sendMessage( Message.obtain(
 
390
                                _doit._handler, Doit.MESSAGE_MERGEPROMPT, name ) );
607
391
                        try {
608
392
                                wait();
609
393
                        }
612
396
                        // check if an abortion happened during the wait
613
397
                        checkAbort();
614
398
 
615
 
                        // if "always" was selected, make choice permanent
616
 
                        if( _response_extra == RESPONSEEXTRA_ALWAYS )
617
 
                                _merge_setting = _response;
 
399
                        // if "always" was selected, make choice permenant
 
400
                        if( _responseExtra == RESPONSEEXTRA_ALWAYS )
 
401
                                _mergeSetting = _response;
618
402
 
619
403
                        // recurse, with our new merge setting
620
 
                        return isImportRequired( contact, _response );
 
404
                        return isImportRequired( name, _response );
621
405
                }
622
406
 
623
407
                // for all other cases (either overwriting or merging) we will need the
641
425
 
642
426
                ContentValues values = new ContentValues();
643
427
                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 );
655
428
 
656
429
                // does contact exist already?
657
 
                if( id != null )
 
430
                Uri contactUri = null;
 
431
                Long id;
 
432
                if( ( id = (Long)_contactsCache.getId( contact._name ) ) != null )
658
433
                {
659
434
                        // should we skip this import altogether?
660
 
                        if( _last_merge_decision == Doit.ACTION_KEEP ) return;
 
435
                        if( _lastMergeDecision == Doit.ACTION_KEEP ) return;
661
436
 
662
437
                        // get contact's URI
663
 
                        Uri contactUri = ContentUris.withAppendedId(
 
438
                        contactUri = ContentUris.withAppendedId(
664
439
                                Contacts.People.CONTENT_URI, id );
665
440
 
666
441
                        // should we destroy the existing contact before importing?
667
 
                        if( _last_merge_decision == Doit.ACTION_OVERWRITE )
668
 
                        {
669
 
                                // remove from device
 
442
                        if( _lastMergeDecision == Doit.ACTION_OVERWRITE ) {
670
443
                                _doit.getContentResolver().delete( contactUri, null, null );
671
 
 
672
 
                                // update cache
673
 
                                _contactsCache.removeLookup( identifier );
674
 
                                _contactsCache.removeAssociatedData( id );
675
 
 
676
 
                                // show that we're overwriting a contact
 
444
                                contactUri = null;
 
445
 
 
446
                                // update the UI
677
447
                                _doit._handler.sendEmptyMessage(
678
448
                                                Doit.MESSAGE_CONTACTOVERWRITTEN );
679
449
                                uiInformed = true;
680
450
 
681
 
                                // discard the contact id
682
 
                                id = null;
 
451
                                // update cache
 
452
                                _contactsCache.remove( contact._name );
683
453
                        }
684
454
                }
685
455
 
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 )
 
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 )
689
459
                {
690
460
                        // create a new contact
691
461
                        values.put( Contacts.People.NAME, contact._name );
692
 
                        Uri contactUri = _doit.getContentResolver().insert(
 
462
                        contactUri = _doit.getContentResolver().insert(
693
463
                                Contacts.People.CONTENT_URI, values );
694
464
                        id = ContentUris.parseId( contactUri );
695
 
                        if( id == null || id <= 0 )
696
 
                                showError( R.string.error_unabletoaddcontact );
 
465
                        if( id <= 0 ) return;   // shouldn't happen!
697
466
 
698
467
                        // try to add them to the "My Contacts" group
699
468
                        try {
705
474
                        }
706
475
 
707
476
                        // update cache
708
 
                        _contactsCache.addLookup(
709
 
                                ContactsCache.createIdentifier( contact ), id );
 
477
                        _contactsCache.put( id, contact._name );
710
478
 
711
 
                        // if we haven't already shown that we're overwriting a contact,
712
 
                        // show that we're creating a new contact
 
479
                        // update UI
713
480
                        if( !uiInformed ) {
714
481
                                _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTCREATED );
715
482
                                uiInformed = true;
716
483
                        }
717
484
                }
718
485
 
719
 
                // if we haven't already shown that we're overwriting or creating a
720
 
                // contact show that we're merging a contact
 
486
                // update UI
721
487
                if( !uiInformed )
722
488
                        _doit._handler.sendEmptyMessage( Doit.MESSAGE_CONTACTMERGED );
723
489
 
724
490
                // import contact parts
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() );
 
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 );
733
497
        }
734
498
 
735
 
        private void importContactPhones( Long id,
736
 
                        HashMap< String, ContactData.PreferredDetail > datas )
 
499
        private void importContactPhones( Uri contactUri,
 
500
                        HashMap< String, ContactData.PhoneData > phones )
737
501
        {
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();
 
502
                Long contactId = ContentUris.parseId( contactUri );
 
503
                Uri contactPhonesUri = Uri.withAppendedPath( contactUri,
 
504
                                Contacts.People.Phones.CONTENT_DIRECTORY );
 
505
                Set< String > phonesKeys = phones.keySet();
743
506
 
744
507
                // add phone numbers
745
 
                Iterator< String > i = datasKeys.iterator();
 
508
                Iterator< String > i = phonesKeys.iterator();
746
509
                while( i.hasNext() ) {
747
 
                        String number = i.next();
748
 
                        ContactData.PreferredDetail data = datas.get( number );
 
510
                        ContactData.PhoneData phone = phones.get( i.next() );
749
511
 
750
512
                        // we don't want to add this number if it's crap, or it already
751
513
                        // exists (which would cause a duplicate to be created). We don't
754
516
                        // if the number exists at all, it doesn't need importing. Because
755
517
                        // of this, we also can't update the cache (which we don't need to
756
518
                        // anyway, so it's not a problem).
757
 
                        if( _contactsCache.hasAssociatedNumber( id, number ) )
758
 
                                continue;
 
519
                        String number = sanitisePhoneNumber( phone._number );
 
520
                        if( number == null ) continue;
 
521
                        if( _contactsCache.hasNumber( contactId, number ) ) continue;
759
522
 
760
523
                        // add phone number
761
524
                        ContentValues values = new ContentValues();
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 );
 
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 );
766
528
                        _doit.getContentResolver().insert( contactPhonesUri, values );
767
529
 
768
530
                        // and add this address to the cache to prevent a addition of
769
531
                        // duplicate date from another file
770
 
                        _contactsCache.addAssociatedNumber( id, number );
 
532
                        _contactsCache.addNumber( contactId, number );
771
533
                }
772
534
        }
773
535
 
774
 
        private void importContactEmails( Long id,
775
 
                        HashMap< String, ContactData.PreferredDetail > datas )
 
536
        private void importContactEmails( Uri contactUri,
 
537
                        HashMap< String, ContactData.EmailData > emails )
776
538
        {
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();
 
539
                Long contactId = ContentUris.parseId( contactUri );
 
540
                Uri contactContactMethodsUri = Uri.withAppendedPath( contactUri,
 
541
                                Contacts.People.ContactMethods.CONTENT_DIRECTORY );
 
542
                Set< String > emailsKeys = emails.keySet();
782
543
 
783
544
                // add email addresses
784
 
                Iterator< String > i = datasKeys.iterator();
 
545
                Iterator< String > i = emailsKeys.iterator();
785
546
                while( i.hasNext() ) {
786
 
                        String email = i.next();
787
 
                        ContactData.PreferredDetail data = datas.get( email );
 
547
                        ContactData.EmailData email = emails.get( i.next() );
788
548
 
789
549
                        // we don't want to add this email address if it exists already or
790
550
                        // we would introduce duplicates.
791
 
                        if( _contactsCache.hasAssociatedEmail( id, email ) )
792
 
                                continue;
 
551
                        String address = sanitiseEmailAddress( email.getAddress() );
 
552
                        if( address == null ) continue;
 
553
                        if( _contactsCache.hasEmail( contactId, address ) ) continue;
793
554
 
794
555
                        // add phone number
795
556
                        ContentValues values = new ContentValues();
796
557
                        values.put( Contacts.ContactMethods.KIND, Contacts.KIND_EMAIL );
797
 
                        values.put( Contacts.ContactMethods.DATA, email );
798
 
                        values.put( Contacts.ContactMethods.TYPE, data.getType() );
799
 
                        if( data.isPreferred() )
 
558
                        values.put( Contacts.ContactMethods.DATA, email.getAddress() );
 
559
                        values.put( Contacts.ContactMethods.TYPE, email.getType() );
 
560
                        if( email.isPreferred() )
800
561
                                values.put( Contacts.ContactMethods.ISPRIMARY, 1 );
801
562
                        _doit.getContentResolver().insert( contactContactMethodsUri,
802
563
                                values );
803
564
 
804
565
                        // and add this address to the cache to prevent a addition of
805
566
                        // duplicate date from another file
806
 
                        _contactsCache.addAssociatedEmail( id, email );
 
567
                        _contactsCache.addEmail( contactId, address );
807
568
                }
808
569
        }
809
570
 
810
 
        private void importContactAddresses( Long id,
811
 
                HashMap< String, ContactData.TypeDetail > datas )
 
571
        private void importContactAddresses( Uri contactUri,
 
572
                HashMap< String, ContactData.AddressData > addresses )
812
573
        {
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 );
 
574
                Long contactId = ContentUris.parseId( contactUri );
 
575
                Uri contactContactMethodsUri = Uri.withAppendedPath( contactUri,
 
576
                                Contacts.People.ContactMethods.CONTENT_DIRECTORY );
 
577
                Set< String > addressesKeys = addresses.keySet();
817
578
 
818
579
                // add addresses
819
 
                Set< String > datasKeys = datas.keySet();
820
 
                Iterator< String > i = datasKeys.iterator();
 
580
                Iterator< String > i = addressesKeys.iterator();
821
581
                while( i.hasNext() ) {
822
 
                        String address = i.next();
823
 
                        ContactData.TypeDetail data = datas.get( address );
 
582
                        ContactData.AddressData address = addresses.get( i.next() );
824
583
 
825
584
                        // we don't want to add this address if it exists already or we
826
585
                        // would introduce duplicates
827
 
                        if( _contactsCache.hasAssociatedAddress( id, address ) )
 
586
                        if( address == null ) continue;
 
587
                        if( _contactsCache.hasAddress( contactId, address.getAddress() ) )
828
588
                                continue;
829
589
 
830
590
                        // add postal address
831
591
                        ContentValues values = new ContentValues();
832
592
                        values.put( Contacts.ContactMethods.KIND, Contacts.KIND_POSTAL );
833
 
                        values.put( Contacts.ContactMethods.DATA, address );
834
 
                        values.put( Contacts.ContactMethods.TYPE, data.getType() );
 
593
                        values.put( Contacts.ContactMethods.DATA, address.getAddress() );
 
594
                        values.put( Contacts.ContactMethods.TYPE, address.getType() );
835
595
                        _doit.getContentResolver().insert( contactContactMethodsUri,
836
596
                                values );
837
597
 
838
598
                        // and add this address to the cache to prevent a addition of
839
599
                        // duplicate date from another file
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 );
 
600
                        _contactsCache.addAddress( contactId, address.getAddress() );
873
601
                }
874
602
        }
875
603
 
880
608
                        throw new AbortImportException();
881
609
                }
882
610
        }
 
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
        }
883
633
}