/android/import-contacts

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

« back to all changes in this revision

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

  • Committer: edam
  • Date: 2011-03-23 07:50:13 UTC
  • Revision ID: edam@waxworlds.org-20110323075013-qnza5odtlsjtcz0p
- updated TODO and NEWS
- handle different multiline schemes better
- import addresses
- check for escaped semi-colons and newlines in N, ADR and ORG lines
- minor optimisations

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