/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-19 17:41:04 UTC
  • Revision ID: tim@ed.am-20121219174104-ly9xyjxdhqt0tu9b
ignore temporary files in eclipse project

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