/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/VCFImporter.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

1
1
/*
2
2
 * VCFImporter.java
3
3
 *
4
 
 * Copyright (C) 2009 to 2011 Tim Marston <tim@ed.am>
 
4
 * Copyright (C) 2009 Tim Marston <edam@waxworlds.org>
5
5
 *
6
6
 * This file is part of the Import Contacts program (hereafter referred
7
7
 * to as "this program"). For more information, see
8
 
 * http://ed.am/dev/android/import-contacts
 
8
 * http://www.waxworlds.org/edam/software/android/import-contacts
9
9
 *
10
10
 * This program is free software: you can redistribute it and/or modify
11
11
 * it under the terms of the GNU General Public License as published by
21
21
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
22
 */
23
23
 
24
 
package am.ed.importcontacts;
 
24
package org.waxworlds.edam.importcontacts;
25
25
 
26
26
import java.io.BufferedReader;
27
27
import java.io.File;
34
34
import java.nio.ByteBuffer;
35
35
import java.util.ArrayList;
36
36
import java.util.Arrays;
37
 
import java.util.HashMap;
38
37
import java.util.HashSet;
39
38
import java.util.Iterator;
40
39
import java.util.List;
41
 
import java.util.Locale;
42
40
import java.util.NoSuchElementException;
43
41
import java.util.Set;
44
42
import java.util.Vector;
45
43
import java.util.regex.Matcher;
46
44
import java.util.regex.Pattern;
47
45
 
48
 
import android.annotation.SuppressLint;
49
46
import android.content.SharedPreferences;
 
47
import android.provider.Contacts;
 
48
import android.provider.Contacts.PhonesColumns;
50
49
 
51
 
public class VcardImporter extends Importer
 
50
public class VCFImporter extends Importer
52
51
{
53
 
        private int _vcard_count = 0;
 
52
        private int _vCardCount = 0;
54
53
        private int _progress = 0;
55
54
 
56
 
        public VcardImporter( Doit doit )
 
55
        public VCFImporter( Doit doit )
57
56
        {
58
57
                super( doit );
59
58
        }
60
59
 
61
 
        @SuppressLint( "SdCardPath" )
62
60
        @Override
63
61
        protected void onImport() throws AbortImportException
64
62
        {
83
81
                                // get files
84
82
                                class VCardFilter implements FilenameFilter {
85
83
                                        public boolean accept( File dir, String name ) {
86
 
                                                return name.toLowerCase( Locale.US ).endsWith( ".vcf" );
 
84
                                                return name.toLowerCase().endsWith( ".vcf" );
87
85
                                        }
88
86
                                }
89
87
                                files = file.listFiles( new VCardFilter() );
111
109
                        countVCardFile( files[ i ] );
112
110
                        setTmpProgress( i );
113
111
                }
114
 
                setProgressMax( _vcard_count ); // will also update tmp progress
 
112
                setProgressMax( _vCardCount );  // will also update tmp progress
115
113
 
116
114
                // import them
117
115
                setProgress( 0 );
118
116
                for( int i = 0; i < files.length; i++ )
119
117
                        importVCardFile( files[ i ] );
120
 
                setProgress( _vcard_count );
121
118
        }
122
119
 
123
120
        private void countVCardFile( File file ) throws AbortImportException
130
127
 
131
128
                        // read
132
129
                        String line;
133
 
                        boolean in_vcard = false;
 
130
                        boolean inVCard = false;
134
131
                        while( ( line = reader.readLine() ) != null )
135
132
                        {
136
 
                                if( !in_vcard ) {
 
133
                                if( !inVCard ) {
137
134
                                        // look for vcard beginning
138
135
                                        if( line.matches( "^BEGIN:VCARD" ) ) {
139
 
                                                in_vcard = true;
140
 
                                                _vcard_count++;
 
136
                                                inVCard = true;
 
137
                                                _vCardCount++;
141
138
                                        }
142
139
                                }
143
140
                                else if( line.matches( "^END:VCARD" ) )
144
 
                                        in_vcard = false;
 
141
                                        inVCard = false;
145
142
                        }
146
143
 
147
144
                }
170
167
                        FileInputStream istream = new FileInputStream( file );
171
168
                        byte[] content = new byte[ (int)file.length() ];
172
169
                        istream.read( content );
173
 
                        istream = null;
174
170
 
175
171
                        // import
176
172
                        importVCardFileContent( content, file.getName() );
177
173
                }
178
 
                catch( OutOfMemoryError e ) {
179
 
                        showError( R.string.error_outofmemory );
180
 
                }
181
174
                catch( FileNotFoundException e ) {
182
175
                        showError( getText( R.string.error_filenotfound ) +
183
176
                                file.getName() );
191
184
                throws AbortImportException
192
185
        {
193
186
                // go through lines
194
 
                Vcard vcard = null;
195
 
                int vcard_start_line = 0;
 
187
                VCard vCard = null;
196
188
                ContentLineIterator cli = new ContentLineIterator( content );
197
189
                while( cli.hasNext() )
198
190
                {
199
 
                        ContentLine content_line = cli.next();
200
 
 
201
 
                        // get a US-ASCII version of the string, for processing
202
 
                        String line = content_line.getUsAsciiLine();
203
 
 
204
 
                        if( vcard == null ) {
 
191
                        ByteBuffer buffer = cli.next();
 
192
 
 
193
                        // get a US-ASCII version of the line for processing
 
194
                        String line;
 
195
                        try {
 
196
                                line = new String( buffer.array(), buffer.position(),
 
197
                                        buffer.limit() - buffer.position(), "US-ASCII" );
 
198
                        }
 
199
                        catch( UnsupportedEncodingException e ) {
 
200
                                // we know US-ASCII is supported, so appease the compiler...
 
201
                                line = "";
 
202
                        }
 
203
 
 
204
                        if( vCard == null ) {
205
205
                                // look for vcard beginning
206
 
                                if( line.matches( "^BEGIN[ \t]*:[ \t]*VCARD" ) ) {
207
 
                                        setProgress( _progress++ );
208
 
                                        vcard = new Vcard();
209
 
                                        vcard_start_line = cli.getLineNumber();
 
206
                                if( line.matches( "^BEGIN:VCARD" ) ) {
 
207
                                        setProgress( ++_progress );
 
208
                                        vCard = new VCard();
210
209
                                }
211
210
                        }
212
211
                        else {
213
212
                                // look for vcard content or ending
214
 
                                if( line.matches( "^END[ \t]*:[ \t]*VCARD" ) )
 
213
                                if( line.matches( "^END:VCARD" ) )
215
214
                                {
216
 
                                        // finalise the vcard/contact
 
215
                                        // store vcard and do away with it
217
216
                                        try {
218
 
                                                vcard.finaliseVcard();
219
 
 
220
 
                                                // pass the finalised contact to the importer
221
 
                                                importContact( vcard );
222
 
                                        }
223
 
                                        catch( Vcard.ParseException e ) {
224
 
                                                if( !showContinue(
225
 
                                                        getText( R.string.error_vcf_parse ).toString()
226
 
                                                        + fileName +
227
 
                                                        getText( R.string.error_vcf_parse_line ).toString()
228
 
                                                        + cli.getLineNumber() + ":\n" + e.getMessage() ) )
229
 
                                                {
230
 
                                                        finish( ACTION_ABORT );
231
 
                                                }
232
 
                                                else
233
 
                                                        skipContact();
234
 
                                        }
235
 
                                        catch( ContactData.ContactNotIdentifiableException e ) {
236
 
                                                if( !showContinue(
237
 
                                                        getText( R.string.error_vcf_parse ).toString()
238
 
                                                        + fileName +
239
 
                                                        getText( R.string.error_vcf_parse_line ).toString()
240
 
                                                        + vcard_start_line + ":\n" + getText(
241
 
                                                                R.string.error_vcf_notenoughinfo ).toString()
242
 
                                                ) )
243
 
                                                {
244
 
                                                        finish( ACTION_ABORT );
245
 
                                                }
246
 
                                                else
247
 
                                                        skipContact();
248
 
                                        }
249
 
 
250
 
                                        // discard this vcard
251
 
                                        vcard = null;
 
217
                                                vCard.finaliseParsing();
 
218
                                                importContact( vCard );
 
219
                                        }
 
220
                                        catch( VCard.ParseException e ) {
 
221
                                                skipContact();
 
222
                                                if( !showContinue(
 
223
                                                        getText( R.string.error_vcf_parse ).toString()
 
224
                                                        + fileName + "\n" + e.getMessage() ) )
 
225
                                                {
 
226
                                                        finish( ACTION_ABORT );
 
227
                                                }
 
228
                                        }
 
229
                                        catch( VCard.SkipContactException e ) {
 
230
                                                skipContact();
 
231
                                                // do nothing
 
232
                                        }
 
233
                                        vCard = null;
252
234
                                }
253
235
                                else
254
236
                                {
255
237
                                        // try giving the line to the vcard
256
238
                                        try {
257
 
                                                vcard.parseLine( content_line );
 
239
                                                vCard.parseLine( buffer, line,
 
240
                                                        cli.doesNextLineLookFolded() );
258
241
                                        }
259
 
                                        catch( Vcard.ParseException e ) {
 
242
                                        catch( VCard.ParseException e ) {
260
243
                                                skipContact();
261
244
                                                if( !showContinue(
262
245
                                                        getText( R.string.error_vcf_parse ).toString()
263
 
                                                        + fileName +
264
 
                                                        getText( R.string.error_vcf_parse_line ).toString()
265
 
                                                        + cli.getLineNumber() + "\n" + e.getMessage() ) )
 
246
                                                        + fileName + "\n" + e.getMessage() ) )
266
247
                                                {
267
248
                                                        finish( ACTION_ABORT );
268
249
                                                }
270
251
                                                // although we're continuing, we still need to abort
271
252
                                                // this vCard. Further lines will be ignored until we
272
253
                                                // get to another BEGIN:VCARD line.
273
 
                                                vcard = null;
 
254
                                                vCard = null;
274
255
                                        }
275
 
                                        catch( Vcard.SkipImportException e ) {
 
256
                                        catch( VCard.SkipContactException e ) {
276
257
                                                skipContact();
277
258
                                                // abort this vCard. Further lines will be ignored until
278
259
                                                // we get to another BEGIN:VCARD line.
279
 
                                                vcard = null;
 
260
                                                vCard = null;
280
261
                                        }
281
262
                                }
282
263
                        }
283
264
                }
284
265
        }
285
266
 
286
 
        class ContentLine
287
 
        {
288
 
                private ByteBuffer _buffer;
289
 
                private boolean _folded_next;
290
 
                private String _line;
291
 
 
292
 
                public ContentLine( ByteBuffer buffer, boolean folded_next )
293
 
                {
294
 
                        _buffer = buffer;
295
 
                        _folded_next = folded_next;
296
 
                        _line = null;
297
 
                }
298
 
 
299
 
                public ByteBuffer getBuffer()
300
 
                {
301
 
                        return _buffer;
302
 
                }
303
 
 
304
 
                public boolean doesNextLineLookFolded()
305
 
                {
306
 
                        return _folded_next;
307
 
                }
308
 
 
309
 
                public String getUsAsciiLine()
310
 
                {
311
 
                        // generated line and cache it
312
 
                        if( _line == null ) {
313
 
                                try {
314
 
                                        _line = new String( _buffer.array(), _buffer.position(),
315
 
                                                _buffer.limit() - _buffer.position(), "US-ASCII" );
316
 
                                }
317
 
                                catch( UnsupportedEncodingException e ) {
318
 
                                        // we know US-ASCII *is* supported, so appease the
319
 
                                        // compiler...
320
 
                                }
321
 
                        }
322
 
 
323
 
                        // return cached line
324
 
                        return _line;
325
 
                }
326
 
        }
327
 
 
328
 
        class ContentLineIterator implements Iterator< ContentLine >
 
267
        class ContentLineIterator implements Iterator< ByteBuffer >
329
268
        {
330
269
                protected byte[] _content = null;
331
270
                protected int _pos = 0;
332
 
                protected int _line = 0;
333
271
 
334
272
                public ContentLineIterator( byte[] content )
335
273
                {
343
281
                }
344
282
 
345
283
                @Override
346
 
                public ContentLine next()
 
284
                public ByteBuffer next()
347
285
                {
348
286
                        int initial_pos = _pos;
349
287
 
355
293
                                        int to = ( _pos > 0 && _content[ _pos - 1 ] == '\r' &&
356
294
                                                _pos > initial_pos )? _pos - 1 : _pos;
357
295
                                        _pos++;
358
 
                                        _line++;
359
 
                                        return new ContentLine(
360
 
                                                ByteBuffer.wrap( _content, initial_pos,
361
 
                                                        to - initial_pos ),
362
 
                                                doesNextLineLookFolded() );
 
296
                                        return ByteBuffer.wrap( _content, initial_pos,
 
297
                                                to - initial_pos );
363
298
                                }
364
299
 
365
300
                        // we didn't find one, but were there bytes left?
366
301
                        if( _pos != initial_pos ) {
367
302
                                int to = _pos;
368
303
                                _pos++;
369
 
                                _line++;
370
 
                                return new ContentLine(
371
 
                                        ByteBuffer.wrap( _content, initial_pos,
372
 
                                                to - initial_pos ),
373
 
                                        doesNextLineLookFolded() );
 
304
                                return ByteBuffer.wrap( _content, initial_pos,
 
305
                                        to - initial_pos );
374
306
                        }
375
307
 
376
308
                        // no bytes left
388
320
                 * onto the end of this one?
389
321
                 * @return
390
322
                 */
391
 
                private boolean doesNextLineLookFolded()
 
323
                public boolean doesNextLineLookFolded()
392
324
                {
393
325
                        return _pos > 0 && _pos < _content.length &&
394
 
                                _content[ _pos - 1 ] == '\n' &&
395
 
                                ( _content[ _pos ] == ' ' || _content[ _pos ] == '\t' );
396
 
                }
397
 
 
398
 
                public int getLineNumber()
399
 
                {
400
 
                        return _line;
 
326
                                _content[ _pos - 1 ] == '\n' && _content[ _pos ] == ' ';
401
327
                }
402
328
        }
403
329
 
404
 
        private class Vcard extends ContactData
 
330
        private class VCard extends ContactData
405
331
        {
406
332
                private final static int NAMELEVEL_NONE = 0;
407
 
                private final static int NAMELEVEL_N = 1;
 
333
                private final static int NAMELEVEL_ORG = 1;
408
334
                private final static int NAMELEVEL_FN = 2;
 
335
                private final static int NAMELEVEL_N = 3;
409
336
 
410
337
                private final static int MULTILINE_NONE = 0;
411
338
                private final static int MULTILINE_ENCODED = 1; // v2.1 quoted-printable
412
339
                private final static int MULTILINE_ESCAPED = 2; // v2.1 \\CRLF
413
 
                private final static int MULTILINE_FOLDED = 3;  // MIME-DIR folding
 
340
                private final static int MULTILINE_FOLDED = 3;  // v3.0 folding
414
341
 
415
342
                private String _version = null;
416
 
                private Vector< ContentLine > _content_lines = null;
 
343
                private Vector< ByteBuffer > _buffers = null;
417
344
                private int _name_level = NAMELEVEL_NONE;
418
345
                private int _parser_multiline_state = MULTILINE_NONE;
419
346
                private String _parser_current_name_and_params = null;
420
347
                private String _parser_buffered_value_so_far = "";
421
 
                private String _cached_organisation = null;
422
 
                private String _cached_title = null;
423
348
 
424
349
                protected class UnencodeResult
425
350
                {
455
380
 
456
381
                        public ParseException( int res )
457
382
                        {
458
 
                                super( VcardImporter.this.getText( res ).toString() );
 
383
                                super( VCFImporter.this.getText( res ).toString() );
459
384
                        }
460
385
                }
461
386
 
462
387
                @SuppressWarnings("serial")
463
 
                protected class SkipImportException extends Exception { }
 
388
                protected class SkipContactException extends Exception { }
464
389
 
465
 
                private String extractCollonPartFromLine( ContentLine content_line,
466
 
                        boolean former )
 
390
                private String extractCollonPartFromLine( ByteBuffer buffer,
 
391
                        String line, boolean former )
467
392
                {
468
393
                        String ret = null;
469
394
 
 
395
                        // get a US-ASCII version of the line for processing, unless we were
 
396
                        // supplied with one
 
397
                        if( line == null ) {
 
398
                                try {
 
399
                                        line = new String( buffer.array(), buffer.position(),
 
400
                                                buffer.limit() - buffer.position(), "US-ASCII" );
 
401
                                }
 
402
                                catch( UnsupportedEncodingException e ) {
 
403
                                        // we know US-ASCII is supported, so appease the compiler...
 
404
                                        line = "";
 
405
                                }
 
406
                        }
 
407
 
470
408
                        // split line into name and value parts and check to make sure we
471
409
                        // only got 2 parts and that the first part is not zero in length
472
 
                        String[] parts = content_line.getUsAsciiLine().split( ":", 2 );
 
410
                        String[] parts = line.split( ":", 2 );
473
411
                        if( parts.length == 2 && parts[ 0 ].length() > 0 )
474
412
                                ret = parts[ former? 0 : 1 ];
475
413
 
476
414
                        return ret;
477
415
                }
478
416
 
479
 
                private String extractNameAndParamsFromLine( ContentLine content_line )
480
 
                {
481
 
                        return extractCollonPartFromLine( content_line, true );
482
 
                }
483
 
 
484
 
                private String extractValueFromLine( ContentLine content_line )
485
 
                {
486
 
                        return extractCollonPartFromLine( content_line, false );
487
 
                }
488
 
 
489
 
                public void parseLine( ContentLine content_line )
490
 
                        throws ParseException, SkipImportException,
 
417
                private String extractNameAndParamsFromLine( ByteBuffer buffer,
 
418
                        String line )
 
419
                {
 
420
                        return extractCollonPartFromLine( buffer, line, true );
 
421
                }
 
422
 
 
423
                private String extractValueFromLine( ByteBuffer buffer, String line )
 
424
                {
 
425
                        return extractCollonPartFromLine( buffer, line, false );
 
426
                }
 
427
 
 
428
                public void parseLine( ByteBuffer buffer, String line,
 
429
                        boolean next_line_looks_folded )
 
430
                        throws ParseException, SkipContactException,
491
431
                        AbortImportException
492
432
                {
493
433
                        // do we have a version yet?
495
435
                        {
496
436
                                // tentatively get name and params from line
497
437
                                String name_and_params =
498
 
                                        extractNameAndParamsFromLine( content_line );
 
438
                                        extractNameAndParamsFromLine( buffer, line );
499
439
 
500
440
                                // is it a version line?
501
441
                                if( name_and_params != null &&
502
 
                                        name_and_params.equalsIgnoreCase( "VERSION" ) )
 
442
                                        name_and_params.equals( "VERSION" ) )
503
443
                                {
504
444
                                        // yes, get it!
505
 
                                        String value = extractValueFromLine( content_line );
 
445
                                        String value = extractValueFromLine( buffer, line );
506
446
                                        if( !value.equals( "2.1" ) && !value.equals( "3.0" ) )
507
447
                                                throw new ParseException( R.string.error_vcf_version );
508
448
                                        _version = value;
509
449
 
510
450
                                        // parse any buffers we've been accumulating while we waited
511
451
                                        // for a version
512
 
                                        if( _content_lines != null )
513
 
                                                for( int i = 0; i < _content_lines.size(); i++ )
514
 
                                                        parseLine( _content_lines.get( i ) );
515
 
                                        _content_lines = null;
 
452
                                        if( _buffers != null )
 
453
                                                for( int i = 0; i < _buffers.size(); i++ )
 
454
                                                        parseLine( _buffers.get( i ), null,
 
455
                                                                i + 1 < _buffers.size() &&
 
456
                                                                _buffers.get( i + 1 ).hasRemaining() &&
 
457
                                                                _buffers.get( i + 1 ).get(
 
458
                                                                        _buffers.get( i + 1 ).position() ) == ' ' );
 
459
                                        _buffers = null;
516
460
                                }
517
461
                                else
518
462
                                {
519
463
                                        // no, so stash this line till we get a version
520
 
                                        if( _content_lines == null )
521
 
                                                _content_lines = new Vector< ContentLine >();
522
 
                                        _content_lines.add( content_line );
 
464
                                        if( _buffers == null )
 
465
                                                _buffers = new Vector< ByteBuffer >();
 
466
                                        _buffers.add( buffer );
523
467
                                }
524
468
                        }
525
469
                        else
526
470
                        {
527
471
                                // name and params and the position in the buffer where the
528
 
                                // "value" part of the line starts
 
472
                                // "value" part of the line start
529
473
                                String name_and_params;
530
474
                                int pos;
531
475
 
537
481
 
538
482
                                        // skip some initial line characters, depending on the type
539
483
                                        // of multi-line we're handling
540
 
                                        pos = content_line.getBuffer().position();
 
484
                                        pos = buffer.position();
541
485
                                        switch( _parser_multiline_state )
542
486
                                        {
543
487
                                        case MULTILINE_FOLDED:
544
488
                                                pos++;
545
489
                                                break;
546
490
                                        case MULTILINE_ENCODED:
547
 
                                                while( pos < content_line.getBuffer().limit() && (
548
 
                                                        content_line.getBuffer().get( pos ) == ' ' ||
549
 
                                                        content_line.getBuffer().get( pos ) == '\t' ) )
 
491
                                                while( pos < buffer.limit() && (
 
492
                                                        buffer.get( pos ) == ' ' ||
 
493
                                                        buffer.get( pos ) == '\t' ) )
550
494
                                                {
551
495
                                                        pos++;
552
496
                                                }
561
505
                                }
562
506
                                else
563
507
                                {
564
 
                                        // skip empty lines
565
 
                                        if( content_line.getUsAsciiLine().trim().length() == 0 )
566
 
                                                return;
567
 
 
568
508
                                        // get name and params from line, and since we're not
569
509
                                        // parsing a subsequent line in a multi-line, this should
570
510
                                        // not fail, or it's an error
571
511
                                        name_and_params =
572
 
                                                extractNameAndParamsFromLine( content_line );
 
512
                                                extractNameAndParamsFromLine( buffer, line );
573
513
                                        if( name_and_params == null )
574
514
                                                throw new ParseException(
575
515
                                                        R.string.error_vcf_malformed );
576
516
 
577
517
                                        // calculate how many chars to skip from beginning of line
578
518
                                        // so we skip the property "name:" part
579
 
                                        pos = content_line.getBuffer().position() +
580
 
                                                name_and_params.length() + 1;
 
519
                                        pos = buffer.position() + name_and_params.length() + 1;
581
520
 
582
521
                                        // reset the saved multi-line state
583
522
                                        _parser_current_name_and_params = name_and_params;
586
525
 
587
526
                                // get value from buffer, as raw bytes
588
527
                                ByteBuffer value;
589
 
                                value = ByteBuffer.wrap( content_line.getBuffer().array(), pos,
590
 
                                        content_line.getBuffer().limit() - pos );
 
528
                                value = ByteBuffer.wrap( buffer.array(), pos,
 
529
                                        buffer.limit() - pos );
591
530
 
592
531
                                // get parameter parts
593
532
                                String[] name_param_parts = name_and_params.split( ";", -1 );
594
533
                                for( int i = 0; i < name_param_parts.length; i++ )
595
534
                                        name_param_parts[ i ] = name_param_parts[ i ].trim();
596
535
 
597
 
                                // determine whether we care about this entry
598
 
                                final HashSet< String > interesting_fields =
599
 
                                        new HashSet< String >( Arrays.asList( new String[] { "N",
600
 
                                                "FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR", "LABEL" }
601
 
                                ) );
602
 
                                boolean is_interesting_field =
603
 
                                        interesting_fields.contains(
604
 
                                                name_param_parts[ 0 ].toUpperCase( Locale.US ) );
605
 
 
606
536
                                // parse encoding parameter
607
537
                                String encoding = checkParam( name_param_parts, "ENCODING" );
608
 
                                if( encoding != null )
609
 
                                        encoding = encoding.toUpperCase( Locale.US );
610
 
                                if( is_interesting_field && encoding != null &&
611
 
                                        !encoding.equalsIgnoreCase( "8BIT" ) &&
612
 
                                        !encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
613
 
                                        //&& !encoding.equalsIgnoreCase( "BASE64" ) )
 
538
                                if( encoding != null ) encoding = encoding.toUpperCase();
 
539
                                if( encoding != null && !encoding.equals( "8BIT" ) &&
 
540
                                        !encoding.equals( "QUOTED-PRINTABLE" ) )
 
541
                                        //&& !encoding.equals( "BASE64" ) )
614
542
                                {
615
543
                                        throw new ParseException( R.string.error_vcf_encoding );
616
544
                                }
617
545
 
618
546
                                // parse charset parameter
619
547
                                String charset = checkParam( name_param_parts, "CHARSET" );
620
 
                                if( charset != null )
621
 
                                        charset = charset.toUpperCase( Locale.US );
622
 
                                if( charset != null &&
623
 
                                        !charset.equalsIgnoreCase( "US-ASCII" ) &&
624
 
                                        !charset.equalsIgnoreCase( "ASCII" ) &&
625
 
                                        !charset.equalsIgnoreCase( "UTF-8" ) )
 
548
                                if( charset != null ) charset = charset.toUpperCase();
 
549
                                if( charset != null && !charset.equals( "US-ASCII" ) &&
 
550
                                        !charset.equals( "ASCII" ) &&
 
551
                                        !charset.equals( "UTF-8" ) )
626
552
                                {
627
553
                                        throw new ParseException( R.string.error_vcf_charset );
628
554
                                }
630
556
                                // do unencoding (or default to a fake unencoding result with
631
557
                                // the raw string)
632
558
                                UnencodeResult unencoding_result = null;
633
 
                                if( encoding != null &&
634
 
                                        encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
635
 
                                {
 
559
                                if( encoding != null && encoding.equals( "QUOTED-PRINTABLE" ) )
636
560
                                        unencoding_result = unencodeQuotedPrintable( value );
637
 
                                }
638
 
//                              else if( encoding != null &&
639
 
//                                      encoding.equalsIgnoreCase( "BASE64" ) )
640
 
//                              {
 
561
//                              else if( encoding != null && encoding.equals( "BASE64" ) )
641
562
//                                      unencoding_result = unencodeBase64( props[ 1 ], charset );
642
 
//                              }
643
563
                                if( unencoding_result != null ) {
644
564
                                        value = unencoding_result.getBuffer();
645
565
                                        if( unencoding_result.isAnotherLineRequired() )
646
566
                                                _parser_multiline_state = MULTILINE_ENCODED;
647
567
                                }
648
568
 
649
 
                                // convert 8-bit US-ASCII charset to UTF-8 (where no charset is
650
 
                                // specified for a v2.1 vcard entry, we assume it's US-ASCII)
651
 
                                if( ( charset == null && _version.equals( "2.1" ) ) ||
652
 
                                        ( charset != null && (
653
 
                                                charset.equalsIgnoreCase( "ASCII" ) ||
654
 
                                                charset.equalsIgnoreCase( "US-ASCII" ) ) ) )
655
 
                                {
 
569
                                // convert 8-bit ASCII charset to US-ASCII
 
570
                                if( charset == null || charset.equals( "ASCII" ) ) {
656
571
                                        value = transcodeAsciiToUtf8( value );
 
572
                                        charset = "UTF-8";
657
573
                                }
658
574
 
659
 
                                // process charset (value is now in UTF-8)
 
575
                                // process charset
660
576
                                String string_value;
661
577
                                try {
662
578
                                        string_value = new String( value.array(), value.position(),
663
 
                                                value.limit() - value.position(), "UTF-8" );
 
579
                                                value.limit() - value.position(), charset );
664
580
                                } catch( UnsupportedEncodingException e ) {
665
581
                                        throw new ParseException( R.string.error_vcf_charset );
666
582
                                }
668
584
                                // for some entries that have semicolon-separated value parts,
669
585
                                // check to see if the value ends in an escape character, which
670
586
                                // indicates that we have a multi-line value
671
 
                                if( ( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) ||
672
 
                                        name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) ||
673
 
                                        name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) ) &&
 
587
                                if( ( name_param_parts[ 0 ].equals( "N" ) ||
 
588
                                        name_param_parts[ 0 ].equals( "ORG" ) ||
 
589
                                        name_param_parts[ 0 ].equals( "ADR" ) ) &&
674
590
                                        doesStringEndInAnEscapeChar( string_value ) )
675
591
                                {
676
592
                                        _parser_multiline_state = MULTILINE_ESCAPED;
678
594
                                                string_value.length() - 1 );
679
595
                                }
680
596
 
681
 
                                // if we know we're not in an encoding-based multi-line, check
682
 
                                // to see if we're in a folded multi-line
 
597
                                // now we know whether we're in an encoding multi-line,
 
598
                                // determine if we're in a v3 folded multi-line or not
683
599
                                if( _parser_multiline_state == MULTILINE_NONE &&
684
 
                                        content_line.doesNextLineLookFolded() )
 
600
                                        _version.equals( "3.0" ) && next_line_looks_folded )
685
601
                                {
686
602
                                        _parser_multiline_state = MULTILINE_FOLDED;
687
603
                                }
699
615
                                if( complete_value.length() < 1 ) return;
700
616
 
701
617
                                // parse some properties
702
 
                                if( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) )
 
618
                                if( name_param_parts[ 0 ].equals( "N" ) )
703
619
                                        parseN( name_param_parts, complete_value );
704
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "FN" ) )
 
620
                                else if( name_param_parts[ 0 ].equals( "FN" ) )
705
621
                                        parseFN( name_param_parts, complete_value );
706
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) )
 
622
                                else if( name_param_parts[ 0 ].equals( "ORG" ) )
707
623
                                        parseORG( name_param_parts, complete_value );
708
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TITLE" ) )
709
 
                                        parseTITLE( name_param_parts, complete_value );
710
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TEL" ) )
 
624
                                else if( name_param_parts[ 0 ].equals( "TEL" ) )
711
625
                                        parseTEL( name_param_parts, complete_value );
712
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "EMAIL" ) )
 
626
                                else if( name_param_parts[ 0 ].equals( "EMAIL" ) )
713
627
                                        parseEMAIL( name_param_parts, complete_value );
714
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) )
 
628
                                else if( name_param_parts[ 0 ].equals( "ADR" ) )
715
629
                                        parseADR( name_param_parts, complete_value );
716
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "LABEL" ) )
717
 
                                        parseLABEL( name_param_parts, complete_value );
718
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )
719
 
                                        parseNOTE( name_param_parts, complete_value );
720
630
                        }
721
631
                }
722
632
 
735
645
                        return ( count & 1 ) == 1;
736
646
                }
737
647
 
738
 
                private String[] splitValueByCharacter( String value, char character )
 
648
                private String[] splitValueBySemicolon( String value )
739
649
                {
740
 
                        // split string in to parts by specified character
 
650
                        // split string in to parts by semicolon
741
651
                        ArrayList< String > parts = new ArrayList< String >(
742
 
                                Arrays.asList( value.split( "" + character ) ) );
 
652
                                Arrays.asList( value.split(  ";" ) ) );
743
653
 
744
654
                        // go through parts
745
655
                        for( int a = 0; a < parts.size(); a++ )
753
663
                                if( a < parts.size() - 1 &&
754
664
                                        doesStringEndInAnEscapeChar( str ) )
755
665
                                {
756
 
                                        // append the escaped character, join the next part to this
757
 
                                        // part and remove the next part
 
666
                                        // join the next part to this part and remove the next part
758
667
                                        parts.set( a, str.substring( 0, str.length() - 1 ) +
759
 
                                                character + parts.get( a + 1 ) );
 
668
                                                ';' + parts.get( a + 1 ) );
760
669
                                        parts.remove( a + 1 );
761
670
 
762
671
                                        // re-visit this part
773
682
                        return parts.toArray( ret );
774
683
                }
775
684
 
776
 
                private String unescapeValue( String value )
777
 
                {
778
 
                        StringBuilder ret = new StringBuilder( value.length() );
779
 
                        boolean in_escape = false;
780
 
                        for( int a = 0; a < value.length(); a++ )
781
 
                        {
782
 
                                int c = value.codePointAt( a );
783
 
 
784
 
                                // process a normal character
785
 
                                if( !in_escape ) {
786
 
                                        if( c == '\\' )
787
 
                                                in_escape = true;
788
 
                                        else
789
 
                                                ret.append( Character.toChars( c ) );
790
 
                                        continue;
791
 
                                }
792
 
 
793
 
                                // process an escape sequence
794
 
                                in_escape = false;
795
 
                                switch( c )
796
 
                                {
797
 
                                case 'T':
798
 
                                case 't':
799
 
                                        // add tab (invalid/non-standard, but accepted)
800
 
                                        ret.append( '\t' );
801
 
                                        break;
802
 
                                case 'N':
803
 
                                case 'n':
804
 
                                        // add newline
805
 
                                        ret.append( '\n' );
806
 
                                        break;
807
 
                                case '\\':
808
 
                                case ',':
809
 
                                case ';':
810
 
                                        // add escaped character
811
 
                                        ret.append( Character.toChars( c ) );
812
 
                                        break;
813
 
                                default:
814
 
                                        // unknown escape sequence, so add it unescaped
815
 
                                        // (invalid/non-standard, but accepted)
816
 
                                        ret.append( "\\" );
817
 
                                        ret.append( Character.toChars( c ) );
818
 
                                        break;
819
 
                                }
820
 
                        }
821
 
 
822
 
                        return ret.toString();
823
 
                }
824
 
 
825
685
                private void parseN( String[] params, String value )
 
686
                        throws ParseException, SkipContactException,
 
687
                        AbortImportException
826
688
                {
827
689
                        // already got a better name?
828
690
                        if( _name_level >= NAMELEVEL_N ) return;
829
691
 
830
692
                        // get name parts
831
 
                        String[] name_parts = splitValueByCharacter( value, ';' );
 
693
                        String[] name_parts = splitValueBySemicolon( value );
832
694
 
833
695
                        // build name
834
696
                        value = "";
835
 
                        final int[] part_order = { 3, 1, 2, 0, 4 };
836
 
                        for( int a = 0; a < part_order.length; a++ )
837
 
                                if( name_parts.length > part_order[ a ] &&
838
 
                                        name_parts[ part_order[ a ] ].length() > 0 )
839
 
                                {
840
 
                                        // split this part in to it's comma-separated bits
841
 
                                        String[] name_part_parts = splitValueByCharacter(
842
 
                                                name_parts[ part_order[ a ] ], ',' );
843
 
                                        for( int b = 0; b < name_part_parts.length; b++ )
844
 
                                                if( name_part_parts[ b ].length() > 0 )
845
 
                                                {
846
 
                                                        if( value.length() > 0 ) value += " ";
847
 
                                                        value += name_part_parts[ b ];
848
 
                                                }
849
 
                                }
 
697
                        if( name_parts.length > 1 && name_parts[ 1 ].length() > 0 )
 
698
                                value += name_parts[ 1 ];
 
699
                        if( name_parts.length > 0 && name_parts[ 0 ].length() > 0 )
 
700
                                value += ( value.length() == 0? "" : " " ) + name_parts[ 0 ];
850
701
 
851
702
                        // set name
852
 
                        setName( unescapeValue( value ) );
 
703
                        setName( value );
853
704
                        _name_level = NAMELEVEL_N;
 
705
 
 
706
                        // check now to see if we need to import this contact (to avoid
 
707
                        // parsing the rest of the vCard unnecessarily)
 
708
                        if( !isImportRequired( getName() ) )
 
709
                                throw new SkipContactException();
854
710
                }
855
711
 
856
712
                private void parseFN( String[] params, String value )
 
713
                        throws ParseException, SkipContactException
857
714
                {
858
715
                        // already got a better name?
859
716
                        if( _name_level >= NAMELEVEL_FN ) return;
860
717
 
861
718
                        // set name
862
 
                        setName( unescapeValue( value ) );
 
719
                        setName( value );
863
720
                        _name_level = NAMELEVEL_FN;
864
721
                }
865
722
 
866
723
                private void parseORG( String[] params, String value )
 
724
                        throws ParseException, SkipContactException
867
725
                {
 
726
                        // already got a better name?
 
727
                        if( _name_level >= NAMELEVEL_ORG ) return;
 
728
 
868
729
                        // get org parts
869
 
                        String[] org_parts = splitValueByCharacter( value, ';' );
870
 
                        if( org_parts == null || org_parts.length < 1 ) return;
871
 
 
872
 
                        // build organisation name
873
 
                        StringBuilder builder = new StringBuilder(
874
 
                                String.valueOf( org_parts[ 0 ] ) );
875
 
                        for( int a = 1; a < org_parts.length; a++ )
876
 
                                builder.append( ", " ).append( org_parts[ a ] );
877
 
                        String organisation = unescapeValue( builder.toString() );
878
 
 
879
 
                        // set organisation name (using a title we've previously found)
880
 
                        addOrganisation( organisation, _cached_title, true );
881
 
 
882
 
                        // if we've not previously found a title, store this organisation
883
 
                        // name (we'll need it when we find a title to update the
884
 
                        // organisation, by name), else if we *have* previously found a
885
 
                        // title, clear it (since we just used it)
886
 
                        if( _cached_title == null )
887
 
                                _cached_organisation = organisation;
888
 
                        else
889
 
                                _cached_title = null;
890
 
                }
891
 
 
892
 
                private void parseTITLE( String[] params, String value )
893
 
                {
894
 
                        value = unescapeValue( value );
895
 
 
896
 
                        // if we previously had an organisation, look it up and append this
897
 
                        // title to it
898
 
                        if( _cached_organisation != null && hasOrganisations() ) {
899
 
                                HashMap< String, ExtraDetail > datas = getOrganisations();
900
 
                                ExtraDetail detail = datas.get( _cached_organisation );
901
 
                                if( detail != null )
902
 
                                        detail.setExtra( value );
903
 
                        }
904
 
 
905
 
                        // same as when handling organisation, if we've not previously found
906
 
                        // an organisation we store this title, else we clear it (since we
907
 
                        // just appended this title to it)
908
 
                        if( _cached_organisation == null )
909
 
                                _cached_title = value;
910
 
                        else
911
 
                                _cached_organisation = null;
 
730
                        String[] org_parts = splitValueBySemicolon( value );
 
731
 
 
732
                        // build name
 
733
                        if( org_parts.length > 1 && org_parts[ 0 ].length() == 0 )
 
734
                                value = org_parts[ 1 ];
 
735
                        else if( org_parts.length > 1 && org_parts[ 1 ].length() > 0 )
 
736
                                value = org_parts[ 0 ] + ", " + org_parts[ 1 ];
 
737
                        else
 
738
                                value = org_parts[ 0 ];
 
739
 
 
740
                        // set name
 
741
                        setName( value );
 
742
                        _name_level = NAMELEVEL_ORG;
912
743
                }
913
744
 
914
745
                private void parseTEL( String[] params, String value )
 
746
                        throws ParseException
915
747
                {
916
748
                        if( value.length() == 0 ) return;
917
749
 
920
752
                                "PAGER", "BBS", "MODEM", "CAR", "ISDN", "VIDEO" ) );
921
753
 
922
754
                        // here's the logic...
923
 
                        boolean is_preferred = types.contains( "PREF" );
924
 
                        int type;
 
755
                        boolean preferred = types.contains( "PREF" );
 
756
                        int type = PhonesColumns.TYPE_MOBILE;
 
757
                        if( types.contains( "VOICE" ) )
 
758
                                if( types.contains( "WORK" ) )
 
759
                                        type = PhonesColumns.TYPE_WORK;
 
760
                                else
 
761
                                        type = PhonesColumns.TYPE_HOME;
 
762
                        else if( types.contains( "CELL" ) || types.contains( "VIDEO" ) )
 
763
                                type = PhonesColumns.TYPE_MOBILE;
925
764
                        if( types.contains( "FAX" ) )
926
765
                                if( types.contains( "HOME" ) )
927
 
                                        type = TYPE_FAX_HOME;
 
766
                                        type = PhonesColumns.TYPE_FAX_HOME;
928
767
                                else
929
 
                                        type = TYPE_FAX_WORK;
930
 
                        else if( types.contains( "CELL" ) || types.contains( "VIDEO" ) )
931
 
                                type = TYPE_MOBILE;
932
 
                        else if( types.contains( "PAGER" ) )
933
 
                                type = TYPE_PAGER;
934
 
                        else if( types.contains( "WORK" ) )
935
 
                                type = TYPE_WORK;
936
 
                        else
937
 
                                type = TYPE_HOME;
 
768
                                        type = PhonesColumns.TYPE_FAX_WORK;
 
769
                        if( types.contains( "PAGER" ) )
 
770
                                type = PhonesColumns.TYPE_PAGER;
938
771
 
939
772
                        // add phone number
940
 
                        addNumber( value, type, is_preferred );
 
773
                        addPhone( value, type, preferred );
941
774
                }
942
775
 
943
776
                public void parseEMAIL( String[] params, String value )
 
777
                        throws ParseException
944
778
                {
945
779
                        if( value.length() == 0 ) return;
946
780
 
948
782
                                "PREF", "WORK", "HOME", "INTERNET" ) );
949
783
 
950
784
                        // add email address
951
 
                        boolean is_preferred = types.contains( "PREF" );
952
 
                        int type;
 
785
                        boolean preferred = types.contains( "PREF" );
953
786
                        if( types.contains( "WORK" ) )
954
 
                                type = TYPE_WORK;
 
787
                                addEmail( value, Contacts.ContactMethods.TYPE_WORK, preferred );
955
788
                        else
956
 
                                type = TYPE_HOME;
957
 
 
958
 
                        addEmail( unescapeValue( value ), type, is_preferred );
 
789
                                addEmail( value, Contacts.ContactMethods.TYPE_HOME, preferred );
959
790
                }
960
791
 
961
792
                private void parseADR( String[] params, String value )
 
793
                        throws ParseException, SkipContactException
962
794
                {
963
795
                        // get address parts
964
 
                        String[] adr_parts = splitValueByCharacter( value, ';' );
 
796
                        String[] adr_parts = splitValueBySemicolon( value );
965
797
 
966
798
                        // build address
967
799
                        value = "";
968
 
                        for( int a = 0; a < adr_parts.length; a++ )
969
 
                                if( adr_parts[ a ].length() > 0 )
970
 
                                {
971
 
                                        // version 3.0 vCards allow further splitting by comma
972
 
                                        if( _version.equals( "3.0" ) )
973
 
                                        {
974
 
                                                // split this part in to it's comma-separated bits and
975
 
                                                // add them on individual lines
976
 
                                                String[] adr_part_parts =
977
 
                                                        splitValueByCharacter( adr_parts[ a ], ',' );
978
 
                                                for( int b = 0; b < adr_part_parts.length; b++ )
979
 
                                                        if( adr_part_parts[ b ].length() > 0 )
980
 
                                                        {
981
 
                                                                if( value.length() > 0 ) value += "\n";
982
 
                                                                value += adr_part_parts[ b ];
983
 
                                                        }
984
 
                                        }
985
 
                                        else
986
 
                                        {
987
 
                                                // add this part on an individual line
988
 
                                                if( value.length() > 0 ) value += "\n";
989
 
                                                value += adr_parts[ a ];
990
 
                                        }
991
 
                                }
992
 
 
993
 
                        Set< String > types = extractTypes( params, Arrays.asList(
994
 
                                "PREF", "WORK", "HOME" ) );
995
 
 
996
 
                        // add address
997
 
                        int type;
998
 
                        if( types.contains( "WORK" ) )
999
 
                                type = TYPE_WORK;
1000
 
                        else
1001
 
                                type = TYPE_HOME;
1002
 
 
1003
 
                        addAddress( unescapeValue( value ), type );
1004
 
                }
1005
 
 
1006
 
                private void parseLABEL( String[] params, String value )
1007
 
                {
1008
 
                        Set< String > types = extractTypes( params, Arrays.asList(
1009
 
                                "PREF", "WORK", "HOME" ) );
1010
 
 
1011
 
                        // add address
1012
 
                        int type;
1013
 
                        if( types.contains( "WORK" ) )
1014
 
                                type = TYPE_WORK;
1015
 
                        else
1016
 
                                type = TYPE_HOME;
1017
 
 
1018
 
                        addAddress( unescapeValue( value ), type );
1019
 
                }
1020
 
 
1021
 
                private void parseNOTE( String[] params, String value )
1022
 
                {
1023
 
                        addNote( unescapeValue( value ) );
1024
 
                }
1025
 
 
1026
 
                public void finaliseVcard()
1027
 
                        throws ParseException, ContactNotIdentifiableException
 
800
                        for( int a = 0; a < adr_parts.length; a++ ) {
 
801
                                if( value.length() > 0 ) value += "\n";
 
802
                                value += adr_parts[ a ].trim();
 
803
                        }
 
804
 
 
805
                        Set< String > types = extractTypes( params, Arrays.asList(
 
806
                                "PREF", "WORK", "HOME", "INTERNET" ) );
 
807
 
 
808
                        // add address
 
809
                        if( types.contains( "WORK" ) )
 
810
                                addAddress( value, Contacts.ContactMethods.TYPE_WORK );
 
811
                        else
 
812
                                addAddress( value, Contacts.ContactMethods.TYPE_HOME);
 
813
                }
 
814
 
 
815
                public void finaliseParsing()
 
816
                        throws ParseException, SkipContactException,
 
817
                        AbortImportException
1028
818
                {
1029
819
                        // missing version (and data is present)
1030
 
                        if( _version == null && _content_lines != null )
 
820
                        if( _version == null && _buffers != null )
1031
821
                                throw new ParseException( R.string.error_vcf_malformed );
1032
822
 
1033
 
                        // finalise the parent class
1034
 
                        finalise();
 
823
                        //  missing name properties?
 
824
                        if( _name_level == NAMELEVEL_NONE )
 
825
                                throw new ParseException( R.string.error_vcf_noname );
 
826
 
 
827
                        // check if we should import this one? If we've already got an 'N'-
 
828
                        // type name, this will already have been done by parseN() so we
 
829
                        // mustn't do this here (or it could prompt twice!)
 
830
                        if( _name_level < NAMELEVEL_N && !isImportRequired( getName() ) )
 
831
                                throw new SkipContactException();
1035
832
                }
1036
833
 
1037
 
                /**
1038
 
                 * Amongst the params, find the value of the first, only, of any with
1039
 
                 * the specified name
1040
 
                 * @param params
1041
 
                 * @param name
1042
 
                 * @return a value, or null
1043
 
                 */
1044
834
                private String checkParam( String[] params, String name )
1045
835
                {
1046
 
                        String[] res = checkParams( params, name );
1047
 
                        return res.length > 0? res[ 0 ] : null;
1048
 
                }
1049
 
 
1050
 
                /**
1051
 
                 * Amongst the params, find the values of any with the specified name
1052
 
                 * @param params
1053
 
                 * @param name
1054
 
                 * @return an array of values, or null
1055
 
                 */
1056
 
                private String[] checkParams( String[] params, String name )
1057
 
                {
1058
 
                        HashSet< String > ret = new HashSet< String >();
1059
 
 
1060
836
                        Pattern p = Pattern.compile(
1061
 
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$",
1062
 
                                Pattern.CASE_INSENSITIVE );
 
837
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$" );
1063
838
                        for( int i = 0; i < params.length; i++ ) {
1064
839
                                Matcher m = p.matcher( params[ i ] );
1065
840
                                if( m.matches() )
1066
 
                                        ret.add( m.group( 2 ) );
 
841
                                        return m.group( 2 );
1067
842
                        }
1068
 
 
1069
 
                        return (String[]) ret.toArray( new String[ ret.size() ] );
 
843
                        return null;
1070
844
                }
1071
845
 
1072
 
                /**
1073
 
                 * Amongst the params, return any type values present. For v2.1 vCards,
1074
 
                 * those types are just parameters. For v3.0, they are prefixed with
1075
 
                 * "TYPE=". There may also be multiple type parameters.
1076
 
                 * @param params an array of params to look for types in
1077
 
                 * @param valid_types an list of upper-case type values to look for
1078
 
                 * @return a set of present type values
1079
 
                 */
1080
846
                private Set< String > extractTypes( String[] params,
1081
847
                        List< String > valid_types )
1082
848
                {
1083
849
                        HashSet< String > types = new HashSet< String >();
1084
850
 
1085
851
                        // get 3.0-style TYPE= param
1086
 
                        String type_params[] = checkParams( params, "TYPE" );
1087
 
                        for( int a = 0; a < type_params.length; a++ )
1088
 
                        {
1089
 
                                // check for a comma-separated list of types (why? I don't think
1090
 
                                // this is in the specs!)
1091
 
                                String[] parts = type_params[ a ].split( "," );
1092
 
                                for( int i = 0; i < parts.length; i++ ) {
1093
 
                                        String ucpart = parts[ i ].toUpperCase( Locale.US );
1094
 
                                        if( valid_types.contains( ucpart ) )
1095
 
                                                types.add( ucpart );
1096
 
                                }
 
852
                        String type_param;
 
853
                        if( ( type_param = checkParam( params, "TYPE" ) ) != null ) {
 
854
                                String[] parts = type_param.split( "," );
 
855
                                for( int i = 0; i < parts.length; i++ )
 
856
                                        if( valid_types.contains( parts[ i ] ) )
 
857
                                                types.add( parts[ i ] );
1097
858
                        }
1098
859
 
1099
860
                        // get 2.1-style type param
1100
861
                        if( _version.equals( "2.1" ) ) {
1101
 
                                for( int i = 1; i < params.length; i++ ) {
1102
 
                                        String ucparam = params[ i ].toUpperCase( Locale.US );
1103
 
                                        if( valid_types.contains( ucparam ) )
1104
 
                                                types.add( ucparam );
1105
 
                                }
 
862
                                for( int i = 1; i < params.length; i++ )
 
863
                                        if( valid_types.contains( params[ i ] ) )
 
864
                                                types.add( params[ i ] );
1106
865
                        }
1107
866
 
1108
867
                        return types;