/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:50:33 UTC
  • Revision ID: tim@ed.am-20121219175033-61acsxzjulqpnian
made contacts backend throw exceptions when it can't create contacts on the device; specified Locale in lower/upper case conversions; stripped old Contacts types from Importer (and replaced with our own types, which are now converted in the backend; switched using Integer() constructors to Integer.valueOf(); rewrote the main importer routine a bit

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
133
133
                        boolean in_vcard = false;
134
134
                        while( ( line = reader.readLine() ) != null )
135
135
                        {
136
 
                                if( !in_vcard )
137
 
                                {
 
136
                                if( !in_vcard ) {
138
137
                                        // look for vcard beginning
139
 
                                        if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VCARD.*" ) ) {
 
138
                                        if( line.matches( "^BEGIN:VCARD" ) ) {
140
139
                                                in_vcard = true;
141
140
                                                _vcard_count++;
142
141
                                        }
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
142
                                }
149
 
                                else if( line.matches( "(?i)END[ \t]*:[ \t]*VCARD.*" ) )
 
143
                                else if( line.matches( "^END:VCARD" ) )
150
144
                                        in_vcard = false;
151
145
                        }
152
 
                        reader.close();
153
146
 
154
147
                }
155
148
                catch( FileNotFoundException e ) {
177
170
                        FileInputStream istream = new FileInputStream( file );
178
171
                        byte[] content = new byte[ (int)file.length() ];
179
172
                        istream.read( content );
180
 
                        istream.close();
 
173
                        istream = null;
181
174
 
182
175
                        // import
183
176
                        importVCardFileContent( content, file.getName() );
184
177
                }
185
 
                catch( OutOfMemoryError e ) {
186
 
                        showError( R.string.error_outofmemory );
187
 
                }
188
178
                catch( FileNotFoundException e ) {
189
179
                        showError( getText( R.string.error_filenotfound ) +
190
180
                                file.getName() );
203
193
                ContentLineIterator cli = new ContentLineIterator( content );
204
194
                while( cli.hasNext() )
205
195
                {
206
 
                        ContentLine content_line = cli.next();
 
196
                        ByteBuffer buffer = cli.next();
207
197
 
208
 
                        // get a US-ASCII version of the string, for processing
209
 
                        String line = content_line.getUsAsciiLine();
 
198
                        // get a US-ASCII version of the line for processing
 
199
                        String line;
 
200
                        try {
 
201
                                line = new String( buffer.array(), buffer.position(),
 
202
                                        buffer.limit() - buffer.position(), "US-ASCII" );
 
203
                        }
 
204
                        catch( UnsupportedEncodingException e ) {
 
205
                                // we know US-ASCII is supported, so appease the compiler...
 
206
                                line = "";
 
207
                        }
210
208
 
211
209
                        if( vcard == null ) {
212
210
                                // look for vcard beginning
213
 
                                if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VCARD.*" ) ) {
 
211
                                if( line.matches( "^BEGIN:VCARD" ) ) {
214
212
                                        setProgress( _progress++ );
215
213
                                        vcard = new Vcard();
216
214
                                        vcard_start_line = cli.getLineNumber();
218
216
                        }
219
217
                        else {
220
218
                                // look for vcard content or ending
221
 
                                if( line.matches( "(?i)END[ \t]*:[ \t]*VCARD.*" ) )
 
219
                                if( line.matches( "^END:VCARD" ) )
222
220
                                {
223
221
                                        // finalise the vcard/contact
224
222
                                        try {
261
259
                                {
262
260
                                        // try giving the line to the vcard
263
261
                                        try {
264
 
                                                vcard.parseLine( content_line );
 
262
                                                vcard.parseLine( buffer, line,
 
263
                                                        cli.doesNextLineLookFolded() );
265
264
                                        }
266
265
                                        catch( Vcard.ParseException e ) {
267
266
                                                skipContact();
274
273
                                                        finish( ACTION_ABORT );
275
274
                                                }
276
275
 
277
 
                                                // Although we're continuing, we still need to abort
278
 
                                                // this vCard.  Further lines will be ignored until we
 
276
                                                // although we're continuing, we still need to abort
 
277
                                                // this vCard. Further lines will be ignored until we
279
278
                                                // get to another BEGIN:VCARD line.
280
279
                                                vcard = null;
281
280
                                        }
282
281
                                        catch( Vcard.SkipImportException e ) {
283
282
                                                skipContact();
284
 
                                                // Abort this vCard.  Further lines will be ignored until
 
283
                                                // abort this vCard. Further lines will be ignored until
285
284
                                                // we get to another BEGIN:VCARD line.
286
285
                                                vcard = null;
287
286
                                        }
290
289
                }
291
290
        }
292
291
 
293
 
        class ContentLine
294
 
        {
295
 
                private ByteBuffer _buffer;
296
 
                private boolean _folded_next;
297
 
                private String _line;
298
 
 
299
 
                public ContentLine( ByteBuffer buffer, boolean folded_next )
300
 
                {
301
 
                        _buffer = buffer;
302
 
                        _folded_next = folded_next;
303
 
                        _line = null;
304
 
                }
305
 
 
306
 
                public ByteBuffer getBuffer()
307
 
                {
308
 
                        return _buffer;
309
 
                }
310
 
 
311
 
                public boolean doesNextLineLookFolded()
312
 
                {
313
 
                        return _folded_next;
314
 
                }
315
 
 
316
 
                public String getUsAsciiLine()
317
 
                {
318
 
                        // generated line and cache it
319
 
                        if( _line == null ) {
320
 
                                try {
321
 
                                        _line = new String( _buffer.array(), _buffer.position(),
322
 
                                                _buffer.limit() - _buffer.position(), "US-ASCII" );
323
 
                                }
324
 
                                catch( UnsupportedEncodingException e ) {
325
 
                                        // we know US-ASCII *is* supported, so appease the
326
 
                                        // compiler...
327
 
                                }
328
 
                        }
329
 
 
330
 
                        // return cached line
331
 
                        return _line;
332
 
                }
333
 
        }
334
 
 
335
 
        class ContentLineIterator implements Iterator< ContentLine >
 
292
        class ContentLineIterator implements Iterator< ByteBuffer >
336
293
        {
337
294
                protected byte[] _content = null;
338
295
                protected int _pos = 0;
350
307
                }
351
308
 
352
309
                @Override
353
 
                public ContentLine next()
 
310
                public ByteBuffer next()
354
311
                {
355
312
                        int initial_pos = _pos;
356
313
 
363
320
                                                _pos > initial_pos )? _pos - 1 : _pos;
364
321
                                        _pos++;
365
322
                                        _line++;
366
 
                                        return new ContentLine(
367
 
                                                ByteBuffer.wrap( _content, initial_pos,
368
 
                                                        to - initial_pos ),
369
 
                                                doesNextLineLookFolded() );
 
323
                                        return ByteBuffer.wrap( _content, initial_pos,
 
324
                                                to - initial_pos );
370
325
                                }
371
326
 
372
327
                        // we didn't find one, but were there bytes left?
374
329
                                int to = _pos;
375
330
                                _pos++;
376
331
                                _line++;
377
 
                                return new ContentLine(
378
 
                                        ByteBuffer.wrap( _content, initial_pos,
379
 
                                                to - initial_pos ),
380
 
                                        doesNextLineLookFolded() );
 
332
                                return ByteBuffer.wrap( _content, initial_pos,
 
333
                                        to - initial_pos );
381
334
                        }
382
335
 
383
336
                        // no bytes left
395
348
                 * onto the end of this one?
396
349
                 * @return
397
350
                 */
398
 
                private boolean doesNextLineLookFolded()
 
351
                public boolean doesNextLineLookFolded()
399
352
                {
400
353
                        return _pos > 0 && _pos < _content.length &&
401
 
                                _content[ _pos - 1 ] == '\n' &&
402
 
                                ( _content[ _pos ] == ' ' || _content[ _pos ] == '\t' );
 
354
                                _content[ _pos - 1 ] == '\n' && _content[ _pos ] == ' ';
403
355
                }
404
356
 
405
357
                public int getLineNumber()
417
369
                private final static int MULTILINE_NONE = 0;
418
370
                private final static int MULTILINE_ENCODED = 1; // v2.1 quoted-printable
419
371
                private final static int MULTILINE_ESCAPED = 2; // v2.1 \\CRLF
420
 
                private final static int MULTILINE_FOLDED = 3;  // MIME-DIR folding
 
372
                private final static int MULTILINE_FOLDED = 3;  // v3.0 folding
421
373
 
422
374
                private String _version = null;
423
 
                private Vector< ContentLine > _content_lines = null;
 
375
                private Vector< ByteBuffer > _buffers = null;
424
376
                private int _name_level = NAMELEVEL_NONE;
425
377
                private int _parser_multiline_state = MULTILINE_NONE;
426
378
                private String _parser_current_name_and_params = null;
469
421
                @SuppressWarnings("serial")
470
422
                protected class SkipImportException extends Exception { }
471
423
 
472
 
                private String extractCollonPartFromLine( ContentLine content_line,
473
 
                        boolean former )
 
424
                private String extractCollonPartFromLine( ByteBuffer buffer,
 
425
                        String line, boolean former )
474
426
                {
 
427
                        String ret = null;
 
428
 
 
429
                        // get a US-ASCII version of the line for processing, unless we were
 
430
                        // supplied with one
 
431
                        if( line == null ) {
 
432
                                try {
 
433
                                        line = new String( buffer.array(), buffer.position(),
 
434
                                                buffer.limit() - buffer.position(), "US-ASCII" );
 
435
                                }
 
436
                                catch( UnsupportedEncodingException e ) {
 
437
                                        // we know US-ASCII is supported, so appease the compiler...
 
438
                                        line = "";
 
439
                                }
 
440
                        }
 
441
 
475
442
                        // split line into name and value parts and check to make sure we
476
443
                        // only got 2 parts and that the first part is not zero in length
477
 
                        String[] parts = content_line.getUsAsciiLine().split( ":", 2 );
 
444
                        String[] parts = line.split( ":", 2 );
478
445
                        if( parts.length == 2 && parts[ 0 ].length() > 0 )
479
 
                                return parts[ former? 0 : 1 ].trim();
480
 
 
481
 
                        return null;
482
 
                }
483
 
 
484
 
                private String extractNameAndParamsFromLine( ContentLine content_line )
485
 
                {
486
 
                        return extractCollonPartFromLine( content_line, true );
487
 
                }
488
 
 
489
 
                private String extractValueFromLine( ContentLine content_line )
490
 
                {
491
 
                        return extractCollonPartFromLine( content_line, false );
492
 
                }
493
 
 
494
 
                public void parseLine( ContentLine content_line )
 
446
                                ret = parts[ former? 0 : 1 ];
 
447
 
 
448
                        return ret;
 
449
                }
 
450
 
 
451
                private String extractNameAndParamsFromLine( ByteBuffer buffer,
 
452
                        String line )
 
453
                {
 
454
                        return extractCollonPartFromLine( buffer, line, true );
 
455
                }
 
456
 
 
457
                private String extractValueFromLine( ByteBuffer buffer, String line )
 
458
                {
 
459
                        return extractCollonPartFromLine( buffer, line, false );
 
460
                }
 
461
 
 
462
                public void parseLine( ByteBuffer buffer, String line,
 
463
                        boolean next_line_looks_folded )
495
464
                        throws ParseException, SkipImportException,
496
465
                        AbortImportException
497
466
                {
500
469
                        {
501
470
                                // tentatively get name and params from line
502
471
                                String name_and_params =
503
 
                                        extractNameAndParamsFromLine( content_line );
 
472
                                        extractNameAndParamsFromLine( buffer, line );
504
473
 
505
474
                                // is it a version line?
506
475
                                if( name_and_params != null &&
507
 
                                        name_and_params.equalsIgnoreCase( "VERSION" ) )
 
476
                                        name_and_params.equals( "VERSION" ) )
508
477
                                {
509
478
                                        // yes, get it!
510
 
                                        String value = extractValueFromLine( content_line );
511
 
                                        if( value == null || (
512
 
                                                !value.equals( "2.1" ) && !value.equals( "3.0" ) ) )
513
 
                                        {
 
479
                                        String value = extractValueFromLine( buffer, line );
 
480
                                        if( !value.equals( "2.1" ) && !value.equals( "3.0" ) )
514
481
                                                throw new ParseException( R.string.error_vcf_version );
515
 
                                        }
516
482
                                        _version = value;
517
483
 
518
484
                                        // parse any buffers we've been accumulating while we waited
519
485
                                        // for a version
520
 
                                        if( _content_lines != null )
521
 
                                                for( int i = 0; i < _content_lines.size(); i++ )
522
 
                                                        parseLine( _content_lines.get( i ) );
523
 
                                        _content_lines = null;
 
486
                                        if( _buffers != null )
 
487
                                                for( int i = 0; i < _buffers.size(); i++ )
 
488
                                                        parseLine( _buffers.get( i ), null,
 
489
                                                                i + 1 < _buffers.size() &&
 
490
                                                                _buffers.get( i + 1 ).hasRemaining() &&
 
491
                                                                _buffers.get( i + 1 ).get(
 
492
                                                                        _buffers.get( i + 1 ).position() ) == ' ' );
 
493
                                        _buffers = null;
524
494
                                }
525
495
                                else
526
496
                                {
527
497
                                        // no, so stash this line till we get a version
528
 
                                        if( _content_lines == null )
529
 
                                                _content_lines = new Vector< ContentLine >();
530
 
                                        _content_lines.add( content_line );
 
498
                                        if( _buffers == null )
 
499
                                                _buffers = new Vector< ByteBuffer >();
 
500
                                        _buffers.add( buffer );
531
501
                                }
532
502
                        }
533
503
                        else
534
504
                        {
535
505
                                // name and params and the position in the buffer where the
536
 
                                // "value" part of the line starts
 
506
                                // "value" part of the line start
537
507
                                String name_and_params;
538
508
                                int pos;
539
509
 
545
515
 
546
516
                                        // skip some initial line characters, depending on the type
547
517
                                        // of multi-line we're handling
548
 
                                        pos = content_line.getBuffer().position();
 
518
                                        pos = buffer.position();
549
519
                                        switch( _parser_multiline_state )
550
520
                                        {
551
521
                                        case MULTILINE_FOLDED:
552
522
                                                pos++;
553
523
                                                break;
554
524
                                        case MULTILINE_ENCODED:
555
 
                                                while( pos < content_line.getBuffer().limit() && (
556
 
                                                        content_line.getBuffer().get( pos ) == ' ' ||
557
 
                                                        content_line.getBuffer().get( pos ) == '\t' ) )
 
525
                                                while( pos < buffer.limit() && (
 
526
                                                        buffer.get( pos ) == ' ' ||
 
527
                                                        buffer.get( pos ) == '\t' ) )
558
528
                                                {
559
529
                                                        pos++;
560
530
                                                }
569
539
                                }
570
540
                                else
571
541
                                {
572
 
                                        // skip empty lines
573
 
                                        if( content_line.getUsAsciiLine().trim().length() == 0 )
574
 
                                                return;
575
 
 
576
542
                                        // get name and params from line, and since we're not
577
543
                                        // parsing a subsequent line in a multi-line, this should
578
544
                                        // not fail, or it's an error
579
545
                                        name_and_params =
580
 
                                                extractNameAndParamsFromLine( content_line );
 
546
                                                extractNameAndParamsFromLine( buffer, line );
581
547
                                        if( name_and_params == null )
582
548
                                                throw new ParseException(
583
549
                                                        R.string.error_vcf_malformed );
584
550
 
585
551
                                        // calculate how many chars to skip from beginning of line
586
552
                                        // so we skip the property "name:" part
587
 
                                        pos = content_line.getBuffer().position() +
588
 
                                                name_and_params.length() + 1;
 
553
                                        pos = buffer.position() + name_and_params.length() + 1;
589
554
 
590
555
                                        // reset the saved multi-line state
591
556
                                        _parser_current_name_and_params = name_and_params;
594
559
 
595
560
                                // get value from buffer, as raw bytes
596
561
                                ByteBuffer value;
597
 
                                value = ByteBuffer.wrap( content_line.getBuffer().array(), pos,
598
 
                                        content_line.getBuffer().limit() - pos );
 
562
                                value = ByteBuffer.wrap( buffer.array(), pos,
 
563
                                        buffer.limit() - pos );
599
564
 
600
565
                                // get parameter parts
601
566
                                String[] name_param_parts = name_and_params.split( ";", -1 );
608
573
                                                "FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR", "LABEL" }
609
574
                                ) );
610
575
                                boolean is_interesting_field =
611
 
                                        interesting_fields.contains(
612
 
                                                name_param_parts[ 0 ].toUpperCase( Locale.US ) );
 
576
                                        interesting_fields.contains( name_param_parts[ 0 ] );
613
577
 
614
578
                                // parse encoding parameter
615
579
                                String encoding = checkParam( name_param_parts, "ENCODING" );
616
580
                                if( encoding != null )
617
581
                                        encoding = encoding.toUpperCase( Locale.US );
618
582
                                if( is_interesting_field && encoding != null &&
619
 
                                        !encoding.equalsIgnoreCase( "8BIT" ) &&
620
 
                                        !encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
621
 
                                        //&& !encoding.equalsIgnoreCase( "BASE64" ) )
 
583
                                        !encoding.equals( "8BIT" ) &&
 
584
                                        !encoding.equals( "QUOTED-PRINTABLE" ) )
 
585
                                        //&& !encoding.equals( "BASE64" ) )
622
586
                                {
623
587
                                        throw new ParseException( R.string.error_vcf_encoding );
624
588
                                }
628
592
                                if( charset != null )
629
593
                                        charset = charset.toUpperCase( Locale.US );
630
594
                                if( charset != null &&
631
 
                                        !charset.equalsIgnoreCase( "US-ASCII" ) &&
632
 
                                        !charset.equalsIgnoreCase( "ASCII" ) &&
633
 
                                        !charset.equalsIgnoreCase( "UTF-8" ) )
 
595
                                        !charset.equals( "US-ASCII" ) &&
 
596
                                        !charset.equals( "ASCII" ) &&
 
597
                                        !charset.equals( "UTF-8" ) )
634
598
                                {
635
599
                                        throw new ParseException( R.string.error_vcf_charset );
636
600
                                }
638
602
                                // do unencoding (or default to a fake unencoding result with
639
603
                                // the raw string)
640
604
                                UnencodeResult unencoding_result = null;
641
 
                                if( encoding != null &&
642
 
                                        encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
643
 
                                {
 
605
                                if( encoding != null && encoding.equals( "QUOTED-PRINTABLE" ) )
644
606
                                        unencoding_result = unencodeQuotedPrintable( value );
645
 
                                }
646
 
//                              else if( encoding != null &&
647
 
//                                      encoding.equalsIgnoreCase( "BASE64" ) )
648
 
//                              {
 
607
//                              else if( encoding != null && encoding.equals( "BASE64" ) )
649
608
//                                      unencoding_result = unencodeBase64( props[ 1 ], charset );
650
 
//                              }
651
609
                                if( unencoding_result != null ) {
652
610
                                        value = unencoding_result.getBuffer();
653
611
                                        if( unencoding_result.isAnotherLineRequired() )
658
616
                                // specified for a v2.1 vcard entry, we assume it's US-ASCII)
659
617
                                if( ( charset == null && _version.equals( "2.1" ) ) ||
660
618
                                        ( charset != null && (
661
 
                                                charset.equalsIgnoreCase( "ASCII" ) ||
662
 
                                                charset.equalsIgnoreCase( "US-ASCII" ) ) ) )
 
619
                                                charset.equals( "ASCII" ) ||
 
620
                                                charset.equals( "US-ASCII" ) ) ) )
663
621
                                {
664
622
                                        value = transcodeAsciiToUtf8( value );
665
623
                                }
676
634
                                // for some entries that have semicolon-separated value parts,
677
635
                                // check to see if the value ends in an escape character, which
678
636
                                // indicates that we have a multi-line value
679
 
                                if( ( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) ||
680
 
                                        name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) ||
681
 
                                        name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) ) &&
 
637
                                if( ( name_param_parts[ 0 ].equals( "N" ) ||
 
638
                                        name_param_parts[ 0 ].equals( "ORG" ) ||
 
639
                                        name_param_parts[ 0 ].equals( "ADR" ) ) &&
682
640
                                        doesStringEndInAnEscapeChar( string_value ) )
683
641
                                {
684
642
                                        _parser_multiline_state = MULTILINE_ESCAPED;
686
644
                                                string_value.length() - 1 );
687
645
                                }
688
646
 
689
 
                                // if we know we're not in an encoding-based multi-line, check
690
 
                                // to see if we're in a folded multi-line
 
647
                                // now we know whether we're in an encoding multi-line,
 
648
                                // determine if we're in a v3 folded multi-line or not
691
649
                                if( _parser_multiline_state == MULTILINE_NONE &&
692
 
                                        content_line.doesNextLineLookFolded() )
 
650
                                        _version.equals( "3.0" ) && next_line_looks_folded )
693
651
                                {
694
652
                                        _parser_multiline_state = MULTILINE_FOLDED;
695
653
                                }
707
665
                                if( complete_value.length() < 1 ) return;
708
666
 
709
667
                                // parse some properties
710
 
                                if( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) )
 
668
                                if( name_param_parts[ 0 ].equals( "N" ) )
711
669
                                        parseN( name_param_parts, complete_value );
712
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "FN" ) )
 
670
                                else if( name_param_parts[ 0 ].equals( "FN" ) )
713
671
                                        parseFN( name_param_parts, complete_value );
714
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) )
 
672
                                else if( name_param_parts[ 0 ].equals( "ORG" ) )
715
673
                                        parseORG( name_param_parts, complete_value );
716
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TITLE" ) )
 
674
                                else if( name_param_parts[ 0 ].equals( "TITLE" ) )
717
675
                                        parseTITLE( name_param_parts, complete_value );
718
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TEL" ) )
 
676
                                else if( name_param_parts[ 0 ].equals( "TEL" ) )
719
677
                                        parseTEL( name_param_parts, complete_value );
720
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "EMAIL" ) )
 
678
                                else if( name_param_parts[ 0 ].equals( "EMAIL" ) )
721
679
                                        parseEMAIL( name_param_parts, complete_value );
722
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) )
 
680
                                else if( name_param_parts[ 0 ].equals( "ADR" ) )
723
681
                                        parseADR( name_param_parts, complete_value );
724
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "LABEL" ) )
 
682
                                else if( name_param_parts[ 0 ].equals( "LABEL" ) )
725
683
                                        parseLABEL( name_param_parts, complete_value );
726
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )
727
 
                                        parseNOTE( name_param_parts, complete_value );
728
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "BDAY" ) )
729
 
                                        parseBDAY( name_param_parts, complete_value );
730
684
                        }
731
685
                }
732
686
 
756
710
                        {
757
711
                                String str = parts.get( a );
758
712
 
759
 
                                // Look for parts that end in an escape character, but ignore
760
 
                                // the final part.  We've already detected escape chars at the
 
713
                                // look for parts that end in an escape character, but ignore
 
714
                                // the final part. We've already detected escape chars at the
761
715
                                // end of the final part in parseLine() and handled multi-lines
762
716
                                // accordingly.
763
717
                                if( a < parts.size() - 1 &&
804
758
                                in_escape = false;
805
759
                                switch( c )
806
760
                                {
807
 
                                case 'T':
808
 
                                case 't':
809
 
                                        // add tab (invalid/non-standard, but accepted)
810
 
                                        ret.append( '\t' );
811
 
                                        break;
812
761
                                case 'N':
813
762
                                case 'n':
814
763
                                        // add newline
822
771
                                        break;
823
772
                                default:
824
773
                                        // unknown escape sequence, so add it unescaped
825
 
                                        // (invalid/non-standard, but accepted)
826
774
                                        ret.append( "\\" );
827
775
                                        ret.append( Character.toChars( c ) );
828
776
                                        break;
853
801
                                        for( int b = 0; b < name_part_parts.length; b++ )
854
802
                                                if( name_part_parts[ b ].length() > 0 )
855
803
                                                {
856
 
                                                        if( value.length() > 0 ) value += " ";
 
804
                                                        if( value.length() == 0 ) value += " ";
857
805
                                                        value += name_part_parts[ b ];
858
806
                                                }
859
807
                                }
978
926
                        for( int a = 0; a < adr_parts.length; a++ )
979
927
                                if( adr_parts[ a ].length() > 0 )
980
928
                                {
981
 
                                        // version 3.0 vCards allow further splitting by comma
982
 
                                        if( _version.equals( "3.0" ) )
983
 
                                        {
984
 
                                                // split this part in to it's comma-separated bits and
985
 
                                                // add them on individual lines
986
 
                                                String[] adr_part_parts =
987
 
                                                        splitValueByCharacter( adr_parts[ a ], ',' );
988
 
                                                for( int b = 0; b < adr_part_parts.length; b++ )
989
 
                                                        if( adr_part_parts[ b ].length() > 0 )
990
 
                                                        {
991
 
                                                                if( value.length() > 0 ) value += "\n";
992
 
                                                                value += adr_part_parts[ b ];
993
 
                                                        }
994
 
                                        }
995
 
                                        else
996
 
                                        {
997
 
                                                // add this part on an individual line
998
 
                                                if( value.length() > 0 ) value += "\n";
999
 
                                                value += adr_parts[ a ];
1000
 
                                        }
 
929
                                        // split this part in to it's comma-separated bits
 
930
                                        String[] adr_part_parts =
 
931
                                                splitValueByCharacter( adr_parts[ a ], ',' );
 
932
                                        for( int b = 0; b < adr_part_parts.length; b++ )
 
933
                                                if( adr_part_parts[ b ].length() > 0 )
 
934
                                                {
 
935
                                                        if( value.length() > 0 ) value += "\n";
 
936
                                                        value += adr_part_parts[ b ];
 
937
                                                }
1001
938
                                }
1002
939
 
1003
940
                        Set< String > types = extractTypes( params, Arrays.asList(
1028
965
                        addAddress( unescapeValue( value ), type );
1029
966
                }
1030
967
 
1031
 
                private void parseNOTE( String[] params, String value )
1032
 
                {
1033
 
                        addNote( unescapeValue( value ) );
1034
 
                }
1035
 
 
1036
 
                private void parseBDAY( String[] params, String value )
1037
 
                {
1038
 
                        setBirthday( value );
1039
 
                }
1040
 
 
1041
968
                public void finaliseVcard()
1042
969
                        throws ParseException, ContactNotIdentifiableException
1043
970
                {
1044
971
                        // missing version (and data is present)
1045
 
                        if( _version == null && _content_lines != null )
 
972
                        if( _version == null && _buffers != null )
1046
973
                                throw new ParseException( R.string.error_vcf_malformed );
1047
974
 
1048
975
                        // finalise the parent class
1051
978
 
1052
979
                /**
1053
980
                 * Amongst the params, find the value of the first, only, of any with
1054
 
                 * the specified name.
1055
 
                 *
 
981
                 * the specified name
1056
982
                 * @param params
1057
983
                 * @param name
1058
984
                 * @return a value, or null
1064
990
                }
1065
991
 
1066
992
                /**
1067
 
                 * Amongst the params, find the values of any with the specified name.
1068
 
                 *
 
993
                 * Amongst the params, find the values of any with the specified name
1069
994
                 * @param params
1070
995
                 * @param name
1071
996
                 * @return an array of values, or null
1075
1000
                        HashSet< String > ret = new HashSet< String >();
1076
1001
 
1077
1002
                        Pattern p = Pattern.compile(
1078
 
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$",
1079
 
                                Pattern.CASE_INSENSITIVE );
 
1003
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$" );
1080
1004
                        for( int i = 0; i < params.length; i++ ) {
1081
1005
                                Matcher m = p.matcher( params[ i ] );
1082
1006
                                if( m.matches() )
1087
1011
                }
1088
1012
 
1089
1013
                /**
1090
 
                 * Amongst the params, return any type values present.  For v2.1 vCards,
1091
 
                 * those types are just parameters.  For v3.0, they are prefixed with
1092
 
                 * "TYPE=".  There may also be multiple type parameters.
1093
 
                 *
1094
 
                 * @param params an array of params to look for types in
1095
 
                 * @param valid_types an list of upper-case type values to look for
 
1014
                 * Amongst the params, return any type values present. For v2.1 vCards,
 
1015
                 * those types are just parameters. For v3.0, they are prefixed with
 
1016
                 * "TYPE=". There may also be multiple type parameters.
 
1017
                 * @param params
 
1018
                 * @param a list of type values to look for
1096
1019
                 * @return a set of present type values
1097
1020
                 */
1098
1021
                private Set< String > extractTypes( String[] params,
1104
1027
                        String type_params[] = checkParams( params, "TYPE" );
1105
1028
                        for( int a = 0; a < type_params.length; a++ )
1106
1029
                        {
1107
 
                                // check for a comma-separated list of types (why? I don't think
1108
 
                                // this is in the specs!)
 
1030
                                // check for a comma-separated list of types (why? this isn't in
 
1031
                                // the specs!)
1109
1032
                                String[] parts = type_params[ a ].split( "," );
1110
 
                                for( int i = 0; i < parts.length; i++ ) {
1111
 
                                        String ucpart = parts[ i ].toUpperCase( Locale.US );
1112
 
                                        if( valid_types.contains( ucpart ) )
1113
 
                                                types.add( ucpart );
1114
 
                                }
 
1033
                                for( int i = 0; i < parts.length; i++ )
 
1034
                                        if( valid_types.contains( parts[ i ] ) )
 
1035
                                                types.add( parts[ i ] );
1115
1036
                        }
1116
1037
 
1117
1038
                        // get 2.1-style type param
1118
1039
                        if( _version.equals( "2.1" ) ) {
1119
 
                                for( int i = 1; i < params.length; i++ ) {
1120
 
                                        String ucparam = params[ i ].toUpperCase( Locale.US );
1121
 
                                        if( valid_types.contains( ucparam ) )
1122
 
                                                types.add( ucparam );
1123
 
                                }
 
1040
                                for( int i = 1; i < params.length; i++ )
 
1041
                                        if( valid_types.contains( params[ i ] ) )
 
1042
                                                types.add( params[ i ] );
1124
1043
                        }
1125
1044
 
1126
1045
                        return types;
1148
1067
                                else if( ch == '=' && i == in.limit() - 1 )
1149
1068
                                {
1150
1069
                                        // we found a '=' at the end of a line signifying a multi-
1151
 
                                        // line string, so we don't add it
 
1070
                                        // line string, so we don't add it.
1152
1071
                                        another = true;
1153
1072
                                        continue;
1154
1073
                                }