/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: 2013-03-17 12:07:41 UTC
  • Revision ID: tim@ed.am-20130317120741-pq94jr0ajq1dsqw8
updated NEWS

Show diffs side-by-side

added added

removed removed

38
38
import java.util.HashSet;
39
39
import java.util.Iterator;
40
40
import java.util.List;
 
41
import java.util.Locale;
41
42
import java.util.NoSuchElementException;
42
43
import java.util.Set;
43
44
import java.util.Vector;
44
45
import java.util.regex.Matcher;
45
46
import java.util.regex.Pattern;
46
47
 
 
48
import android.annotation.SuppressLint;
47
49
import android.content.SharedPreferences;
48
 
import android.provider.Contacts;
49
 
import android.provider.Contacts.PhonesColumns;
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
        {
82
83
                                // get files
83
84
                                class VCardFilter implements FilenameFilter {
84
85
                                        public boolean accept( File dir, String name ) {
85
 
                                                return name.toLowerCase().endsWith( ".vcf" );
 
86
                                                return name.toLowerCase( Locale.US ).endsWith( ".vcf" );
86
87
                                        }
87
88
                                }
88
89
                                files = file.listFiles( new VCardFilter() );
132
133
                        boolean in_vcard = false;
133
134
                        while( ( line = reader.readLine() ) != null )
134
135
                        {
135
 
                                if( !in_vcard ) {
 
136
                                if( !in_vcard )
 
137
                                {
136
138
                                        // look for vcard beginning
137
 
                                        if( line.matches( "^BEGIN:VCARD" ) ) {
 
139
                                        if( line.matches( "^BEGIN[ \t]*:[ \t]*VCARD.*$" ) ) {
138
140
                                                in_vcard = true;
139
141
                                                _vcard_count++;
140
142
                                        }
 
143
                                        // check for vMsg files
 
144
                                        else if( line.matches( "^BEGIN[ \t]*:[ \t]*VMSG.*$" ) ) {
 
145
                                                showError( getText( R.string.error_vcf_vmsgfile )
 
146
                                                        + file.getName() );
 
147
                                        }
141
148
                                }
142
 
                                else if( line.matches( "^END:VCARD" ) )
 
149
                                else if( line.matches( "^END[ \t]*:[ \t]*VCARD.*$" ) )
143
150
                                        in_vcard = false;
144
151
                        }
145
152
 
174
181
                        // import
175
182
                        importVCardFileContent( content, file.getName() );
176
183
                }
 
184
                catch( OutOfMemoryError e ) {
 
185
                        showError( R.string.error_outofmemory );
 
186
                }
177
187
                catch( FileNotFoundException e ) {
178
188
                        showError( getText( R.string.error_filenotfound ) +
179
189
                                file.getName() );
192
202
                ContentLineIterator cli = new ContentLineIterator( content );
193
203
                while( cli.hasNext() )
194
204
                {
195
 
                        ByteBuffer buffer = cli.next();
 
205
                        ContentLine content_line = cli.next();
196
206
 
197
 
                        // get a US-ASCII version of the line for processing
198
 
                        String line;
199
 
                        try {
200
 
                                line = new String( buffer.array(), buffer.position(),
201
 
                                        buffer.limit() - buffer.position(), "US-ASCII" );
202
 
                        }
203
 
                        catch( UnsupportedEncodingException e ) {
204
 
                                // we know US-ASCII is supported, so appease the compiler...
205
 
                                line = "";
206
 
                        }
 
207
                        // get a US-ASCII version of the string, for processing
 
208
                        String line = content_line.getUsAsciiLine();
207
209
 
208
210
                        if( vcard == null ) {
209
211
                                // look for vcard beginning
210
 
                                if( line.matches( "^BEGIN:VCARD" ) ) {
 
212
                                if( line.matches( "^BEGIN[ \t]*:[ \t]*VCARD.*$" ) ) {
211
213
                                        setProgress( _progress++ );
212
214
                                        vcard = new Vcard();
213
215
                                        vcard_start_line = cli.getLineNumber();
215
217
                        }
216
218
                        else {
217
219
                                // look for vcard content or ending
218
 
                                if( line.matches( "^END:VCARD" ) )
 
220
                                if( line.matches( "^END[ \t]*:[ \t]*VCARD.*$" ) )
219
221
                                {
220
222
                                        // finalise the vcard/contact
221
223
                                        try {
258
260
                                {
259
261
                                        // try giving the line to the vcard
260
262
                                        try {
261
 
                                                vcard.parseLine( buffer, line,
262
 
                                                        cli.doesNextLineLookFolded() );
 
263
                                                vcard.parseLine( content_line );
263
264
                                        }
264
265
                                        catch( Vcard.ParseException e ) {
265
266
                                                skipContact();
288
289
                }
289
290
        }
290
291
 
291
 
        class ContentLineIterator implements Iterator< ByteBuffer >
 
292
        class ContentLine
 
293
        {
 
294
                private ByteBuffer _buffer;
 
295
                private boolean _folded_next;
 
296
                private String _line;
 
297
 
 
298
                public ContentLine( ByteBuffer buffer, boolean folded_next )
 
299
                {
 
300
                        _buffer = buffer;
 
301
                        _folded_next = folded_next;
 
302
                        _line = null;
 
303
                }
 
304
 
 
305
                public ByteBuffer getBuffer()
 
306
                {
 
307
                        return _buffer;
 
308
                }
 
309
 
 
310
                public boolean doesNextLineLookFolded()
 
311
                {
 
312
                        return _folded_next;
 
313
                }
 
314
 
 
315
                public String getUsAsciiLine()
 
316
                {
 
317
                        // generated line and cache it
 
318
                        if( _line == null ) {
 
319
                                try {
 
320
                                        _line = new String( _buffer.array(), _buffer.position(),
 
321
                                                _buffer.limit() - _buffer.position(), "US-ASCII" );
 
322
                                }
 
323
                                catch( UnsupportedEncodingException e ) {
 
324
                                        // we know US-ASCII *is* supported, so appease the
 
325
                                        // compiler...
 
326
                                }
 
327
                        }
 
328
 
 
329
                        // return cached line
 
330
                        return _line;
 
331
                }
 
332
        }
 
333
 
 
334
        class ContentLineIterator implements Iterator< ContentLine >
292
335
        {
293
336
                protected byte[] _content = null;
294
337
                protected int _pos = 0;
306
349
                }
307
350
 
308
351
                @Override
309
 
                public ByteBuffer next()
 
352
                public ContentLine next()
310
353
                {
311
354
                        int initial_pos = _pos;
312
355
 
319
362
                                                _pos > initial_pos )? _pos - 1 : _pos;
320
363
                                        _pos++;
321
364
                                        _line++;
322
 
                                        return ByteBuffer.wrap( _content, initial_pos,
323
 
                                                to - initial_pos );
 
365
                                        return new ContentLine(
 
366
                                                ByteBuffer.wrap( _content, initial_pos,
 
367
                                                        to - initial_pos ),
 
368
                                                doesNextLineLookFolded() );
324
369
                                }
325
370
 
326
371
                        // we didn't find one, but were there bytes left?
328
373
                                int to = _pos;
329
374
                                _pos++;
330
375
                                _line++;
331
 
                                return ByteBuffer.wrap( _content, initial_pos,
332
 
                                        to - initial_pos );
 
376
                                return new ContentLine(
 
377
                                        ByteBuffer.wrap( _content, initial_pos,
 
378
                                                to - initial_pos ),
 
379
                                        doesNextLineLookFolded() );
333
380
                        }
334
381
 
335
382
                        // no bytes left
347
394
                 * onto the end of this one?
348
395
                 * @return
349
396
                 */
350
 
                public boolean doesNextLineLookFolded()
 
397
                private boolean doesNextLineLookFolded()
351
398
                {
352
399
                        return _pos > 0 && _pos < _content.length &&
353
 
                                _content[ _pos - 1 ] == '\n' && _content[ _pos ] == ' ';
 
400
                                _content[ _pos - 1 ] == '\n' &&
 
401
                                ( _content[ _pos ] == ' ' || _content[ _pos ] == '\t' );
354
402
                }
355
403
 
356
404
                public int getLineNumber()
368
416
                private final static int MULTILINE_NONE = 0;
369
417
                private final static int MULTILINE_ENCODED = 1; // v2.1 quoted-printable
370
418
                private final static int MULTILINE_ESCAPED = 2; // v2.1 \\CRLF
371
 
                private final static int MULTILINE_FOLDED = 3;  // v3.0 folding
 
419
                private final static int MULTILINE_FOLDED = 3;  // MIME-DIR folding
372
420
 
373
421
                private String _version = null;
374
 
                private Vector< ByteBuffer > _buffers = null;
 
422
                private Vector< ContentLine > _content_lines = null;
375
423
                private int _name_level = NAMELEVEL_NONE;
376
424
                private int _parser_multiline_state = MULTILINE_NONE;
377
425
                private String _parser_current_name_and_params = null;
420
468
                @SuppressWarnings("serial")
421
469
                protected class SkipImportException extends Exception { }
422
470
 
423
 
                private String extractCollonPartFromLine( ByteBuffer buffer,
424
 
                        String line, boolean former )
 
471
                private String extractCollonPartFromLine( ContentLine content_line,
 
472
                        boolean former )
425
473
                {
426
474
                        String ret = null;
427
475
 
428
 
                        // get a US-ASCII version of the line for processing, unless we were
429
 
                        // supplied with one
430
 
                        if( line == null ) {
431
 
                                try {
432
 
                                        line = new String( buffer.array(), buffer.position(),
433
 
                                                buffer.limit() - buffer.position(), "US-ASCII" );
434
 
                                }
435
 
                                catch( UnsupportedEncodingException e ) {
436
 
                                        // we know US-ASCII is supported, so appease the compiler...
437
 
                                        line = "";
438
 
                                }
439
 
                        }
440
 
 
441
476
                        // split line into name and value parts and check to make sure we
442
477
                        // only got 2 parts and that the first part is not zero in length
443
 
                        String[] parts = line.split( ":", 2 );
 
478
                        String[] parts = content_line.getUsAsciiLine().split( ":", 2 );
444
479
                        if( parts.length == 2 && parts[ 0 ].length() > 0 )
445
480
                                ret = parts[ former? 0 : 1 ];
446
481
 
447
482
                        return ret;
448
483
                }
449
484
 
450
 
                private String extractNameAndParamsFromLine( ByteBuffer buffer,
451
 
                        String line )
452
 
                {
453
 
                        return extractCollonPartFromLine( buffer, line, true );
454
 
                }
455
 
 
456
 
                private String extractValueFromLine( ByteBuffer buffer, String line )
457
 
                {
458
 
                        return extractCollonPartFromLine( buffer, line, false );
459
 
                }
460
 
 
461
 
                public void parseLine( ByteBuffer buffer, String line,
462
 
                        boolean next_line_looks_folded )
 
485
                private String extractNameAndParamsFromLine( ContentLine content_line )
 
486
                {
 
487
                        return extractCollonPartFromLine( content_line, true ).trim();
 
488
                }
 
489
 
 
490
                private String extractValueFromLine( ContentLine content_line )
 
491
                {
 
492
                        return extractCollonPartFromLine( content_line, false );
 
493
                }
 
494
 
 
495
                public void parseLine( ContentLine content_line )
463
496
                        throws ParseException, SkipImportException,
464
497
                        AbortImportException
465
498
                {
468
501
                        {
469
502
                                // tentatively get name and params from line
470
503
                                String name_and_params =
471
 
                                        extractNameAndParamsFromLine( buffer, line );
 
504
                                        extractNameAndParamsFromLine( content_line );
472
505
 
473
506
                                // is it a version line?
474
507
                                if( name_and_params != null &&
475
 
                                        name_and_params.equals( "VERSION" ) )
 
508
                                        name_and_params.equalsIgnoreCase( "VERSION" ) )
476
509
                                {
477
510
                                        // yes, get it!
478
 
                                        String value = extractValueFromLine( buffer, line );
 
511
                                        String value = extractValueFromLine( content_line ).trim();
479
512
                                        if( !value.equals( "2.1" ) && !value.equals( "3.0" ) )
480
513
                                                throw new ParseException( R.string.error_vcf_version );
481
514
                                        _version = value;
482
515
 
483
516
                                        // parse any buffers we've been accumulating while we waited
484
517
                                        // for a version
485
 
                                        if( _buffers != null )
486
 
                                                for( int i = 0; i < _buffers.size(); i++ )
487
 
                                                        parseLine( _buffers.get( i ), null,
488
 
                                                                i + 1 < _buffers.size() &&
489
 
                                                                _buffers.get( i + 1 ).hasRemaining() &&
490
 
                                                                _buffers.get( i + 1 ).get(
491
 
                                                                        _buffers.get( i + 1 ).position() ) == ' ' );
492
 
                                        _buffers = null;
 
518
                                        if( _content_lines != null )
 
519
                                                for( int i = 0; i < _content_lines.size(); i++ )
 
520
                                                        parseLine( _content_lines.get( i ) );
 
521
                                        _content_lines = null;
493
522
                                }
494
523
                                else
495
524
                                {
496
525
                                        // no, so stash this line till we get a version
497
 
                                        if( _buffers == null )
498
 
                                                _buffers = new Vector< ByteBuffer >();
499
 
                                        _buffers.add( buffer );
 
526
                                        if( _content_lines == null )
 
527
                                                _content_lines = new Vector< ContentLine >();
 
528
                                        _content_lines.add( content_line );
500
529
                                }
501
530
                        }
502
531
                        else
503
532
                        {
504
533
                                // name and params and the position in the buffer where the
505
 
                                // "value" part of the line start
 
534
                                // "value" part of the line starts
506
535
                                String name_and_params;
507
536
                                int pos;
508
537
 
514
543
 
515
544
                                        // skip some initial line characters, depending on the type
516
545
                                        // of multi-line we're handling
517
 
                                        pos = buffer.position();
 
546
                                        pos = content_line.getBuffer().position();
518
547
                                        switch( _parser_multiline_state )
519
548
                                        {
520
549
                                        case MULTILINE_FOLDED:
521
550
                                                pos++;
522
551
                                                break;
523
552
                                        case MULTILINE_ENCODED:
524
 
                                                while( pos < buffer.limit() && (
525
 
                                                        buffer.get( pos ) == ' ' ||
526
 
                                                        buffer.get( pos ) == '\t' ) )
 
553
                                                while( pos < content_line.getBuffer().limit() && (
 
554
                                                        content_line.getBuffer().get( pos ) == ' ' ||
 
555
                                                        content_line.getBuffer().get( pos ) == '\t' ) )
527
556
                                                {
528
557
                                                        pos++;
529
558
                                                }
538
567
                                }
539
568
                                else
540
569
                                {
 
570
                                        // skip empty lines
 
571
                                        if( content_line.getUsAsciiLine().trim().length() == 0 )
 
572
                                                return;
 
573
 
541
574
                                        // get name and params from line, and since we're not
542
575
                                        // parsing a subsequent line in a multi-line, this should
543
576
                                        // not fail, or it's an error
544
577
                                        name_and_params =
545
 
                                                extractNameAndParamsFromLine( buffer, line );
 
578
                                                extractNameAndParamsFromLine( content_line );
546
579
                                        if( name_and_params == null )
547
580
                                                throw new ParseException(
548
581
                                                        R.string.error_vcf_malformed );
549
582
 
550
583
                                        // calculate how many chars to skip from beginning of line
551
584
                                        // so we skip the property "name:" part
552
 
                                        pos = buffer.position() + name_and_params.length() + 1;
 
585
                                        pos = content_line.getBuffer().position() +
 
586
                                                name_and_params.length() + 1;
553
587
 
554
588
                                        // reset the saved multi-line state
555
589
                                        _parser_current_name_and_params = name_and_params;
558
592
 
559
593
                                // get value from buffer, as raw bytes
560
594
                                ByteBuffer value;
561
 
                                value = ByteBuffer.wrap( buffer.array(), pos,
562
 
                                        buffer.limit() - pos );
 
595
                                value = ByteBuffer.wrap( content_line.getBuffer().array(), pos,
 
596
                                        content_line.getBuffer().limit() - pos );
563
597
 
564
598
                                // get parameter parts
565
599
                                String[] name_param_parts = name_and_params.split( ";", -1 );
572
606
                                                "FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR", "LABEL" }
573
607
                                ) );
574
608
                                boolean is_interesting_field =
575
 
                                        interesting_fields.contains( name_param_parts[ 0 ] );
 
609
                                        interesting_fields.contains(
 
610
                                                name_param_parts[ 0 ].toUpperCase( Locale.US ) );
576
611
 
577
612
                                // parse encoding parameter
578
613
                                String encoding = checkParam( name_param_parts, "ENCODING" );
579
 
                                if( encoding != null ) encoding = encoding.toUpperCase();
 
614
                                if( encoding != null )
 
615
                                        encoding = encoding.toUpperCase( Locale.US );
580
616
                                if( is_interesting_field && encoding != null &&
581
 
                                        !encoding.equals( "8BIT" ) &&
582
 
                                        !encoding.equals( "QUOTED-PRINTABLE" ) )
583
 
                                        //&& !encoding.equals( "BASE64" ) )
 
617
                                        !encoding.equalsIgnoreCase( "8BIT" ) &&
 
618
                                        !encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
 
619
                                        //&& !encoding.equalsIgnoreCase( "BASE64" ) )
584
620
                                {
585
621
                                        throw new ParseException( R.string.error_vcf_encoding );
586
622
                                }
587
623
 
588
624
                                // parse charset parameter
589
625
                                String charset = checkParam( name_param_parts, "CHARSET" );
590
 
                                if( charset != null ) charset = charset.toUpperCase();
 
626
                                if( charset != null )
 
627
                                        charset = charset.toUpperCase( Locale.US );
591
628
                                if( charset != null &&
592
 
                                        !charset.equals( "US-ASCII" ) &&
593
 
                                        !charset.equals( "ASCII" ) &&
594
 
                                        !charset.equals( "UTF-8" ) )
 
629
                                        !charset.equalsIgnoreCase( "US-ASCII" ) &&
 
630
                                        !charset.equalsIgnoreCase( "ASCII" ) &&
 
631
                                        !charset.equalsIgnoreCase( "UTF-8" ) )
595
632
                                {
596
633
                                        throw new ParseException( R.string.error_vcf_charset );
597
634
                                }
599
636
                                // do unencoding (or default to a fake unencoding result with
600
637
                                // the raw string)
601
638
                                UnencodeResult unencoding_result = null;
602
 
                                if( encoding != null && encoding.equals( "QUOTED-PRINTABLE" ) )
 
639
                                if( encoding != null &&
 
640
                                        encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
 
641
                                {
603
642
                                        unencoding_result = unencodeQuotedPrintable( value );
604
 
//                              else if( encoding != null && encoding.equals( "BASE64" ) )
 
643
                                }
 
644
//                              else if( encoding != null &&
 
645
//                                      encoding.equalsIgnoreCase( "BASE64" ) )
 
646
//                              {
605
647
//                                      unencoding_result = unencodeBase64( props[ 1 ], charset );
 
648
//                              }
606
649
                                if( unencoding_result != null ) {
607
650
                                        value = unencoding_result.getBuffer();
608
651
                                        if( unencoding_result.isAnotherLineRequired() )
613
656
                                // specified for a v2.1 vcard entry, we assume it's US-ASCII)
614
657
                                if( ( charset == null && _version.equals( "2.1" ) ) ||
615
658
                                        ( charset != null && (
616
 
                                                charset.equals( "ASCII" ) ||
617
 
                                                charset.equals( "US-ASCII" ) ) ) )
 
659
                                                charset.equalsIgnoreCase( "ASCII" ) ||
 
660
                                                charset.equalsIgnoreCase( "US-ASCII" ) ) ) )
618
661
                                {
619
662
                                        value = transcodeAsciiToUtf8( value );
620
663
                                }
631
674
                                // for some entries that have semicolon-separated value parts,
632
675
                                // check to see if the value ends in an escape character, which
633
676
                                // indicates that we have a multi-line value
634
 
                                if( ( name_param_parts[ 0 ].equals( "N" ) ||
635
 
                                        name_param_parts[ 0 ].equals( "ORG" ) ||
636
 
                                        name_param_parts[ 0 ].equals( "ADR" ) ) &&
 
677
                                if( ( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) ||
 
678
                                        name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) ||
 
679
                                        name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) ) &&
637
680
                                        doesStringEndInAnEscapeChar( string_value ) )
638
681
                                {
639
682
                                        _parser_multiline_state = MULTILINE_ESCAPED;
641
684
                                                string_value.length() - 1 );
642
685
                                }
643
686
 
644
 
                                // now we know whether we're in an encoding multi-line,
645
 
                                // determine if we're in a v3 folded multi-line or not
 
687
                                // if we know we're not in an encoding-based multi-line, check
 
688
                                // to see if we're in a folded multi-line
646
689
                                if( _parser_multiline_state == MULTILINE_NONE &&
647
 
                                        _version.equals( "3.0" ) && next_line_looks_folded )
 
690
                                        content_line.doesNextLineLookFolded() )
648
691
                                {
649
692
                                        _parser_multiline_state = MULTILINE_FOLDED;
650
693
                                }
662
705
                                if( complete_value.length() < 1 ) return;
663
706
 
664
707
                                // parse some properties
665
 
                                if( name_param_parts[ 0 ].equals( "N" ) )
 
708
                                if( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) )
666
709
                                        parseN( name_param_parts, complete_value );
667
 
                                else if( name_param_parts[ 0 ].equals( "FN" ) )
 
710
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "FN" ) )
668
711
                                        parseFN( name_param_parts, complete_value );
669
 
                                else if( name_param_parts[ 0 ].equals( "ORG" ) )
 
712
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) )
670
713
                                        parseORG( name_param_parts, complete_value );
671
 
                                else if( name_param_parts[ 0 ].equals( "TITLE" ) )
 
714
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TITLE" ) )
672
715
                                        parseTITLE( name_param_parts, complete_value );
673
 
                                else if( name_param_parts[ 0 ].equals( "TEL" ) )
 
716
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TEL" ) )
674
717
                                        parseTEL( name_param_parts, complete_value );
675
 
                                else if( name_param_parts[ 0 ].equals( "EMAIL" ) )
 
718
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "EMAIL" ) )
676
719
                                        parseEMAIL( name_param_parts, complete_value );
677
 
                                else if( name_param_parts[ 0 ].equals( "ADR" ) )
 
720
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) )
678
721
                                        parseADR( name_param_parts, complete_value );
679
 
                                else if( name_param_parts[ 0 ].equals( "LABEL" ) )
 
722
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "LABEL" ) )
680
723
                                        parseLABEL( name_param_parts, complete_value );
 
724
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )
 
725
                                        parseNOTE( name_param_parts, complete_value );
681
726
                        }
682
727
                }
683
728
 
755
800
                                in_escape = false;
756
801
                                switch( c )
757
802
                                {
 
803
                                case 'T':
 
804
                                case 't':
 
805
                                        // add tab (invalid/non-standard, but accepted)
 
806
                                        ret.append( '\t' );
 
807
                                        break;
758
808
                                case 'N':
759
809
                                case 'n':
760
810
                                        // add newline
768
818
                                        break;
769
819
                                default:
770
820
                                        // unknown escape sequence, so add it unescaped
 
821
                                        // (invalid/non-standard, but accepted)
771
822
                                        ret.append( "\\" );
772
823
                                        ret.append( Character.toChars( c ) );
773
824
                                        break;
798
849
                                        for( int b = 0; b < name_part_parts.length; b++ )
799
850
                                                if( name_part_parts[ b ].length() > 0 )
800
851
                                                {
801
 
                                                        if( value.length() == 0 ) value += " ";
 
852
                                                        if( value.length() > 0 ) value += " ";
802
853
                                                        value += name_part_parts[ b ];
803
854
                                                }
804
855
                                }
879
930
                        int type;
880
931
                        if( types.contains( "FAX" ) )
881
932
                                if( types.contains( "HOME" ) )
882
 
                                        type = PhonesColumns.TYPE_FAX_HOME;
 
933
                                        type = TYPE_FAX_HOME;
883
934
                                else
884
 
                                        type = PhonesColumns.TYPE_FAX_WORK;
 
935
                                        type = TYPE_FAX_WORK;
885
936
                        else if( types.contains( "CELL" ) || types.contains( "VIDEO" ) )
886
 
                                type = PhonesColumns.TYPE_MOBILE;
 
937
                                type = TYPE_MOBILE;
887
938
                        else if( types.contains( "PAGER" ) )
888
 
                                type = PhonesColumns.TYPE_PAGER;
 
939
                                type = TYPE_PAGER;
889
940
                        else if( types.contains( "WORK" ) )
890
 
                                type = PhonesColumns.TYPE_WORK;
 
941
                                type = TYPE_WORK;
891
942
                        else
892
 
                                type = PhonesColumns.TYPE_HOME;
 
943
                                type = TYPE_HOME;
893
944
 
894
945
                        // add phone number
895
946
                        addNumber( value, type, is_preferred );
906
957
                        boolean is_preferred = types.contains( "PREF" );
907
958
                        int type;
908
959
                        if( types.contains( "WORK" ) )
909
 
                                type = Contacts.ContactMethods.TYPE_WORK;
 
960
                                type = TYPE_WORK;
910
961
                        else
911
 
                                type = Contacts.ContactMethods.TYPE_HOME;
 
962
                                type = TYPE_HOME;
912
963
 
913
964
                        addEmail( unescapeValue( value ), type, is_preferred );
914
965
                }
923
974
                        for( int a = 0; a < adr_parts.length; a++ )
924
975
                                if( adr_parts[ a ].length() > 0 )
925
976
                                {
926
 
                                        // split this part in to it's comma-separated bits
927
 
                                        String[] adr_part_parts =
928
 
                                                splitValueByCharacter( adr_parts[ a ], ',' );
929
 
                                        for( int b = 0; b < adr_part_parts.length; b++ )
930
 
                                                if( adr_part_parts[ b ].length() > 0 )
931
 
                                                {
932
 
                                                        if( value.length() > 0 ) value += "\n";
933
 
                                                        value += adr_part_parts[ b ];
934
 
                                                }
 
977
                                        // version 3.0 vCards allow further splitting by comma
 
978
                                        if( _version.equals( "3.0" ) )
 
979
                                        {
 
980
                                                // split this part in to it's comma-separated bits and
 
981
                                                // add them on individual lines
 
982
                                                String[] adr_part_parts =
 
983
                                                        splitValueByCharacter( adr_parts[ a ], ',' );
 
984
                                                for( int b = 0; b < adr_part_parts.length; b++ )
 
985
                                                        if( adr_part_parts[ b ].length() > 0 )
 
986
                                                        {
 
987
                                                                if( value.length() > 0 ) value += "\n";
 
988
                                                                value += adr_part_parts[ b ];
 
989
                                                        }
 
990
                                        }
 
991
                                        else
 
992
                                        {
 
993
                                                // add this part on an individual line
 
994
                                                if( value.length() > 0 ) value += "\n";
 
995
                                                value += adr_parts[ a ];
 
996
                                        }
935
997
                                }
936
998
 
937
999
                        Set< String > types = extractTypes( params, Arrays.asList(
940
1002
                        // add address
941
1003
                        int type;
942
1004
                        if( types.contains( "WORK" ) )
943
 
                                type = Contacts.ContactMethods.TYPE_WORK;
 
1005
                                type = TYPE_WORK;
944
1006
                        else
945
 
                                type = Contacts.ContactMethods.TYPE_HOME;
 
1007
                                type = TYPE_HOME;
946
1008
 
947
1009
                        addAddress( unescapeValue( value ), type );
948
1010
                }
955
1017
                        // add address
956
1018
                        int type;
957
1019
                        if( types.contains( "WORK" ) )
958
 
                                type = Contacts.ContactMethods.TYPE_WORK;
 
1020
                                type = TYPE_WORK;
959
1021
                        else
960
 
                                type = Contacts.ContactMethods.TYPE_HOME;
 
1022
                                type = TYPE_HOME;
961
1023
 
962
1024
                        addAddress( unescapeValue( value ), type );
963
1025
                }
964
1026
 
 
1027
                private void parseNOTE( String[] params, String value )
 
1028
                {
 
1029
                        addNote( unescapeValue( value ) );
 
1030
                }
 
1031
 
965
1032
                public void finaliseVcard()
966
1033
                        throws ParseException, ContactNotIdentifiableException
967
1034
                {
968
1035
                        // missing version (and data is present)
969
 
                        if( _version == null && _buffers != null )
 
1036
                        if( _version == null && _content_lines != null )
970
1037
                                throw new ParseException( R.string.error_vcf_malformed );
971
1038
 
972
1039
                        // finalise the parent class
997
1064
                        HashSet< String > ret = new HashSet< String >();
998
1065
 
999
1066
                        Pattern p = Pattern.compile(
1000
 
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$" );
 
1067
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$",
 
1068
                                Pattern.CASE_INSENSITIVE );
1001
1069
                        for( int i = 0; i < params.length; i++ ) {
1002
1070
                                Matcher m = p.matcher( params[ i ] );
1003
1071
                                if( m.matches() )
1011
1079
                 * Amongst the params, return any type values present. For v2.1 vCards,
1012
1080
                 * those types are just parameters. For v3.0, they are prefixed with
1013
1081
                 * "TYPE=". There may also be multiple type parameters.
1014
 
                 * @param params
1015
 
                 * @param a list of type values to look for
 
1082
                 * @param params an array of params to look for types in
 
1083
                 * @param valid_types an list of upper-case type values to look for
1016
1084
                 * @return a set of present type values
1017
1085
                 */
1018
1086
                private Set< String > extractTypes( String[] params,
1024
1092
                        String type_params[] = checkParams( params, "TYPE" );
1025
1093
                        for( int a = 0; a < type_params.length; a++ )
1026
1094
                        {
1027
 
                                // check for a comma-separated list of types (why? this isn't in
1028
 
                                // the specs!)
 
1095
                                // check for a comma-separated list of types (why? I don't think
 
1096
                                // this is in the specs!)
1029
1097
                                String[] parts = type_params[ a ].split( "," );
1030
 
                                for( int i = 0; i < parts.length; i++ )
1031
 
                                        if( valid_types.contains( parts[ i ] ) )
1032
 
                                                types.add( parts[ i ] );
 
1098
                                for( int i = 0; i < parts.length; i++ ) {
 
1099
                                        String ucpart = parts[ i ].toUpperCase( Locale.US );
 
1100
                                        if( valid_types.contains( ucpart ) )
 
1101
                                                types.add( ucpart );
 
1102
                                }
1033
1103
                        }
1034
1104
 
1035
1105
                        // get 2.1-style type param
1036
1106
                        if( _version.equals( "2.1" ) ) {
1037
 
                                for( int i = 1; i < params.length; i++ )
1038
 
                                        if( valid_types.contains( params[ i ] ) )
1039
 
                                                types.add( params[ i ] );
 
1107
                                for( int i = 1; i < params.length; i++ ) {
 
1108
                                        String ucparam = params[ i ].toUpperCase( Locale.US );
 
1109
                                        if( valid_types.contains( ucparam ) )
 
1110
                                                types.add( ucparam );
 
1111
                                }
1040
1112
                        }
1041
1113
 
1042
1114
                        return types;