/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-04-24 09:56:17 UTC
  • Revision ID: tim@ed.am-20120424095617-lsfkkpkrlqk9xthn
updated all URLs, email addresses and package names to ed.am

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
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( "(?i)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( "(?i)BEGIN[ \t]*:[ \t]*VMSG.*" ) ) {
145
 
                                                showError( getText( R.string.error_vcf_vmsgfile )
146
 
                                                        + file.getName() );
147
 
                                        }
148
141
                                }
149
 
                                else if( line.matches( "(?i)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( "(?i)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( "(?i)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();
273
272
                                                        finish( ACTION_ABORT );
274
273
                                                }
275
274
 
276
 
                                                // Although we're continuing, we still need to abort
277
 
                                                // this vCard.  Further lines will be ignored until we
 
275
                                                // although we're continuing, we still need to abort
 
276
                                                // this vCard. Further lines will be ignored until we
278
277
                                                // get to another BEGIN:VCARD line.
279
278
                                                vcard = null;
280
279
                                        }
281
280
                                        catch( Vcard.SkipImportException e ) {
282
281
                                                skipContact();
283
 
                                                // Abort this vCard.  Further lines will be ignored until
 
282
                                                // abort this vCard. Further lines will be ignored until
284
283
                                                // we get to another BEGIN:VCARD line.
285
284
                                                vcard = null;
286
285
                                        }
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
                {
 
426
                        String ret = null;
 
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
 
474
441
                        // split line into name and value parts and check to make sure we
475
442
                        // only got 2 parts and that the first part is not zero in length
476
 
                        String[] parts = content_line.getUsAsciiLine().split( ":", 2 );
 
443
                        String[] parts = line.split( ":", 2 );
477
444
                        if( parts.length == 2 && parts[ 0 ].length() > 0 )
478
 
                                return parts[ former? 0 : 1 ].trim();
479
 
 
480
 
                        return null;
481
 
                }
482
 
 
483
 
                private String extractNameAndParamsFromLine( ContentLine content_line )
484
 
                {
485
 
                        return extractCollonPartFromLine( content_line, true );
486
 
                }
487
 
 
488
 
                private String extractValueFromLine( ContentLine content_line )
489
 
                {
490
 
                        return extractCollonPartFromLine( content_line, false );
491
 
                }
492
 
 
493
 
                public void parseLine( ContentLine content_line )
 
445
                                ret = parts[ former? 0 : 1 ];
 
446
 
 
447
                        return ret;
 
448
                }
 
449
 
 
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 )
494
463
                        throws ParseException, SkipImportException,
495
464
                        AbortImportException
496
465
                {
499
468
                        {
500
469
                                // tentatively get name and params from line
501
470
                                String name_and_params =
502
 
                                        extractNameAndParamsFromLine( content_line );
 
471
                                        extractNameAndParamsFromLine( buffer, line );
503
472
 
504
473
                                // is it a version line?
505
474
                                if( name_and_params != null &&
506
 
                                        name_and_params.equalsIgnoreCase( "VERSION" ) )
 
475
                                        name_and_params.equals( "VERSION" ) )
507
476
                                {
508
477
                                        // yes, get it!
509
 
                                        String value = extractValueFromLine( content_line );
510
 
                                        if( value == null || (
511
 
                                                !value.equals( "2.1" ) && !value.equals( "3.0" ) ) )
512
 
                                        {
 
478
                                        String value = extractValueFromLine( buffer, line );
 
479
                                        if( !value.equals( "2.1" ) && !value.equals( "3.0" ) )
513
480
                                                throw new ParseException( R.string.error_vcf_version );
514
 
                                        }
515
481
                                        _version = value;
516
482
 
517
483
                                        // parse any buffers we've been accumulating while we waited
518
484
                                        // for a version
519
 
                                        if( _content_lines != null )
520
 
                                                for( int i = 0; i < _content_lines.size(); i++ )
521
 
                                                        parseLine( _content_lines.get( i ) );
522
 
                                        _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;
523
493
                                }
524
494
                                else
525
495
                                {
526
496
                                        // no, so stash this line till we get a version
527
 
                                        if( _content_lines == null )
528
 
                                                _content_lines = new Vector< ContentLine >();
529
 
                                        _content_lines.add( content_line );
 
497
                                        if( _buffers == null )
 
498
                                                _buffers = new Vector< ByteBuffer >();
 
499
                                        _buffers.add( buffer );
530
500
                                }
531
501
                        }
532
502
                        else
533
503
                        {
534
504
                                // name and params and the position in the buffer where the
535
 
                                // "value" part of the line starts
 
505
                                // "value" part of the line start
536
506
                                String name_and_params;
537
507
                                int pos;
538
508
 
544
514
 
545
515
                                        // skip some initial line characters, depending on the type
546
516
                                        // of multi-line we're handling
547
 
                                        pos = content_line.getBuffer().position();
 
517
                                        pos = buffer.position();
548
518
                                        switch( _parser_multiline_state )
549
519
                                        {
550
520
                                        case MULTILINE_FOLDED:
551
521
                                                pos++;
552
522
                                                break;
553
523
                                        case MULTILINE_ENCODED:
554
 
                                                while( pos < content_line.getBuffer().limit() && (
555
 
                                                        content_line.getBuffer().get( pos ) == ' ' ||
556
 
                                                        content_line.getBuffer().get( pos ) == '\t' ) )
 
524
                                                while( pos < buffer.limit() && (
 
525
                                                        buffer.get( pos ) == ' ' ||
 
526
                                                        buffer.get( pos ) == '\t' ) )
557
527
                                                {
558
528
                                                        pos++;
559
529
                                                }
568
538
                                }
569
539
                                else
570
540
                                {
571
 
                                        // skip empty lines
572
 
                                        if( content_line.getUsAsciiLine().trim().length() == 0 )
573
 
                                                return;
574
 
 
575
541
                                        // get name and params from line, and since we're not
576
542
                                        // parsing a subsequent line in a multi-line, this should
577
543
                                        // not fail, or it's an error
578
544
                                        name_and_params =
579
 
                                                extractNameAndParamsFromLine( content_line );
 
545
                                                extractNameAndParamsFromLine( buffer, line );
580
546
                                        if( name_and_params == null )
581
547
                                                throw new ParseException(
582
548
                                                        R.string.error_vcf_malformed );
583
549
 
584
550
                                        // calculate how many chars to skip from beginning of line
585
551
                                        // so we skip the property "name:" part
586
 
                                        pos = content_line.getBuffer().position() +
587
 
                                                name_and_params.length() + 1;
 
552
                                        pos = buffer.position() + name_and_params.length() + 1;
588
553
 
589
554
                                        // reset the saved multi-line state
590
555
                                        _parser_current_name_and_params = name_and_params;
593
558
 
594
559
                                // get value from buffer, as raw bytes
595
560
                                ByteBuffer value;
596
 
                                value = ByteBuffer.wrap( content_line.getBuffer().array(), pos,
597
 
                                        content_line.getBuffer().limit() - pos );
 
561
                                value = ByteBuffer.wrap( buffer.array(), pos,
 
562
                                        buffer.limit() - pos );
598
563
 
599
564
                                // get parameter parts
600
565
                                String[] name_param_parts = name_and_params.split( ";", -1 );
607
572
                                                "FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR", "LABEL" }
608
573
                                ) );
609
574
                                boolean is_interesting_field =
610
 
                                        interesting_fields.contains(
611
 
                                                name_param_parts[ 0 ].toUpperCase( Locale.US ) );
 
575
                                        interesting_fields.contains( name_param_parts[ 0 ] );
612
576
 
613
577
                                // parse encoding parameter
614
578
                                String encoding = checkParam( name_param_parts, "ENCODING" );
615
 
                                if( encoding != null )
616
 
                                        encoding = encoding.toUpperCase( Locale.US );
 
579
                                if( encoding != null ) encoding = encoding.toUpperCase();
617
580
                                if( is_interesting_field && encoding != null &&
618
 
                                        !encoding.equalsIgnoreCase( "8BIT" ) &&
619
 
                                        !encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
620
 
                                        //&& !encoding.equalsIgnoreCase( "BASE64" ) )
 
581
                                        !encoding.equals( "8BIT" ) &&
 
582
                                        !encoding.equals( "QUOTED-PRINTABLE" ) )
 
583
                                        //&& !encoding.equals( "BASE64" ) )
621
584
                                {
622
585
                                        throw new ParseException( R.string.error_vcf_encoding );
623
586
                                }
624
587
 
625
588
                                // parse charset parameter
626
589
                                String charset = checkParam( name_param_parts, "CHARSET" );
627
 
                                if( charset != null )
628
 
                                        charset = charset.toUpperCase( Locale.US );
 
590
                                if( charset != null ) charset = charset.toUpperCase();
629
591
                                if( charset != null &&
630
 
                                        !charset.equalsIgnoreCase( "US-ASCII" ) &&
631
 
                                        !charset.equalsIgnoreCase( "ASCII" ) &&
632
 
                                        !charset.equalsIgnoreCase( "UTF-8" ) )
 
592
                                        !charset.equals( "US-ASCII" ) &&
 
593
                                        !charset.equals( "ASCII" ) &&
 
594
                                        !charset.equals( "UTF-8" ) )
633
595
                                {
634
596
                                        throw new ParseException( R.string.error_vcf_charset );
635
597
                                }
637
599
                                // do unencoding (or default to a fake unencoding result with
638
600
                                // the raw string)
639
601
                                UnencodeResult unencoding_result = null;
640
 
                                if( encoding != null &&
641
 
                                        encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
642
 
                                {
 
602
                                if( encoding != null && encoding.equals( "QUOTED-PRINTABLE" ) )
643
603
                                        unencoding_result = unencodeQuotedPrintable( value );
644
 
                                }
645
 
//                              else if( encoding != null &&
646
 
//                                      encoding.equalsIgnoreCase( "BASE64" ) )
647
 
//                              {
 
604
//                              else if( encoding != null && encoding.equals( "BASE64" ) )
648
605
//                                      unencoding_result = unencodeBase64( props[ 1 ], charset );
649
 
//                              }
650
606
                                if( unencoding_result != null ) {
651
607
                                        value = unencoding_result.getBuffer();
652
608
                                        if( unencoding_result.isAnotherLineRequired() )
657
613
                                // specified for a v2.1 vcard entry, we assume it's US-ASCII)
658
614
                                if( ( charset == null && _version.equals( "2.1" ) ) ||
659
615
                                        ( charset != null && (
660
 
                                                charset.equalsIgnoreCase( "ASCII" ) ||
661
 
                                                charset.equalsIgnoreCase( "US-ASCII" ) ) ) )
 
616
                                                charset.equals( "ASCII" ) ||
 
617
                                                charset.equals( "US-ASCII" ) ) ) )
662
618
                                {
663
619
                                        value = transcodeAsciiToUtf8( value );
664
620
                                }
675
631
                                // for some entries that have semicolon-separated value parts,
676
632
                                // check to see if the value ends in an escape character, which
677
633
                                // indicates that we have a multi-line value
678
 
                                if( ( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) ||
679
 
                                        name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) ||
680
 
                                        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" ) ) &&
681
637
                                        doesStringEndInAnEscapeChar( string_value ) )
682
638
                                {
683
639
                                        _parser_multiline_state = MULTILINE_ESCAPED;
685
641
                                                string_value.length() - 1 );
686
642
                                }
687
643
 
688
 
                                // if we know we're not in an encoding-based multi-line, check
689
 
                                // 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
690
646
                                if( _parser_multiline_state == MULTILINE_NONE &&
691
 
                                        content_line.doesNextLineLookFolded() )
 
647
                                        _version.equals( "3.0" ) && next_line_looks_folded )
692
648
                                {
693
649
                                        _parser_multiline_state = MULTILINE_FOLDED;
694
650
                                }
706
662
                                if( complete_value.length() < 1 ) return;
707
663
 
708
664
                                // parse some properties
709
 
                                if( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) )
 
665
                                if( name_param_parts[ 0 ].equals( "N" ) )
710
666
                                        parseN( name_param_parts, complete_value );
711
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "FN" ) )
 
667
                                else if( name_param_parts[ 0 ].equals( "FN" ) )
712
668
                                        parseFN( name_param_parts, complete_value );
713
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) )
 
669
                                else if( name_param_parts[ 0 ].equals( "ORG" ) )
714
670
                                        parseORG( name_param_parts, complete_value );
715
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TITLE" ) )
 
671
                                else if( name_param_parts[ 0 ].equals( "TITLE" ) )
716
672
                                        parseTITLE( name_param_parts, complete_value );
717
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TEL" ) )
 
673
                                else if( name_param_parts[ 0 ].equals( "TEL" ) )
718
674
                                        parseTEL( name_param_parts, complete_value );
719
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "EMAIL" ) )
 
675
                                else if( name_param_parts[ 0 ].equals( "EMAIL" ) )
720
676
                                        parseEMAIL( name_param_parts, complete_value );
721
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) )
 
677
                                else if( name_param_parts[ 0 ].equals( "ADR" ) )
722
678
                                        parseADR( name_param_parts, complete_value );
723
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "LABEL" ) )
 
679
                                else if( name_param_parts[ 0 ].equals( "LABEL" ) )
724
680
                                        parseLABEL( name_param_parts, complete_value );
725
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )
726
 
                                        parseNOTE( name_param_parts, complete_value );
727
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "BDAY" ) )
728
 
                                        parseBDAY( name_param_parts, complete_value );
729
681
                        }
730
682
                }
731
683
 
755
707
                        {
756
708
                                String str = parts.get( a );
757
709
 
758
 
                                // Look for parts that end in an escape character, but ignore
759
 
                                // the final part.  We've already detected escape chars at the
 
710
                                // look for parts that end in an escape character, but ignore
 
711
                                // the final part. We've already detected escape chars at the
760
712
                                // end of the final part in parseLine() and handled multi-lines
761
713
                                // accordingly.
762
714
                                if( a < parts.size() - 1 &&
803
755
                                in_escape = false;
804
756
                                switch( c )
805
757
                                {
806
 
                                case 'T':
807
 
                                case 't':
808
 
                                        // add tab (invalid/non-standard, but accepted)
809
 
                                        ret.append( '\t' );
810
 
                                        break;
811
758
                                case 'N':
812
759
                                case 'n':
813
760
                                        // add newline
821
768
                                        break;
822
769
                                default:
823
770
                                        // unknown escape sequence, so add it unescaped
824
 
                                        // (invalid/non-standard, but accepted)
825
771
                                        ret.append( "\\" );
826
772
                                        ret.append( Character.toChars( c ) );
827
773
                                        break;
852
798
                                        for( int b = 0; b < name_part_parts.length; b++ )
853
799
                                                if( name_part_parts[ b ].length() > 0 )
854
800
                                                {
855
 
                                                        if( value.length() > 0 ) value += " ";
 
801
                                                        if( value.length() == 0 ) value += " ";
856
802
                                                        value += name_part_parts[ b ];
857
803
                                                }
858
804
                                }
933
879
                        int type;
934
880
                        if( types.contains( "FAX" ) )
935
881
                                if( types.contains( "HOME" ) )
936
 
                                        type = TYPE_FAX_HOME;
 
882
                                        type = PhonesColumns.TYPE_FAX_HOME;
937
883
                                else
938
 
                                        type = TYPE_FAX_WORK;
 
884
                                        type = PhonesColumns.TYPE_FAX_WORK;
939
885
                        else if( types.contains( "CELL" ) || types.contains( "VIDEO" ) )
940
 
                                type = TYPE_MOBILE;
 
886
                                type = PhonesColumns.TYPE_MOBILE;
941
887
                        else if( types.contains( "PAGER" ) )
942
 
                                type = TYPE_PAGER;
 
888
                                type = PhonesColumns.TYPE_PAGER;
943
889
                        else if( types.contains( "WORK" ) )
944
 
                                type = TYPE_WORK;
 
890
                                type = PhonesColumns.TYPE_WORK;
945
891
                        else
946
 
                                type = TYPE_HOME;
 
892
                                type = PhonesColumns.TYPE_HOME;
947
893
 
948
894
                        // add phone number
949
895
                        addNumber( value, type, is_preferred );
960
906
                        boolean is_preferred = types.contains( "PREF" );
961
907
                        int type;
962
908
                        if( types.contains( "WORK" ) )
963
 
                                type = TYPE_WORK;
 
909
                                type = Contacts.ContactMethods.TYPE_WORK;
964
910
                        else
965
 
                                type = TYPE_HOME;
 
911
                                type = Contacts.ContactMethods.TYPE_HOME;
966
912
 
967
913
                        addEmail( unescapeValue( value ), type, is_preferred );
968
914
                }
977
923
                        for( int a = 0; a < adr_parts.length; a++ )
978
924
                                if( adr_parts[ a ].length() > 0 )
979
925
                                {
980
 
                                        // version 3.0 vCards allow further splitting by comma
981
 
                                        if( _version.equals( "3.0" ) )
982
 
                                        {
983
 
                                                // split this part in to it's comma-separated bits and
984
 
                                                // add them on individual lines
985
 
                                                String[] adr_part_parts =
986
 
                                                        splitValueByCharacter( adr_parts[ a ], ',' );
987
 
                                                for( int b = 0; b < adr_part_parts.length; b++ )
988
 
                                                        if( adr_part_parts[ b ].length() > 0 )
989
 
                                                        {
990
 
                                                                if( value.length() > 0 ) value += "\n";
991
 
                                                                value += adr_part_parts[ b ];
992
 
                                                        }
993
 
                                        }
994
 
                                        else
995
 
                                        {
996
 
                                                // add this part on an individual line
997
 
                                                if( value.length() > 0 ) value += "\n";
998
 
                                                value += adr_parts[ a ];
999
 
                                        }
 
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
                                                }
1000
935
                                }
1001
936
 
1002
937
                        Set< String > types = extractTypes( params, Arrays.asList(
1005
940
                        // add address
1006
941
                        int type;
1007
942
                        if( types.contains( "WORK" ) )
1008
 
                                type = TYPE_WORK;
 
943
                                type = Contacts.ContactMethods.TYPE_WORK;
1009
944
                        else
1010
 
                                type = TYPE_HOME;
 
945
                                type = Contacts.ContactMethods.TYPE_HOME;
1011
946
 
1012
947
                        addAddress( unescapeValue( value ), type );
1013
948
                }
1020
955
                        // add address
1021
956
                        int type;
1022
957
                        if( types.contains( "WORK" ) )
1023
 
                                type = TYPE_WORK;
 
958
                                type = Contacts.ContactMethods.TYPE_WORK;
1024
959
                        else
1025
 
                                type = TYPE_HOME;
 
960
                                type = Contacts.ContactMethods.TYPE_HOME;
1026
961
 
1027
962
                        addAddress( unescapeValue( value ), type );
1028
963
                }
1029
964
 
1030
 
                private void parseNOTE( String[] params, String value )
1031
 
                {
1032
 
                        addNote( unescapeValue( value ) );
1033
 
                }
1034
 
 
1035
 
                private void parseBDAY( String[] params, String value )
1036
 
                {
1037
 
                        setBirthday( value );
1038
 
                }
1039
 
 
1040
965
                public void finaliseVcard()
1041
966
                        throws ParseException, ContactNotIdentifiableException
1042
967
                {
1043
968
                        // missing version (and data is present)
1044
 
                        if( _version == null && _content_lines != null )
 
969
                        if( _version == null && _buffers != null )
1045
970
                                throw new ParseException( R.string.error_vcf_malformed );
1046
971
 
1047
972
                        // finalise the parent class
1050
975
 
1051
976
                /**
1052
977
                 * Amongst the params, find the value of the first, only, of any with
1053
 
                 * the specified name.
1054
 
                 *
 
978
                 * the specified name
1055
979
                 * @param params
1056
980
                 * @param name
1057
981
                 * @return a value, or null
1063
987
                }
1064
988
 
1065
989
                /**
1066
 
                 * Amongst the params, find the values of any with the specified name.
1067
 
                 *
 
990
                 * Amongst the params, find the values of any with the specified name
1068
991
                 * @param params
1069
992
                 * @param name
1070
993
                 * @return an array of values, or null
1074
997
                        HashSet< String > ret = new HashSet< String >();
1075
998
 
1076
999
                        Pattern p = Pattern.compile(
1077
 
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$",
1078
 
                                Pattern.CASE_INSENSITIVE );
 
1000
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$" );
1079
1001
                        for( int i = 0; i < params.length; i++ ) {
1080
1002
                                Matcher m = p.matcher( params[ i ] );
1081
1003
                                if( m.matches() )
1086
1008
                }
1087
1009
 
1088
1010
                /**
1089
 
                 * Amongst the params, return any type values present.  For v2.1 vCards,
1090
 
                 * those types are just parameters.  For v3.0, they are prefixed with
1091
 
                 * "TYPE=".  There may also be multiple type parameters.
1092
 
                 *
1093
 
                 * @param params an array of params to look for types in
1094
 
                 * @param valid_types an list of upper-case type values to look for
 
1011
                 * Amongst the params, return any type values present. For v2.1 vCards,
 
1012
                 * those types are just parameters. For v3.0, they are prefixed with
 
1013
                 * "TYPE=". There may also be multiple type parameters.
 
1014
                 * @param params
 
1015
                 * @param a list of type values to look for
1095
1016
                 * @return a set of present type values
1096
1017
                 */
1097
1018
                private Set< String > extractTypes( String[] params,
1103
1024
                        String type_params[] = checkParams( params, "TYPE" );
1104
1025
                        for( int a = 0; a < type_params.length; a++ )
1105
1026
                        {
1106
 
                                // check for a comma-separated list of types (why? I don't think
1107
 
                                // this is in the specs!)
 
1027
                                // check for a comma-separated list of types (why? this isn't in
 
1028
                                // the specs!)
1108
1029
                                String[] parts = type_params[ a ].split( "," );
1109
 
                                for( int i = 0; i < parts.length; i++ ) {
1110
 
                                        String ucpart = parts[ i ].toUpperCase( Locale.US );
1111
 
                                        if( valid_types.contains( ucpart ) )
1112
 
                                                types.add( ucpart );
1113
 
                                }
 
1030
                                for( int i = 0; i < parts.length; i++ )
 
1031
                                        if( valid_types.contains( parts[ i ] ) )
 
1032
                                                types.add( parts[ i ] );
1114
1033
                        }
1115
1034
 
1116
1035
                        // get 2.1-style type param
1117
1036
                        if( _version.equals( "2.1" ) ) {
1118
 
                                for( int i = 1; i < params.length; i++ ) {
1119
 
                                        String ucparam = params[ i ].toUpperCase( Locale.US );
1120
 
                                        if( valid_types.contains( ucparam ) )
1121
 
                                                types.add( ucparam );
1122
 
                                }
 
1037
                                for( int i = 1; i < params.length; i++ )
 
1038
                                        if( valid_types.contains( params[ i ] ) )
 
1039
                                                types.add( params[ i ] );
1123
1040
                        }
1124
1041
 
1125
1042
                        return types;
1147
1064
                                else if( ch == '=' && i == in.limit() - 1 )
1148
1065
                                {
1149
1066
                                        // we found a '=' at the end of a line signifying a multi-
1150
 
                                        // line string, so we don't add it
 
1067
                                        // line string, so we don't add it.
1151
1068
                                        another = true;
1152
1069
                                        continue;
1153
1070
                                }