/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/am/ed/importcontacts/VcardImporter.java

  • Committer: Tim Marston
  • Date: 2015-12-05 01:58:35 UTC
  • Revision ID: tim@ed.am-20151205015835-ggzzffm5d4xp8hrp
updated family pic

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 to 2013 Tim Marston <tim@ed.am>
5
5
 *
6
6
 * This file is part of the Import Contacts program (hereafter referred
7
 
 * to as "this program"). For more information, see
 
7
 * to as "this program").  For more information, see
8
8
 * http://ed.am/dev/android/import-contacts
9
9
 *
10
10
 * This program is free software: you can redistribute it and/or modify
45
45
import java.util.regex.Matcher;
46
46
import java.util.regex.Pattern;
47
47
 
48
 
import android.annotation.SuppressLint;
49
48
import android.content.SharedPreferences;
 
49
import android.os.Environment;
50
50
 
51
51
public class VcardImporter extends Importer
52
52
{
58
58
                super( doit );
59
59
        }
60
60
 
61
 
        @SuppressLint( "SdCardPath" )
62
61
        @Override
63
62
        protected void onImport() throws AbortImportException
64
63
        {
71
70
                File[] files = null;
72
71
                try
73
72
                {
 
73
                        // check SD card is mounted
 
74
                        String state = Environment.getExternalStorageState();
 
75
                        if( !Environment.MEDIA_MOUNTED.equals( state ) &&
 
76
                                !Environment.MEDIA_MOUNTED_READ_ONLY.equals( state ) )
 
77
                        {
 
78
                                showError( R.string.error_nosdcard );
 
79
                        }
 
80
 
74
81
                        // open directory
75
 
                        String path = "/sdcard" + prefs.getString( "location", "/" );
76
 
                        File file = new File( path );
 
82
                        File file = new File( Environment.getExternalStorageDirectory(),
 
83
                                prefs.getString( "location", "/" ) );
77
84
                        if( !file.exists() )
78
85
                                showError( R.string.error_locationnotfound );
79
86
 
83
90
                                // get files
84
91
                                class VCardFilter implements FilenameFilter {
85
92
                                        public boolean accept( File dir, String name ) {
86
 
                                                return name.toLowerCase( Locale.US ).endsWith( ".vcf" );
 
93
                                                return name.toLowerCase( Locale.ENGLISH )
 
94
                                                        .endsWith( ".vcf" );
87
95
                                        }
88
96
                                }
89
97
                                files = file.listFiles( new VCardFilter() );
133
141
                        boolean in_vcard = false;
134
142
                        while( ( line = reader.readLine() ) != null )
135
143
                        {
136
 
                                if( !in_vcard ) {
 
144
                                if( !in_vcard )
 
145
                                {
137
146
                                        // look for vcard beginning
138
 
                                        if( line.matches( "^BEGIN:VCARD" ) ) {
 
147
                                        if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VCARD.*" ) ) {
139
148
                                                in_vcard = true;
140
149
                                                _vcard_count++;
141
150
                                        }
 
151
                                        // check for vMsg files
 
152
                                        else if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VMSG.*" ) ) {
 
153
                                                showError( getText( R.string.error_vcf_vmsgfile )
 
154
                                                        + file.getName() );
 
155
                                        }
142
156
                                }
143
 
                                else if( line.matches( "^END:VCARD" ) )
 
157
                                else if( line.matches( "(?i)END[ \t]*:[ \t]*VCARD.*" ) )
144
158
                                        in_vcard = false;
145
159
                        }
 
160
                        reader.close();
146
161
 
147
162
                }
148
163
                catch( FileNotFoundException e ) {
170
185
                        FileInputStream istream = new FileInputStream( file );
171
186
                        byte[] content = new byte[ (int)file.length() ];
172
187
                        istream.read( content );
173
 
                        istream = null;
 
188
                        istream.close();
174
189
 
175
190
                        // import
176
191
                        importVCardFileContent( content, file.getName() );
177
192
                }
 
193
                catch( OutOfMemoryError e ) {
 
194
                        showError( R.string.error_outofmemory );
 
195
                }
178
196
                catch( FileNotFoundException e ) {
179
197
                        showError( getText( R.string.error_filenotfound ) +
180
198
                                file.getName() );
193
211
                ContentLineIterator cli = new ContentLineIterator( content );
194
212
                while( cli.hasNext() )
195
213
                {
196
 
                        ByteBuffer buffer = cli.next();
 
214
                        ContentLine content_line = cli.next();
197
215
 
198
 
                        // get a US-ASCII version of the line for processing
199
 
                        String line;
200
 
                        try {
201
 
                                line = new String( buffer.array(), buffer.position(),
202
 
                                        buffer.limit() - buffer.position(), "US-ASCII" );
203
 
                        }
204
 
                        catch( UnsupportedEncodingException e ) {
205
 
                                // we know US-ASCII is supported, so appease the compiler...
206
 
                                line = "";
207
 
                        }
 
216
                        // get a US-ASCII version of the string, for processing
 
217
                        String line = content_line.getUsAsciiLine();
208
218
 
209
219
                        if( vcard == null ) {
210
220
                                // look for vcard beginning
211
 
                                if( line.matches( "^BEGIN[ \t]*:[ \t]*VCARD" ) ) {
 
221
                                if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VCARD.*" ) ) {
212
222
                                        setProgress( _progress++ );
213
223
                                        vcard = new Vcard();
214
224
                                        vcard_start_line = cli.getLineNumber();
216
226
                        }
217
227
                        else {
218
228
                                // look for vcard content or ending
219
 
                                if( line.matches( "^END[ \t]*:[ \t]*VCARD" ) )
 
229
                                if( line.matches( "(?i)END[ \t]*:[ \t]*VCARD.*" ) )
220
230
                                {
221
231
                                        // finalise the vcard/contact
222
232
                                        try {
226
236
                                                importContact( vcard );
227
237
                                        }
228
238
                                        catch( Vcard.ParseException e ) {
229
 
                                                if( !showContinue(
 
239
                                                showContinueOrAbort(
230
240
                                                        getText( R.string.error_vcf_parse ).toString()
231
241
                                                        + fileName +
232
242
                                                        getText( R.string.error_vcf_parse_line ).toString()
233
 
                                                        + cli.getLineNumber() + ":\n" + e.getMessage() ) )
234
 
                                                {
235
 
                                                        finish( ACTION_ABORT );
236
 
                                                }
237
 
                                                else
238
 
                                                        skipContact();
 
243
                                                        + cli.getLineNumber() + ":\n" + e.getMessage() );
 
244
                                                skipContact();
239
245
                                        }
240
246
                                        catch( ContactData.ContactNotIdentifiableException e ) {
241
 
                                                if( !showContinue(
 
247
                                                showContinueOrAbort(
242
248
                                                        getText( R.string.error_vcf_parse ).toString()
243
249
                                                        + fileName +
244
250
                                                        getText( R.string.error_vcf_parse_line ).toString()
245
251
                                                        + vcard_start_line + ":\n" + getText(
246
 
                                                                R.string.error_vcf_notenoughinfo ).toString()
247
 
                                                ) )
248
 
                                                {
249
 
                                                        finish( ACTION_ABORT );
250
 
                                                }
251
 
                                                else
252
 
                                                        skipContact();
 
252
                                                                R.string.error_vcf_notenoughinfo ).toString() );
 
253
                                                skipContact();
253
254
                                        }
254
255
 
255
256
                                        // discard this vcard
259
260
                                {
260
261
                                        // try giving the line to the vcard
261
262
                                        try {
262
 
                                                vcard.parseLine( buffer, line,
263
 
                                                        cli.doesNextLineLookFolded() );
 
263
                                                vcard.parseLine( content_line );
264
264
                                        }
265
265
                                        catch( Vcard.ParseException e ) {
266
266
                                                skipContact();
267
 
                                                if( !showContinue(
 
267
                                                showContinueOrAbort(
268
268
                                                        getText( R.string.error_vcf_parse ).toString()
269
269
                                                        + fileName +
270
270
                                                        getText( R.string.error_vcf_parse_line ).toString()
271
 
                                                        + cli.getLineNumber() + "\n" + e.getMessage() ) )
272
 
                                                {
273
 
                                                        finish( ACTION_ABORT );
274
 
                                                }
 
271
                                                        + cli.getLineNumber() + "\n" + e.getMessage() );
275
272
 
276
 
                                                // although we're continuing, we still need to abort
277
 
                                                // this vCard. Further lines will be ignored until we
 
273
                                                // Although we're continuing, we still need to abort
 
274
                                                // this vCard.  Further lines will be ignored until we
278
275
                                                // get to another BEGIN:VCARD line.
279
276
                                                vcard = null;
280
277
                                        }
281
278
                                        catch( Vcard.SkipImportException e ) {
282
279
                                                skipContact();
283
 
                                                // abort this vCard. Further lines will be ignored until
 
280
                                                // Abort this vCard.  Further lines will be ignored until
284
281
                                                // we get to another BEGIN:VCARD line.
285
282
                                                vcard = null;
286
283
                                        }
289
286
                }
290
287
        }
291
288
 
292
 
        class ContentLineIterator implements Iterator< ByteBuffer >
 
289
        class ContentLine
 
290
        {
 
291
                private ByteBuffer _buffer;
 
292
                private boolean _folded_next;
 
293
                private String _line;
 
294
 
 
295
                public ContentLine( ByteBuffer buffer, boolean folded_next )
 
296
                {
 
297
                        _buffer = buffer;
 
298
                        _folded_next = folded_next;
 
299
                        _line = null;
 
300
                }
 
301
 
 
302
                public ByteBuffer getBuffer()
 
303
                {
 
304
                        return _buffer;
 
305
                }
 
306
 
 
307
                public boolean doesNextLineLookFolded()
 
308
                {
 
309
                        return _folded_next;
 
310
                }
 
311
 
 
312
                public String getUsAsciiLine()
 
313
                {
 
314
                        // generated line and cache it
 
315
                        if( _line == null ) {
 
316
                                try {
 
317
                                        _line = new String( _buffer.array(), _buffer.position(),
 
318
                                                _buffer.limit() - _buffer.position(), "US-ASCII" );
 
319
                                }
 
320
                                catch( UnsupportedEncodingException e ) {
 
321
                                        // we know US-ASCII *is* supported, so appease the
 
322
                                        // compiler...
 
323
                                }
 
324
                        }
 
325
 
 
326
                        // return cached line
 
327
                        return _line;
 
328
                }
 
329
        }
 
330
 
 
331
        class ContentLineIterator implements Iterator< ContentLine >
293
332
        {
294
333
                protected byte[] _content = null;
295
334
                protected int _pos = 0;
307
346
                }
308
347
 
309
348
                @Override
310
 
                public ByteBuffer next()
 
349
                public ContentLine next()
311
350
                {
312
351
                        int initial_pos = _pos;
313
352
 
320
359
                                                _pos > initial_pos )? _pos - 1 : _pos;
321
360
                                        _pos++;
322
361
                                        _line++;
323
 
                                        return ByteBuffer.wrap( _content, initial_pos,
324
 
                                                to - initial_pos );
 
362
                                        return new ContentLine(
 
363
                                                ByteBuffer.wrap( _content, initial_pos,
 
364
                                                        to - initial_pos ),
 
365
                                                doesNextLineLookFolded() );
325
366
                                }
326
367
 
327
368
                        // we didn't find one, but were there bytes left?
329
370
                                int to = _pos;
330
371
                                _pos++;
331
372
                                _line++;
332
 
                                return ByteBuffer.wrap( _content, initial_pos,
333
 
                                        to - initial_pos );
 
373
                                return new ContentLine(
 
374
                                        ByteBuffer.wrap( _content, initial_pos,
 
375
                                                to - initial_pos ),
 
376
                                        doesNextLineLookFolded() );
334
377
                        }
335
378
 
336
379
                        // no bytes left
348
391
                 * onto the end of this one?
349
392
                 * @return
350
393
                 */
351
 
                public boolean doesNextLineLookFolded()
 
394
                private boolean doesNextLineLookFolded()
352
395
                {
353
396
                        return _pos > 0 && _pos < _content.length &&
354
397
                                _content[ _pos - 1 ] == '\n' &&
373
416
                private final static int MULTILINE_FOLDED = 3;  // MIME-DIR folding
374
417
 
375
418
                private String _version = null;
376
 
                private Vector< ByteBuffer > _buffers = null;
 
419
                private Vector< ContentLine > _content_lines = null;
377
420
                private int _name_level = NAMELEVEL_NONE;
378
421
                private int _parser_multiline_state = MULTILINE_NONE;
379
422
                private String _parser_current_name_and_params = null;
422
465
                @SuppressWarnings("serial")
423
466
                protected class SkipImportException extends Exception { }
424
467
 
425
 
                private String extractCollonPartFromLine( ByteBuffer buffer,
426
 
                        String line, boolean former )
 
468
                private String extractCollonPartFromLine( ContentLine content_line,
 
469
                        boolean former )
427
470
                {
428
 
                        String ret = null;
429
 
 
430
 
                        // get a US-ASCII version of the line for processing, unless we were
431
 
                        // supplied with one
432
 
                        if( line == null ) {
433
 
                                try {
434
 
                                        line = new String( buffer.array(), buffer.position(),
435
 
                                                buffer.limit() - buffer.position(), "US-ASCII" );
436
 
                                }
437
 
                                catch( UnsupportedEncodingException e ) {
438
 
                                        // we know US-ASCII is supported, so appease the compiler...
439
 
                                        line = "";
440
 
                                }
441
 
                        }
442
 
 
443
471
                        // split line into name and value parts and check to make sure we
444
472
                        // only got 2 parts and that the first part is not zero in length
445
 
                        String[] parts = line.split( ":", 2 );
 
473
                        String[] parts = content_line.getUsAsciiLine().split( ":", 2 );
446
474
                        if( parts.length == 2 && parts[ 0 ].length() > 0 )
447
 
                                ret = parts[ former? 0 : 1 ];
448
 
 
449
 
                        return ret;
450
 
                }
451
 
 
452
 
                private String extractNameAndParamsFromLine( ByteBuffer buffer,
453
 
                        String line )
454
 
                {
455
 
                        return extractCollonPartFromLine( buffer, line, true );
456
 
                }
457
 
 
458
 
                private String extractValueFromLine( ByteBuffer buffer, String line )
459
 
                {
460
 
                        return extractCollonPartFromLine( buffer, line, false );
461
 
                }
462
 
 
463
 
                public void parseLine( ByteBuffer buffer, String line,
464
 
                        boolean next_line_looks_folded )
 
475
                                return parts[ former? 0 : 1 ].trim();
 
476
 
 
477
                        return null;
 
478
                }
 
479
 
 
480
                private String extractNameAndParamsFromLine( ContentLine content_line )
 
481
                {
 
482
                        return extractCollonPartFromLine( content_line, true );
 
483
                }
 
484
 
 
485
                private String extractValueFromLine( ContentLine content_line )
 
486
                {
 
487
                        return extractCollonPartFromLine( content_line, false );
 
488
                }
 
489
 
 
490
                public void parseLine( ContentLine content_line )
465
491
                        throws ParseException, SkipImportException,
466
492
                        AbortImportException
467
493
                {
470
496
                        {
471
497
                                // tentatively get name and params from line
472
498
                                String name_and_params =
473
 
                                        extractNameAndParamsFromLine( buffer, line );
 
499
                                        extractNameAndParamsFromLine( content_line );
474
500
 
475
501
                                // is it a version line?
476
502
                                if( name_and_params != null &&
477
503
                                        name_and_params.equalsIgnoreCase( "VERSION" ) )
478
504
                                {
479
505
                                        // yes, get it!
480
 
                                        String value = extractValueFromLine( buffer, line );
481
 
                                        if( !value.equals( "2.1" ) && !value.equals( "3.0" ) )
 
506
                                        String value = extractValueFromLine( content_line );
 
507
                                        if( value == null || (
 
508
                                                !value.equals( "2.1" ) && !value.equals( "3.0" ) ) )
 
509
                                        {
482
510
                                                throw new ParseException( R.string.error_vcf_version );
 
511
                                        }
483
512
                                        _version = value;
484
513
 
485
514
                                        // parse any buffers we've been accumulating while we waited
486
515
                                        // for a version
487
 
                                        if( _buffers != null )
488
 
                                                for( int i = 0; i < _buffers.size(); i++ )
489
 
                                                        parseLine( _buffers.get( i ), null,
490
 
                                                                i + 1 < _buffers.size() &&
491
 
                                                                _buffers.get( i + 1 ).hasRemaining() &&
492
 
                                                                _buffers.get( i + 1 ).get(
493
 
                                                                        _buffers.get( i + 1 ).position() ) == ' ' );
494
 
                                        _buffers = null;
 
516
                                        if( _content_lines != null )
 
517
                                                for( int i = 0; i < _content_lines.size(); i++ )
 
518
                                                        parseLine( _content_lines.get( i ) );
 
519
                                        _content_lines = null;
495
520
                                }
496
521
                                else
497
522
                                {
498
523
                                        // no, so stash this line till we get a version
499
 
                                        if( _buffers == null )
500
 
                                                _buffers = new Vector< ByteBuffer >();
501
 
                                        _buffers.add( buffer );
 
524
                                        if( _content_lines == null )
 
525
                                                _content_lines = new Vector< ContentLine >();
 
526
                                        _content_lines.add( content_line );
502
527
                                }
503
528
                        }
504
529
                        else
505
530
                        {
506
531
                                // name and params and the position in the buffer where the
507
 
                                // "value" part of the line start
 
532
                                // "value" part of the line starts
508
533
                                String name_and_params;
509
534
                                int pos;
510
535
 
516
541
 
517
542
                                        // skip some initial line characters, depending on the type
518
543
                                        // of multi-line we're handling
519
 
                                        pos = buffer.position();
 
544
                                        pos = content_line.getBuffer().position();
520
545
                                        switch( _parser_multiline_state )
521
546
                                        {
522
547
                                        case MULTILINE_FOLDED:
523
548
                                                pos++;
524
549
                                                break;
525
550
                                        case MULTILINE_ENCODED:
526
 
                                                while( pos < buffer.limit() && (
527
 
                                                        buffer.get( pos ) == ' ' ||
528
 
                                                        buffer.get( pos ) == '\t' ) )
 
551
                                                while( pos < content_line.getBuffer().limit() && (
 
552
                                                        content_line.getBuffer().get( pos ) == ' ' ||
 
553
                                                        content_line.getBuffer().get( pos ) == '\t' ) )
529
554
                                                {
530
555
                                                        pos++;
531
556
                                                }
540
565
                                }
541
566
                                else
542
567
                                {
 
568
                                        // skip empty lines
 
569
                                        if( content_line.getUsAsciiLine().trim().length() == 0 )
 
570
                                                return;
 
571
 
543
572
                                        // get name and params from line, and since we're not
544
573
                                        // parsing a subsequent line in a multi-line, this should
545
574
                                        // not fail, or it's an error
546
575
                                        name_and_params =
547
 
                                                extractNameAndParamsFromLine( buffer, line );
 
576
                                                extractNameAndParamsFromLine( content_line );
548
577
                                        if( name_and_params == null )
549
578
                                                throw new ParseException(
550
579
                                                        R.string.error_vcf_malformed );
551
580
 
552
581
                                        // calculate how many chars to skip from beginning of line
553
582
                                        // so we skip the property "name:" part
554
 
                                        pos = buffer.position() + name_and_params.length() + 1;
 
583
                                        pos = content_line.getBuffer().position() +
 
584
                                                name_and_params.length() + 1;
555
585
 
556
586
                                        // reset the saved multi-line state
557
587
                                        _parser_current_name_and_params = name_and_params;
560
590
 
561
591
                                // get value from buffer, as raw bytes
562
592
                                ByteBuffer value;
563
 
                                value = ByteBuffer.wrap( buffer.array(), pos,
564
 
                                        buffer.limit() - pos );
 
593
                                value = ByteBuffer.wrap( content_line.getBuffer().array(), pos,
 
594
                                        content_line.getBuffer().limit() - pos );
565
595
 
566
596
                                // get parameter parts
567
597
                                String[] name_param_parts = name_and_params.split( ";", -1 );
574
604
                                                "FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR", "LABEL" }
575
605
                                ) );
576
606
                                boolean is_interesting_field =
577
 
                                        interesting_fields.contains( name_param_parts[ 0 ] );
 
607
                                        interesting_fields.contains(
 
608
                                                name_param_parts[ 0 ].toUpperCase( Locale.ENGLISH ) );
578
609
 
579
610
                                // parse encoding parameter
580
611
                                String encoding = checkParam( name_param_parts, "ENCODING" );
581
612
                                if( encoding != null )
582
 
                                        encoding = encoding.toUpperCase( Locale.US );
 
613
                                        encoding = encoding.toUpperCase( Locale.ENGLISH );
583
614
                                if( is_interesting_field && encoding != null &&
584
615
                                        !encoding.equalsIgnoreCase( "8BIT" ) &&
585
616
                                        !encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
591
622
                                // parse charset parameter
592
623
                                String charset = checkParam( name_param_parts, "CHARSET" );
593
624
                                if( charset != null )
594
 
                                        charset = charset.toUpperCase( Locale.US );
 
625
                                        charset = charset.toUpperCase( Locale.ENGLISH );
595
626
                                if( charset != null &&
596
627
                                        !charset.equalsIgnoreCase( "US-ASCII" ) &&
597
628
                                        !charset.equalsIgnoreCase( "ASCII" ) &&
654
685
                                // if we know we're not in an encoding-based multi-line, check
655
686
                                // to see if we're in a folded multi-line
656
687
                                if( _parser_multiline_state == MULTILINE_NONE &&
657
 
                                        next_line_looks_folded )
 
688
                                        content_line.doesNextLineLookFolded() )
658
689
                                {
659
690
                                        _parser_multiline_state = MULTILINE_FOLDED;
660
691
                                }
690
721
                                        parseLABEL( name_param_parts, complete_value );
691
722
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )
692
723
                                        parseNOTE( name_param_parts, complete_value );
 
724
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "BDAY" ) )
 
725
                                        parseBDAY( name_param_parts, complete_value );
693
726
                        }
694
727
                }
695
728
 
719
752
                        {
720
753
                                String str = parts.get( a );
721
754
 
722
 
                                // look for parts that end in an escape character, but ignore
723
 
                                // the final part. We've already detected escape chars at the
 
755
                                // Look for parts that end in an escape character, but ignore
 
756
                                // the final part.  We've already detected escape chars at the
724
757
                                // end of the final part in parseLine() and handled multi-lines
725
758
                                // accordingly.
726
759
                                if( a < parts.size() - 1 &&
816
849
                                        for( int b = 0; b < name_part_parts.length; b++ )
817
850
                                                if( name_part_parts[ b ].length() > 0 )
818
851
                                                {
819
 
                                                        if( value.length() == 0 ) value += " ";
 
852
                                                        if( value.length() > 0 ) value += " ";
820
853
                                                        value += name_part_parts[ b ];
821
854
                                                }
822
855
                                }
996
1029
                        addNote( unescapeValue( value ) );
997
1030
                }
998
1031
 
 
1032
                private void parseBDAY( String[] params, String value )
 
1033
                {
 
1034
                        setBirthday( value );
 
1035
                }
 
1036
 
999
1037
                public void finaliseVcard()
1000
1038
                        throws ParseException, ContactNotIdentifiableException
1001
1039
                {
1002
1040
                        // missing version (and data is present)
1003
 
                        if( _version == null && _buffers != null )
 
1041
                        if( _version == null && _content_lines != null )
1004
1042
                                throw new ParseException( R.string.error_vcf_malformed );
1005
1043
 
1006
1044
                        // finalise the parent class
1009
1047
 
1010
1048
                /**
1011
1049
                 * Amongst the params, find the value of the first, only, of any with
1012
 
                 * the specified name
 
1050
                 * the specified name.
 
1051
                 *
1013
1052
                 * @param params
1014
1053
                 * @param name
1015
1054
                 * @return a value, or null
1021
1060
                }
1022
1061
 
1023
1062
                /**
1024
 
                 * Amongst the params, find the values of any with the specified name
 
1063
                 * Amongst the params, find the values of any with the specified name.
 
1064
                 *
1025
1065
                 * @param params
1026
1066
                 * @param name
1027
1067
                 * @return an array of values, or null
1043
1083
                }
1044
1084
 
1045
1085
                /**
1046
 
                 * Amongst the params, return any type values present. For v2.1 vCards,
1047
 
                 * those types are just parameters. For v3.0, they are prefixed with
1048
 
                 * "TYPE=". There may also be multiple type parameters.
 
1086
                 * Amongst the params, return any type values present.  For v2.1 vCards,
 
1087
                 * those types are just parameters.  For v3.0, they are prefixed with
 
1088
                 * "TYPE=".  There may also be multiple type parameters.
 
1089
                 *
1049
1090
                 * @param params an array of params to look for types in
1050
1091
                 * @param valid_types an list of upper-case type values to look for
1051
1092
                 * @return a set of present type values
1059
1100
                        String type_params[] = checkParams( params, "TYPE" );
1060
1101
                        for( int a = 0; a < type_params.length; a++ )
1061
1102
                        {
1062
 
                                // check for a comma-separated list of types (why? this isn't in
1063
 
                                // the specs!)
 
1103
                                // check for a comma-separated list of types (why? I don't think
 
1104
                                // this is in the specs!)
1064
1105
                                String[] parts = type_params[ a ].split( "," );
1065
 
                                for( int i = 0; i < parts.length; i++ )
1066
 
                                        parts[ i ] = parts[ i ].toUpperCase( Locale.US );
1067
 
                                for( int i = 0; i < parts.length; i++ )
1068
 
                                        if( valid_types.contains( parts[ i ] ) )
1069
 
                                                types.add( parts[ i ] );
 
1106
                                for( int i = 0; i < parts.length; i++ ) {
 
1107
                                        String ucpart = parts[ i ].toUpperCase( Locale.ENGLISH );
 
1108
                                        if( valid_types.contains( ucpart ) )
 
1109
                                                types.add( ucpart );
 
1110
                                }
1070
1111
                        }
1071
1112
 
1072
1113
                        // get 2.1-style type param
1073
1114
                        if( _version.equals( "2.1" ) ) {
1074
 
                                for( int i = 1; i < params.length; i++ )
1075
 
                                        if( valid_types.contains( params[ i ] ) )
1076
 
                                                types.add( params[ i ] );
 
1115
                                for( int i = 1; i < params.length; i++ ) {
 
1116
                                        String ucparam = params[ i ].toUpperCase( Locale.ENGLISH );
 
1117
                                        if( valid_types.contains( ucparam ) )
 
1118
                                                types.add( ucparam );
 
1119
                                }
1077
1120
                        }
1078
1121
 
1079
1122
                        return types;
1101
1144
                                else if( ch == '=' && i == in.limit() - 1 )
1102
1145
                                {
1103
1146
                                        // we found a '=' at the end of a line signifying a multi-
1104
 
                                        // line string, so we don't add it.
 
1147
                                        // line string, so we don't add it
1105
1148
                                        another = true;
1106
1149
                                        continue;
1107
1150
                                }