/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: edam
  • Date: 2012-12-21 14:47:57 UTC
  • Revision ID: tim@ed.am-20121221144757-5cb1lgsp7fdt7p2n
updated TODO

Show diffs side-by-side

added added

removed removed

1
1
/*
2
2
 * VCFImporter.java
3
3
 *
4
 
 * Copyright (C) 2009 to 2013 Tim Marston <tim@ed.am>
 
4
 * Copyright (C) 2009 to 2011 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;
48
49
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" )
61
62
        @Override
62
63
        protected void onImport() throws AbortImportException
63
64
        {
70
71
                File[] files = null;
71
72
                try
72
73
                {
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
 
 
81
74
                        // open directory
82
 
                        File file = new File( Environment.getExternalStorageDirectory(),
83
 
                                prefs.getString( "location", "/" ) );
 
75
                        String path = "/sdcard" + prefs.getString( "location", "/" );
 
76
                        File file = new File( path );
84
77
                        if( !file.exists() )
85
78
                                showError( R.string.error_locationnotfound );
86
79
 
90
83
                                // get files
91
84
                                class VCardFilter implements FilenameFilter {
92
85
                                        public boolean accept( File dir, String name ) {
93
 
                                                return name.toLowerCase( Locale.ENGLISH )
94
 
                                                        .endsWith( ".vcf" );
 
86
                                                return name.toLowerCase( Locale.US ).endsWith( ".vcf" );
95
87
                                        }
96
88
                                }
97
89
                                files = file.listFiles( new VCardFilter() );
141
133
                        boolean in_vcard = false;
142
134
                        while( ( line = reader.readLine() ) != null )
143
135
                        {
144
 
                                if( !in_vcard )
145
 
                                {
 
136
                                if( !in_vcard ) {
146
137
                                        // look for vcard beginning
147
 
                                        if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VCARD.*" ) ) {
 
138
                                        if( line.matches( "^BEGIN:VCARD" ) ) {
148
139
                                                in_vcard = true;
149
140
                                                _vcard_count++;
150
141
                                        }
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
 
                                        }
156
142
                                }
157
 
                                else if( line.matches( "(?i)END[ \t]*:[ \t]*VCARD.*" ) )
 
143
                                else if( line.matches( "^END:VCARD" ) )
158
144
                                        in_vcard = false;
159
145
                        }
160
 
                        reader.close();
161
146
 
162
147
                }
163
148
                catch( FileNotFoundException e ) {
185
170
                        FileInputStream istream = new FileInputStream( file );
186
171
                        byte[] content = new byte[ (int)file.length() ];
187
172
                        istream.read( content );
188
 
                        istream.close();
 
173
                        istream = null;
189
174
 
190
175
                        // import
191
176
                        importVCardFileContent( content, file.getName() );
192
177
                }
193
 
                catch( OutOfMemoryError e ) {
194
 
                        showError( R.string.error_outofmemory );
195
 
                }
196
178
                catch( FileNotFoundException e ) {
197
179
                        showError( getText( R.string.error_filenotfound ) +
198
180
                                file.getName() );
211
193
                ContentLineIterator cli = new ContentLineIterator( content );
212
194
                while( cli.hasNext() )
213
195
                {
214
 
                        ContentLine content_line = cli.next();
 
196
                        ByteBuffer buffer = cli.next();
215
197
 
216
 
                        // get a US-ASCII version of the string, for processing
217
 
                        String line = content_line.getUsAsciiLine();
 
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
                        }
218
208
 
219
209
                        if( vcard == null ) {
220
210
                                // look for vcard beginning
221
 
                                if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VCARD.*" ) ) {
 
211
                                if( line.matches( "^BEGIN[ \t]*:[ \t]*VCARD" ) ) {
222
212
                                        setProgress( _progress++ );
223
213
                                        vcard = new Vcard();
224
214
                                        vcard_start_line = cli.getLineNumber();
226
216
                        }
227
217
                        else {
228
218
                                // look for vcard content or ending
229
 
                                if( line.matches( "(?i)END[ \t]*:[ \t]*VCARD.*" ) )
 
219
                                if( line.matches( "^END[ \t]*:[ \t]*VCARD" ) )
230
220
                                {
231
221
                                        // finalise the vcard/contact
232
222
                                        try {
236
226
                                                importContact( vcard );
237
227
                                        }
238
228
                                        catch( Vcard.ParseException e ) {
239
 
                                                showContinueOrAbort(
 
229
                                                if( !showContinue(
240
230
                                                        getText( R.string.error_vcf_parse ).toString()
241
231
                                                        + fileName +
242
232
                                                        getText( R.string.error_vcf_parse_line ).toString()
243
 
                                                        + cli.getLineNumber() + ":\n" + e.getMessage() );
244
 
                                                skipContact();
 
233
                                                        + cli.getLineNumber() + ":\n" + e.getMessage() ) )
 
234
                                                {
 
235
                                                        finish( ACTION_ABORT );
 
236
                                                }
 
237
                                                else
 
238
                                                        skipContact();
245
239
                                        }
246
240
                                        catch( ContactData.ContactNotIdentifiableException e ) {
247
 
                                                showContinueOrAbort(
 
241
                                                if( !showContinue(
248
242
                                                        getText( R.string.error_vcf_parse ).toString()
249
243
                                                        + fileName +
250
244
                                                        getText( R.string.error_vcf_parse_line ).toString()
251
245
                                                        + vcard_start_line + ":\n" + getText(
252
 
                                                                R.string.error_vcf_notenoughinfo ).toString() );
253
 
                                                skipContact();
 
246
                                                                R.string.error_vcf_notenoughinfo ).toString()
 
247
                                                ) )
 
248
                                                {
 
249
                                                        finish( ACTION_ABORT );
 
250
                                                }
 
251
                                                else
 
252
                                                        skipContact();
254
253
                                        }
255
254
 
256
255
                                        // discard this vcard
260
259
                                {
261
260
                                        // try giving the line to the vcard
262
261
                                        try {
263
 
                                                vcard.parseLine( content_line );
 
262
                                                vcard.parseLine( buffer, line,
 
263
                                                        cli.doesNextLineLookFolded() );
264
264
                                        }
265
265
                                        catch( Vcard.ParseException e ) {
266
266
                                                skipContact();
267
 
                                                showContinueOrAbort(
 
267
                                                if( !showContinue(
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() );
 
271
                                                        + cli.getLineNumber() + "\n" + e.getMessage() ) )
 
272
                                                {
 
273
                                                        finish( ACTION_ABORT );
 
274
                                                }
272
275
 
273
 
                                                // Although we're continuing, we still need to abort
274
 
                                                // this vCard.  Further lines will be ignored until we
 
276
                                                // although we're continuing, we still need to abort
 
277
                                                // this vCard. Further lines will be ignored until we
275
278
                                                // get to another BEGIN:VCARD line.
276
279
                                                vcard = null;
277
280
                                        }
278
281
                                        catch( Vcard.SkipImportException e ) {
279
282
                                                skipContact();
280
 
                                                // Abort this vCard.  Further lines will be ignored until
 
283
                                                // abort this vCard. Further lines will be ignored until
281
284
                                                // we get to another BEGIN:VCARD line.
282
285
                                                vcard = null;
283
286
                                        }
286
289
                }
287
290
        }
288
291
 
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 >
 
292
        class ContentLineIterator implements Iterator< ByteBuffer >
332
293
        {
333
294
                protected byte[] _content = null;
334
295
                protected int _pos = 0;
346
307
                }
347
308
 
348
309
                @Override
349
 
                public ContentLine next()
 
310
                public ByteBuffer next()
350
311
                {
351
312
                        int initial_pos = _pos;
352
313
 
359
320
                                                _pos > initial_pos )? _pos - 1 : _pos;
360
321
                                        _pos++;
361
322
                                        _line++;
362
 
                                        return new ContentLine(
363
 
                                                ByteBuffer.wrap( _content, initial_pos,
364
 
                                                        to - initial_pos ),
365
 
                                                doesNextLineLookFolded() );
 
323
                                        return ByteBuffer.wrap( _content, initial_pos,
 
324
                                                to - initial_pos );
366
325
                                }
367
326
 
368
327
                        // we didn't find one, but were there bytes left?
370
329
                                int to = _pos;
371
330
                                _pos++;
372
331
                                _line++;
373
 
                                return new ContentLine(
374
 
                                        ByteBuffer.wrap( _content, initial_pos,
375
 
                                                to - initial_pos ),
376
 
                                        doesNextLineLookFolded() );
 
332
                                return ByteBuffer.wrap( _content, initial_pos,
 
333
                                        to - initial_pos );
377
334
                        }
378
335
 
379
336
                        // no bytes left
391
348
                 * onto the end of this one?
392
349
                 * @return
393
350
                 */
394
 
                private boolean doesNextLineLookFolded()
 
351
                public boolean doesNextLineLookFolded()
395
352
                {
396
353
                        return _pos > 0 && _pos < _content.length &&
397
354
                                _content[ _pos - 1 ] == '\n' &&
416
373
                private final static int MULTILINE_FOLDED = 3;  // MIME-DIR folding
417
374
 
418
375
                private String _version = null;
419
 
                private Vector< ContentLine > _content_lines = null;
 
376
                private Vector< ByteBuffer > _buffers = null;
420
377
                private int _name_level = NAMELEVEL_NONE;
421
378
                private int _parser_multiline_state = MULTILINE_NONE;
422
379
                private String _parser_current_name_and_params = null;
465
422
                @SuppressWarnings("serial")
466
423
                protected class SkipImportException extends Exception { }
467
424
 
468
 
                private String extractCollonPartFromLine( ContentLine content_line,
469
 
                        boolean former )
 
425
                private String extractCollonPartFromLine( ByteBuffer buffer,
 
426
                        String line, boolean former )
470
427
                {
 
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
 
471
443
                        // split line into name and value parts and check to make sure we
472
444
                        // only got 2 parts and that the first part is not zero in length
473
 
                        String[] parts = content_line.getUsAsciiLine().split( ":", 2 );
 
445
                        String[] parts = line.split( ":", 2 );
474
446
                        if( parts.length == 2 && parts[ 0 ].length() > 0 )
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 )
 
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 )
491
465
                        throws ParseException, SkipImportException,
492
466
                        AbortImportException
493
467
                {
496
470
                        {
497
471
                                // tentatively get name and params from line
498
472
                                String name_and_params =
499
 
                                        extractNameAndParamsFromLine( content_line );
 
473
                                        extractNameAndParamsFromLine( buffer, line );
500
474
 
501
475
                                // is it a version line?
502
476
                                if( name_and_params != null &&
503
477
                                        name_and_params.equalsIgnoreCase( "VERSION" ) )
504
478
                                {
505
479
                                        // yes, get it!
506
 
                                        String value = extractValueFromLine( content_line );
507
 
                                        if( value == null || (
508
 
                                                !value.equals( "2.1" ) && !value.equals( "3.0" ) ) )
509
 
                                        {
 
480
                                        String value = extractValueFromLine( buffer, line );
 
481
                                        if( !value.equals( "2.1" ) && !value.equals( "3.0" ) )
510
482
                                                throw new ParseException( R.string.error_vcf_version );
511
 
                                        }
512
483
                                        _version = value;
513
484
 
514
485
                                        // parse any buffers we've been accumulating while we waited
515
486
                                        // for a version
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;
 
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;
520
495
                                }
521
496
                                else
522
497
                                {
523
498
                                        // no, so stash this line till we get a version
524
 
                                        if( _content_lines == null )
525
 
                                                _content_lines = new Vector< ContentLine >();
526
 
                                        _content_lines.add( content_line );
 
499
                                        if( _buffers == null )
 
500
                                                _buffers = new Vector< ByteBuffer >();
 
501
                                        _buffers.add( buffer );
527
502
                                }
528
503
                        }
529
504
                        else
541
516
 
542
517
                                        // skip some initial line characters, depending on the type
543
518
                                        // of multi-line we're handling
544
 
                                        pos = content_line.getBuffer().position();
 
519
                                        pos = buffer.position();
545
520
                                        switch( _parser_multiline_state )
546
521
                                        {
547
522
                                        case MULTILINE_FOLDED:
548
523
                                                pos++;
549
524
                                                break;
550
525
                                        case MULTILINE_ENCODED:
551
 
                                                while( pos < content_line.getBuffer().limit() && (
552
 
                                                        content_line.getBuffer().get( pos ) == ' ' ||
553
 
                                                        content_line.getBuffer().get( pos ) == '\t' ) )
 
526
                                                while( pos < buffer.limit() && (
 
527
                                                        buffer.get( pos ) == ' ' ||
 
528
                                                        buffer.get( pos ) == '\t' ) )
554
529
                                                {
555
530
                                                        pos++;
556
531
                                                }
566
541
                                else
567
542
                                {
568
543
                                        // skip empty lines
569
 
                                        if( content_line.getUsAsciiLine().trim().length() == 0 )
570
 
                                                return;
 
544
                                        if( line.trim().length() == 0 ) return;
571
545
 
572
546
                                        // get name and params from line, and since we're not
573
547
                                        // parsing a subsequent line in a multi-line, this should
574
548
                                        // not fail, or it's an error
575
549
                                        name_and_params =
576
 
                                                extractNameAndParamsFromLine( content_line );
 
550
                                                extractNameAndParamsFromLine( buffer, line );
577
551
                                        if( name_and_params == null )
578
552
                                                throw new ParseException(
579
553
                                                        R.string.error_vcf_malformed );
580
554
 
581
555
                                        // calculate how many chars to skip from beginning of line
582
556
                                        // so we skip the property "name:" part
583
 
                                        pos = content_line.getBuffer().position() +
584
 
                                                name_and_params.length() + 1;
 
557
                                        pos = buffer.position() + name_and_params.length() + 1;
585
558
 
586
559
                                        // reset the saved multi-line state
587
560
                                        _parser_current_name_and_params = name_and_params;
590
563
 
591
564
                                // get value from buffer, as raw bytes
592
565
                                ByteBuffer value;
593
 
                                value = ByteBuffer.wrap( content_line.getBuffer().array(), pos,
594
 
                                        content_line.getBuffer().limit() - pos );
 
566
                                value = ByteBuffer.wrap( buffer.array(), pos,
 
567
                                        buffer.limit() - pos );
595
568
 
596
569
                                // get parameter parts
597
570
                                String[] name_param_parts = name_and_params.split( ";", -1 );
605
578
                                ) );
606
579
                                boolean is_interesting_field =
607
580
                                        interesting_fields.contains(
608
 
                                                name_param_parts[ 0 ].toUpperCase( Locale.ENGLISH ) );
 
581
                                                name_param_parts[ 0 ].toUpperCase( Locale.US ) );
609
582
 
610
583
                                // parse encoding parameter
611
584
                                String encoding = checkParam( name_param_parts, "ENCODING" );
612
585
                                if( encoding != null )
613
 
                                        encoding = encoding.toUpperCase( Locale.ENGLISH );
 
586
                                        encoding = encoding.toUpperCase( Locale.US );
614
587
                                if( is_interesting_field && encoding != null &&
615
588
                                        !encoding.equalsIgnoreCase( "8BIT" ) &&
616
589
                                        !encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
622
595
                                // parse charset parameter
623
596
                                String charset = checkParam( name_param_parts, "CHARSET" );
624
597
                                if( charset != null )
625
 
                                        charset = charset.toUpperCase( Locale.ENGLISH );
 
598
                                        charset = charset.toUpperCase( Locale.US );
626
599
                                if( charset != null &&
627
600
                                        !charset.equalsIgnoreCase( "US-ASCII" ) &&
628
601
                                        !charset.equalsIgnoreCase( "ASCII" ) &&
685
658
                                // if we know we're not in an encoding-based multi-line, check
686
659
                                // to see if we're in a folded multi-line
687
660
                                if( _parser_multiline_state == MULTILINE_NONE &&
688
 
                                        content_line.doesNextLineLookFolded() )
 
661
                                        next_line_looks_folded )
689
662
                                {
690
663
                                        _parser_multiline_state = MULTILINE_FOLDED;
691
664
                                }
721
694
                                        parseLABEL( name_param_parts, complete_value );
722
695
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )
723
696
                                        parseNOTE( name_param_parts, complete_value );
724
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "BDAY" ) )
725
 
                                        parseBDAY( name_param_parts, complete_value );
726
697
                        }
727
698
                }
728
699
 
752
723
                        {
753
724
                                String str = parts.get( a );
754
725
 
755
 
                                // Look for parts that end in an escape character, but ignore
756
 
                                // the final part.  We've already detected escape chars at the
 
726
                                // look for parts that end in an escape character, but ignore
 
727
                                // the final part. We've already detected escape chars at the
757
728
                                // end of the final part in parseLine() and handled multi-lines
758
729
                                // accordingly.
759
730
                                if( a < parts.size() - 1 &&
849
820
                                        for( int b = 0; b < name_part_parts.length; b++ )
850
821
                                                if( name_part_parts[ b ].length() > 0 )
851
822
                                                {
852
 
                                                        if( value.length() > 0 ) value += " ";
 
823
                                                        if( value.length() == 0 ) value += " ";
853
824
                                                        value += name_part_parts[ b ];
854
825
                                                }
855
826
                                }
1029
1000
                        addNote( unescapeValue( value ) );
1030
1001
                }
1031
1002
 
1032
 
                private void parseBDAY( String[] params, String value )
1033
 
                {
1034
 
                        setBirthday( value );
1035
 
                }
1036
 
 
1037
1003
                public void finaliseVcard()
1038
1004
                        throws ParseException, ContactNotIdentifiableException
1039
1005
                {
1040
1006
                        // missing version (and data is present)
1041
 
                        if( _version == null && _content_lines != null )
 
1007
                        if( _version == null && _buffers != null )
1042
1008
                                throw new ParseException( R.string.error_vcf_malformed );
1043
1009
 
1044
1010
                        // finalise the parent class
1047
1013
 
1048
1014
                /**
1049
1015
                 * Amongst the params, find the value of the first, only, of any with
1050
 
                 * the specified name.
1051
 
                 *
 
1016
                 * the specified name
1052
1017
                 * @param params
1053
1018
                 * @param name
1054
1019
                 * @return a value, or null
1060
1025
                }
1061
1026
 
1062
1027
                /**
1063
 
                 * Amongst the params, find the values of any with the specified name.
1064
 
                 *
 
1028
                 * Amongst the params, find the values of any with the specified name
1065
1029
                 * @param params
1066
1030
                 * @param name
1067
1031
                 * @return an array of values, or null
1083
1047
                }
1084
1048
 
1085
1049
                /**
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
 
                 *
 
1050
                 * Amongst the params, return any type values present. For v2.1 vCards,
 
1051
                 * those types are just parameters. For v3.0, they are prefixed with
 
1052
                 * "TYPE=". There may also be multiple type parameters.
1090
1053
                 * @param params an array of params to look for types in
1091
1054
                 * @param valid_types an list of upper-case type values to look for
1092
1055
                 * @return a set of present type values
1104
1067
                                // this is in the specs!)
1105
1068
                                String[] parts = type_params[ a ].split( "," );
1106
1069
                                for( int i = 0; i < parts.length; i++ ) {
1107
 
                                        String ucpart = parts[ i ].toUpperCase( Locale.ENGLISH );
 
1070
                                        String ucpart = parts[ i ].toUpperCase( Locale.US );
1108
1071
                                        if( valid_types.contains( ucpart ) )
1109
1072
                                                types.add( ucpart );
1110
1073
                                }
1113
1076
                        // get 2.1-style type param
1114
1077
                        if( _version.equals( "2.1" ) ) {
1115
1078
                                for( int i = 1; i < params.length; i++ ) {
1116
 
                                        String ucparam = params[ i ].toUpperCase( Locale.ENGLISH );
 
1079
                                        String ucparam = params[ i ].toUpperCase( Locale.US );
1117
1080
                                        if( valid_types.contains( ucparam ) )
1118
1081
                                                types.add( ucparam );
1119
1082
                                }
1144
1107
                                else if( ch == '=' && i == in.limit() - 1 )
1145
1108
                                {
1146
1109
                                        // we found a '=' at the end of a line signifying a multi-
1147
 
                                        // line string, so we don't add it
 
1110
                                        // line string, so we don't add it.
1148
1111
                                        another = true;
1149
1112
                                        continue;
1150
1113
                                }