/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/org/waxworlds/edam/importcontacts/VcardImporter.java

  • Committer: edam
  • Date: 2011-05-30 19:20:17 UTC
  • Revision ID: edam@waxworlds.org-20110530192017-5c09k4kgpov02gja
- added checks for Doit.this == null when handling dialog buttons (I managed to abort an import as a duplicate contacts dialog was shown, but can't reproduce it now)
- added line no.s to vcard parsing errors
- update progress bar after a contact is imported, not before
- fixed bug introduced in last commit where a contacts were imported after finaliseVcard()ing failed
- don't show unknown encoding errors for vcard fields that we don't care about (which ignores base64 encoded photos, for example)

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 <edam@waxworlds.org>
5
5
 *
6
6
 * This file is part of the Import Contacts program (hereafter referred
7
 
 * to as "this program").  For more information, see
8
 
 * http://ed.am/dev/android/import-contacts
 
7
 * to as "this program"). For more information, see
 
8
 * http://www.waxworlds.org/edam/software/android/import-contacts
9
9
 *
10
10
 * This program is free software: you can redistribute it and/or modify
11
11
 * it under the terms of the GNU General Public License as published by
21
21
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
22
 */
23
23
 
24
 
package am.ed.importcontacts;
 
24
package org.waxworlds.edam.importcontacts;
25
25
 
26
26
import java.io.BufferedReader;
27
27
import java.io.File;
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()
410
362
        private class Vcard extends ContactData
411
363
        {
412
364
                private final static int NAMELEVEL_NONE = 0;
413
 
                private final static int NAMELEVEL_N = 1;
414
 
                private final static int NAMELEVEL_FN = 2;
 
365
                private final static int NAMELEVEL_FN = 1;
 
366
                private final static int NAMELEVEL_N = 2;
415
367
 
416
368
                private final static int MULTILINE_NONE = 0;
417
369
                private final static int MULTILINE_ENCODED = 1; // v2.1 quoted-printable
418
370
                private final static int MULTILINE_ESCAPED = 2; // v2.1 \\CRLF
419
 
                private final static int MULTILINE_FOLDED = 3;  // MIME-DIR folding
 
371
                private final static int MULTILINE_FOLDED = 3;  // v3.0 folding
420
372
 
421
373
                private String _version = null;
422
 
                private Vector< ContentLine > _content_lines = null;
 
374
                private Vector< ByteBuffer > _buffers = null;
423
375
                private int _name_level = NAMELEVEL_NONE;
424
376
                private int _parser_multiline_state = MULTILINE_NONE;
425
377
                private String _parser_current_name_and_params = null;
468
420
                @SuppressWarnings("serial")
469
421
                protected class SkipImportException extends Exception { }
470
422
 
471
 
                private String extractCollonPartFromLine( ContentLine content_line,
472
 
                        boolean former )
 
423
                private String extractCollonPartFromLine( ByteBuffer buffer,
 
424
                        String line, boolean former )
473
425
                {
474
426
                        String ret = null;
475
427
 
 
428
                        // get a US-ASCII version of the line for processing, unless we were
 
429
                        // supplied with one
 
430
                        if( line == null ) {
 
431
                                try {
 
432
                                        line = new String( buffer.array(), buffer.position(),
 
433
                                                buffer.limit() - buffer.position(), "US-ASCII" );
 
434
                                }
 
435
                                catch( UnsupportedEncodingException e ) {
 
436
                                        // we know US-ASCII is supported, so appease the compiler...
 
437
                                        line = "";
 
438
                                }
 
439
                        }
 
440
 
476
441
                        // split line into name and value parts and check to make sure we
477
442
                        // only got 2 parts and that the first part is not zero in length
478
 
                        String[] parts = content_line.getUsAsciiLine().split( ":", 2 );
 
443
                        String[] parts = line.split( ":", 2 );
479
444
                        if( parts.length == 2 && parts[ 0 ].length() > 0 )
480
445
                                ret = parts[ former? 0 : 1 ];
481
446
 
482
447
                        return ret;
483
448
                }
484
449
 
485
 
                private String extractNameAndParamsFromLine( ContentLine content_line )
486
 
                {
487
 
                        return extractCollonPartFromLine( content_line, true ).trim();
488
 
                }
489
 
 
490
 
                private String extractValueFromLine( ContentLine content_line )
491
 
                {
492
 
                        return extractCollonPartFromLine( content_line, false );
493
 
                }
494
 
 
495
 
                public void parseLine( ContentLine content_line )
 
450
                private String extractNameAndParamsFromLine( ByteBuffer buffer,
 
451
                        String line )
 
452
                {
 
453
                        return extractCollonPartFromLine( buffer, line, true );
 
454
                }
 
455
 
 
456
                private String extractValueFromLine( ByteBuffer buffer, String line )
 
457
                {
 
458
                        return extractCollonPartFromLine( buffer, line, false );
 
459
                }
 
460
 
 
461
                public void parseLine( ByteBuffer buffer, String line,
 
462
                        boolean next_line_looks_folded )
496
463
                        throws ParseException, SkipImportException,
497
464
                        AbortImportException
498
465
                {
501
468
                        {
502
469
                                // tentatively get name and params from line
503
470
                                String name_and_params =
504
 
                                        extractNameAndParamsFromLine( content_line );
 
471
                                        extractNameAndParamsFromLine( buffer, line );
505
472
 
506
473
                                // is it a version line?
507
474
                                if( name_and_params != null &&
508
 
                                        name_and_params.equalsIgnoreCase( "VERSION" ) )
 
475
                                        name_and_params.equals( "VERSION" ) )
509
476
                                {
510
477
                                        // yes, get it!
511
 
                                        String value = extractValueFromLine( content_line ).trim();
 
478
                                        String value = extractValueFromLine( buffer, line );
512
479
                                        if( !value.equals( "2.1" ) && !value.equals( "3.0" ) )
513
480
                                                throw new ParseException( R.string.error_vcf_version );
514
481
                                        _version = value;
515
482
 
516
483
                                        // parse any buffers we've been accumulating while we waited
517
484
                                        // for a version
518
 
                                        if( _content_lines != null )
519
 
                                                for( int i = 0; i < _content_lines.size(); i++ )
520
 
                                                        parseLine( _content_lines.get( i ) );
521
 
                                        _content_lines = null;
 
485
                                        if( _buffers != null )
 
486
                                                for( int i = 0; i < _buffers.size(); i++ )
 
487
                                                        parseLine( _buffers.get( i ), null,
 
488
                                                                i + 1 < _buffers.size() &&
 
489
                                                                _buffers.get( i + 1 ).hasRemaining() &&
 
490
                                                                _buffers.get( i + 1 ).get(
 
491
                                                                        _buffers.get( i + 1 ).position() ) == ' ' );
 
492
                                        _buffers = null;
522
493
                                }
523
494
                                else
524
495
                                {
525
496
                                        // no, so stash this line till we get a version
526
 
                                        if( _content_lines == null )
527
 
                                                _content_lines = new Vector< ContentLine >();
528
 
                                        _content_lines.add( content_line );
 
497
                                        if( _buffers == null )
 
498
                                                _buffers = new Vector< ByteBuffer >();
 
499
                                        _buffers.add( buffer );
529
500
                                }
530
501
                        }
531
502
                        else
532
503
                        {
533
504
                                // name and params and the position in the buffer where the
534
 
                                // "value" part of the line starts
 
505
                                // "value" part of the line start
535
506
                                String name_and_params;
536
507
                                int pos;
537
508
 
543
514
 
544
515
                                        // skip some initial line characters, depending on the type
545
516
                                        // of multi-line we're handling
546
 
                                        pos = content_line.getBuffer().position();
 
517
                                        pos = buffer.position();
547
518
                                        switch( _parser_multiline_state )
548
519
                                        {
549
520
                                        case MULTILINE_FOLDED:
550
521
                                                pos++;
551
522
                                                break;
552
523
                                        case MULTILINE_ENCODED:
553
 
                                                while( pos < content_line.getBuffer().limit() && (
554
 
                                                        content_line.getBuffer().get( pos ) == ' ' ||
555
 
                                                        content_line.getBuffer().get( pos ) == '\t' ) )
 
524
                                                while( pos < buffer.limit() && (
 
525
                                                        buffer.get( pos ) == ' ' ||
 
526
                                                        buffer.get( pos ) == '\t' ) )
556
527
                                                {
557
528
                                                        pos++;
558
529
                                                }
567
538
                                }
568
539
                                else
569
540
                                {
570
 
                                        // skip empty lines
571
 
                                        if( content_line.getUsAsciiLine().trim().length() == 0 )
572
 
                                                return;
573
 
 
574
541
                                        // get name and params from line, and since we're not
575
542
                                        // parsing a subsequent line in a multi-line, this should
576
543
                                        // not fail, or it's an error
577
544
                                        name_and_params =
578
 
                                                extractNameAndParamsFromLine( content_line );
 
545
                                                extractNameAndParamsFromLine( buffer, line );
579
546
                                        if( name_and_params == null )
580
547
                                                throw new ParseException(
581
548
                                                        R.string.error_vcf_malformed );
582
549
 
583
550
                                        // calculate how many chars to skip from beginning of line
584
551
                                        // so we skip the property "name:" part
585
 
                                        pos = content_line.getBuffer().position() +
586
 
                                                name_and_params.length() + 1;
 
552
                                        pos = buffer.position() + name_and_params.length() + 1;
587
553
 
588
554
                                        // reset the saved multi-line state
589
555
                                        _parser_current_name_and_params = name_and_params;
592
558
 
593
559
                                // get value from buffer, as raw bytes
594
560
                                ByteBuffer value;
595
 
                                value = ByteBuffer.wrap( content_line.getBuffer().array(), pos,
596
 
                                        content_line.getBuffer().limit() - pos );
 
561
                                value = ByteBuffer.wrap( buffer.array(), pos,
 
562
                                        buffer.limit() - pos );
597
563
 
598
564
                                // get parameter parts
599
565
                                String[] name_param_parts = name_and_params.split( ";", -1 );
602
568
 
603
569
                                // determine whether we care about this entry
604
570
                                final HashSet< String > interesting_fields =
605
 
                                        new HashSet< String >( Arrays.asList( new String[] { "N",
606
 
                                                "FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR", "LABEL" }
 
571
                                        new HashSet< String >( Arrays.asList( new String[]
 
572
                                                { "N", "FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR" }
607
573
                                ) );
608
574
                                boolean is_interesting_field =
609
 
                                        interesting_fields.contains(
610
 
                                                name_param_parts[ 0 ].toUpperCase( Locale.US ) );
 
575
                                        interesting_fields.contains( name_param_parts[ 0 ] );
611
576
 
612
577
                                // parse encoding parameter
613
578
                                String encoding = checkParam( name_param_parts, "ENCODING" );
614
 
                                if( encoding != null )
615
 
                                        encoding = encoding.toUpperCase( Locale.US );
 
579
                                if( encoding != null ) encoding = encoding.toUpperCase();
616
580
                                if( is_interesting_field && encoding != null &&
617
 
                                        !encoding.equalsIgnoreCase( "8BIT" ) &&
618
 
                                        !encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
619
 
                                        //&& !encoding.equalsIgnoreCase( "BASE64" ) )
 
581
                                        !encoding.equals( "8BIT" ) &&
 
582
                                        !encoding.equals( "QUOTED-PRINTABLE" ) )
 
583
                                        //&& !encoding.equals( "BASE64" ) )
620
584
                                {
621
585
                                        throw new ParseException( R.string.error_vcf_encoding );
622
586
                                }
623
587
 
624
588
                                // parse charset parameter
625
589
                                String charset = checkParam( name_param_parts, "CHARSET" );
626
 
                                if( charset != null )
627
 
                                        charset = charset.toUpperCase( Locale.US );
 
590
                                if( charset != null ) charset = charset.toUpperCase();
628
591
                                if( charset != null &&
629
 
                                        !charset.equalsIgnoreCase( "US-ASCII" ) &&
630
 
                                        !charset.equalsIgnoreCase( "ASCII" ) &&
631
 
                                        !charset.equalsIgnoreCase( "UTF-8" ) )
 
592
                                        !charset.equals( "US-ASCII" ) &&
 
593
                                        !charset.equals( "ASCII" ) &&
 
594
                                        !charset.equals( "UTF-8" ) )
632
595
                                {
633
596
                                        throw new ParseException( R.string.error_vcf_charset );
634
597
                                }
636
599
                                // do unencoding (or default to a fake unencoding result with
637
600
                                // the raw string)
638
601
                                UnencodeResult unencoding_result = null;
639
 
                                if( encoding != null &&
640
 
                                        encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
641
 
                                {
 
602
                                if( encoding != null && encoding.equals( "QUOTED-PRINTABLE" ) )
642
603
                                        unencoding_result = unencodeQuotedPrintable( value );
643
 
                                }
644
 
//                              else if( encoding != null &&
645
 
//                                      encoding.equalsIgnoreCase( "BASE64" ) )
646
 
//                              {
 
604
//                              else if( encoding != null && encoding.equals( "BASE64" ) )
647
605
//                                      unencoding_result = unencodeBase64( props[ 1 ], charset );
648
 
//                              }
649
606
                                if( unencoding_result != null ) {
650
607
                                        value = unencoding_result.getBuffer();
651
608
                                        if( unencoding_result.isAnotherLineRequired() )
652
609
                                                _parser_multiline_state = MULTILINE_ENCODED;
653
610
                                }
654
611
 
655
 
                                // convert 8-bit US-ASCII charset to UTF-8 (where no charset is
656
 
                                // specified for a v2.1 vcard entry, we assume it's US-ASCII)
657
 
                                if( ( charset == null && _version.equals( "2.1" ) ) ||
658
 
                                        ( charset != null && (
659
 
                                                charset.equalsIgnoreCase( "ASCII" ) ||
660
 
                                                charset.equalsIgnoreCase( "US-ASCII" ) ) ) )
661
 
                                {
 
612
                                // convert 8-bit ASCII charset to US-ASCII
 
613
                                if( charset == null || charset.equals( "ASCII" ) ) {
662
614
                                        value = transcodeAsciiToUtf8( value );
 
615
                                        charset = "UTF-8";
663
616
                                }
664
617
 
665
 
                                // process charset (value is now in UTF-8)
 
618
                                // process charset
666
619
                                String string_value;
667
620
                                try {
668
621
                                        string_value = new String( value.array(), value.position(),
669
 
                                                value.limit() - value.position(), "UTF-8" );
 
622
                                                value.limit() - value.position(), charset );
670
623
                                } catch( UnsupportedEncodingException e ) {
671
624
                                        throw new ParseException( R.string.error_vcf_charset );
672
625
                                }
674
627
                                // for some entries that have semicolon-separated value parts,
675
628
                                // check to see if the value ends in an escape character, which
676
629
                                // indicates that we have a multi-line value
677
 
                                if( ( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) ||
678
 
                                        name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) ||
679
 
                                        name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) ) &&
 
630
                                if( ( name_param_parts[ 0 ].equals( "N" ) ||
 
631
                                        name_param_parts[ 0 ].equals( "ORG" ) ||
 
632
                                        name_param_parts[ 0 ].equals( "ADR" ) ) &&
680
633
                                        doesStringEndInAnEscapeChar( string_value ) )
681
634
                                {
682
635
                                        _parser_multiline_state = MULTILINE_ESCAPED;
684
637
                                                string_value.length() - 1 );
685
638
                                }
686
639
 
687
 
                                // if we know we're not in an encoding-based multi-line, check
688
 
                                // to see if we're in a folded multi-line
 
640
                                // now we know whether we're in an encoding multi-line,
 
641
                                // determine if we're in a v3 folded multi-line or not
689
642
                                if( _parser_multiline_state == MULTILINE_NONE &&
690
 
                                        content_line.doesNextLineLookFolded() )
 
643
                                        _version.equals( "3.0" ) && next_line_looks_folded )
691
644
                                {
692
645
                                        _parser_multiline_state = MULTILINE_FOLDED;
693
646
                                }
705
658
                                if( complete_value.length() < 1 ) return;
706
659
 
707
660
                                // parse some properties
708
 
                                if( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) )
 
661
                                if( name_param_parts[ 0 ].equals( "N" ) )
709
662
                                        parseN( name_param_parts, complete_value );
710
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "FN" ) )
 
663
                                else if( name_param_parts[ 0 ].equals( "FN" ) )
711
664
                                        parseFN( name_param_parts, complete_value );
712
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) )
 
665
                                else if( name_param_parts[ 0 ].equals( "ORG" ) )
713
666
                                        parseORG( name_param_parts, complete_value );
714
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TITLE" ) )
 
667
                                else if( name_param_parts[ 0 ].equals( "TITLE" ) )
715
668
                                        parseTITLE( name_param_parts, complete_value );
716
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TEL" ) )
 
669
                                else if( name_param_parts[ 0 ].equals( "TEL" ) )
717
670
                                        parseTEL( name_param_parts, complete_value );
718
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "EMAIL" ) )
 
671
                                else if( name_param_parts[ 0 ].equals( "EMAIL" ) )
719
672
                                        parseEMAIL( name_param_parts, complete_value );
720
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) )
 
673
                                else if( name_param_parts[ 0 ].equals( "ADR" ) )
721
674
                                        parseADR( name_param_parts, complete_value );
722
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "LABEL" ) )
723
 
                                        parseLABEL( name_param_parts, complete_value );
724
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )
725
 
                                        parseNOTE( name_param_parts, complete_value );
726
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "BDAY" ) )
727
 
                                        parseBDAY( name_param_parts, complete_value );
728
675
                        }
729
676
                }
730
677
 
743
690
                        return ( count & 1 ) == 1;
744
691
                }
745
692
 
746
 
                private String[] splitValueByCharacter( String value, char character )
 
693
                private String[] splitValueBySemicolon( String value )
747
694
                {
748
 
                        // split string in to parts by specified character
 
695
                        // split string in to parts by semicolon
749
696
                        ArrayList< String > parts = new ArrayList< String >(
750
 
                                Arrays.asList( value.split( "" + character ) ) );
 
697
                                Arrays.asList( value.split(  ";" ) ) );
751
698
 
752
699
                        // go through parts
753
700
                        for( int a = 0; a < parts.size(); a++ )
754
701
                        {
755
702
                                String str = parts.get( a );
756
703
 
757
 
                                // Look for parts that end in an escape character, but ignore
758
 
                                // the final part.  We've already detected escape chars at the
 
704
                                // look for parts that end in an escape character, but ignore
 
705
                                // the final part. We've already detected escape chars at the
759
706
                                // end of the final part in parseLine() and handled multi-lines
760
707
                                // accordingly.
761
708
                                if( a < parts.size() - 1 &&
762
709
                                        doesStringEndInAnEscapeChar( str ) )
763
710
                                {
764
 
                                        // append the escaped character, join the next part to this
765
 
                                        // part and remove the next part
 
711
                                        // join the next part to this part and remove the next part
766
712
                                        parts.set( a, str.substring( 0, str.length() - 1 ) +
767
 
                                                character + parts.get( a + 1 ) );
 
713
                                                ';' + parts.get( a + 1 ) );
768
714
                                        parts.remove( a + 1 );
769
715
 
770
716
                                        // re-visit this part
781
727
                        return parts.toArray( ret );
782
728
                }
783
729
 
784
 
                private String unescapeValue( String value )
785
 
                {
786
 
                        StringBuilder ret = new StringBuilder( value.length() );
787
 
                        boolean in_escape = false;
788
 
                        for( int a = 0; a < value.length(); a++ )
789
 
                        {
790
 
                                int c = value.codePointAt( a );
791
 
 
792
 
                                // process a normal character
793
 
                                if( !in_escape ) {
794
 
                                        if( c == '\\' )
795
 
                                                in_escape = true;
796
 
                                        else
797
 
                                                ret.append( Character.toChars( c ) );
798
 
                                        continue;
799
 
                                }
800
 
 
801
 
                                // process an escape sequence
802
 
                                in_escape = false;
803
 
                                switch( c )
804
 
                                {
805
 
                                case 'T':
806
 
                                case 't':
807
 
                                        // add tab (invalid/non-standard, but accepted)
808
 
                                        ret.append( '\t' );
809
 
                                        break;
810
 
                                case 'N':
811
 
                                case 'n':
812
 
                                        // add newline
813
 
                                        ret.append( '\n' );
814
 
                                        break;
815
 
                                case '\\':
816
 
                                case ',':
817
 
                                case ';':
818
 
                                        // add escaped character
819
 
                                        ret.append( Character.toChars( c ) );
820
 
                                        break;
821
 
                                default:
822
 
                                        // unknown escape sequence, so add it unescaped
823
 
                                        // (invalid/non-standard, but accepted)
824
 
                                        ret.append( "\\" );
825
 
                                        ret.append( Character.toChars( c ) );
826
 
                                        break;
827
 
                                }
828
 
                        }
829
 
 
830
 
                        return ret.toString();
831
 
                }
832
 
 
833
730
                private void parseN( String[] params, String value )
834
731
                {
835
732
                        // already got a better name?
836
733
                        if( _name_level >= NAMELEVEL_N ) return;
837
734
 
838
735
                        // get name parts
839
 
                        String[] name_parts = splitValueByCharacter( value, ';' );
 
736
                        String[] name_parts = splitValueBySemicolon( value );
840
737
 
841
738
                        // build name
842
739
                        value = "";
843
 
                        final int[] part_order = { 3, 1, 2, 0, 4 };
844
 
                        for( int a = 0; a < part_order.length; a++ )
845
 
                                if( name_parts.length > part_order[ a ] &&
846
 
                                        name_parts[ part_order[ a ] ].length() > 0 )
847
 
                                {
848
 
                                        // split this part in to it's comma-separated bits
849
 
                                        String[] name_part_parts = splitValueByCharacter(
850
 
                                                name_parts[ part_order[ a ] ], ',' );
851
 
                                        for( int b = 0; b < name_part_parts.length; b++ )
852
 
                                                if( name_part_parts[ b ].length() > 0 )
853
 
                                                {
854
 
                                                        if( value.length() > 0 ) value += " ";
855
 
                                                        value += name_part_parts[ b ];
856
 
                                                }
857
 
                                }
 
740
                        if( name_parts.length > 1 && name_parts[ 1 ].length() > 0 )
 
741
                                value += name_parts[ 1 ];
 
742
                        if( name_parts.length > 0 && name_parts[ 0 ].length() > 0 )
 
743
                                value += ( value.length() == 0? "" : " " ) + name_parts[ 0 ];
858
744
 
859
745
                        // set name
860
 
                        setName( unescapeValue( value ) );
 
746
                        setName( value );
861
747
                        _name_level = NAMELEVEL_N;
862
748
                }
863
749
 
867
753
                        if( _name_level >= NAMELEVEL_FN ) return;
868
754
 
869
755
                        // set name
870
 
                        setName( unescapeValue( value ) );
 
756
                        setName( value );
871
757
                        _name_level = NAMELEVEL_FN;
872
758
                }
873
759
 
874
760
                private void parseORG( String[] params, String value )
875
761
                {
876
762
                        // get org parts
877
 
                        String[] org_parts = splitValueByCharacter( value, ';' );
 
763
                        String[] org_parts = splitValueBySemicolon( value );
878
764
                        if( org_parts == null || org_parts.length < 1 ) return;
879
765
 
880
766
                        // build organisation name
882
768
                                String.valueOf( org_parts[ 0 ] ) );
883
769
                        for( int a = 1; a < org_parts.length; a++ )
884
770
                                builder.append( ", " ).append( org_parts[ a ] );
885
 
                        String organisation = unescapeValue( builder.toString() );
 
771
                        String organisation = builder.toString();
886
772
 
887
773
                        // set organisation name (using a title we've previously found)
888
774
                        addOrganisation( organisation, _cached_title, true );
899
785
 
900
786
                private void parseTITLE( String[] params, String value )
901
787
                {
902
 
                        value = unescapeValue( value );
903
 
 
904
788
                        // if we previously had an organisation, look it up and append this
905
789
                        // title to it
906
790
                        if( _cached_organisation != null && hasOrganisations() ) {
932
816
                        int type;
933
817
                        if( types.contains( "FAX" ) )
934
818
                                if( types.contains( "HOME" ) )
935
 
                                        type = TYPE_FAX_HOME;
 
819
                                        type = PhonesColumns.TYPE_FAX_HOME;
936
820
                                else
937
 
                                        type = TYPE_FAX_WORK;
 
821
                                        type = PhonesColumns.TYPE_FAX_WORK;
938
822
                        else if( types.contains( "CELL" ) || types.contains( "VIDEO" ) )
939
 
                                type = TYPE_MOBILE;
 
823
                                type = PhonesColumns.TYPE_MOBILE;
940
824
                        else if( types.contains( "PAGER" ) )
941
 
                                type = TYPE_PAGER;
 
825
                                type = PhonesColumns.TYPE_PAGER;
942
826
                        else if( types.contains( "WORK" ) )
943
 
                                type = TYPE_WORK;
 
827
                                type = PhonesColumns.TYPE_WORK;
944
828
                        else
945
 
                                type = TYPE_HOME;
 
829
                                type = PhonesColumns.TYPE_HOME;
946
830
 
947
831
                        // add phone number
948
832
                        addNumber( value, type, is_preferred );
959
843
                        boolean is_preferred = types.contains( "PREF" );
960
844
                        int type;
961
845
                        if( types.contains( "WORK" ) )
962
 
                                type = TYPE_WORK;
 
846
                                type = Contacts.ContactMethods.TYPE_WORK;
963
847
                        else
964
 
                                type = TYPE_HOME;
 
848
                                type = Contacts.ContactMethods.TYPE_HOME;
965
849
 
966
 
                        addEmail( unescapeValue( value ), type, is_preferred );
 
850
                        addEmail( value, type, is_preferred );
967
851
                }
968
852
 
969
853
                private void parseADR( String[] params, String value )
970
854
                {
971
855
                        // get address parts
972
 
                        String[] adr_parts = splitValueByCharacter( value, ';' );
 
856
                        String[] adr_parts = splitValueBySemicolon( value );
973
857
 
974
858
                        // build address
975
859
                        value = "";
976
 
                        for( int a = 0; a < adr_parts.length; a++ )
977
 
                                if( adr_parts[ a ].length() > 0 )
978
 
                                {
979
 
                                        // version 3.0 vCards allow further splitting by comma
980
 
                                        if( _version.equals( "3.0" ) )
981
 
                                        {
982
 
                                                // split this part in to it's comma-separated bits and
983
 
                                                // add them on individual lines
984
 
                                                String[] adr_part_parts =
985
 
                                                        splitValueByCharacter( adr_parts[ a ], ',' );
986
 
                                                for( int b = 0; b < adr_part_parts.length; b++ )
987
 
                                                        if( adr_part_parts[ b ].length() > 0 )
988
 
                                                        {
989
 
                                                                if( value.length() > 0 ) value += "\n";
990
 
                                                                value += adr_part_parts[ b ];
991
 
                                                        }
992
 
                                        }
993
 
                                        else
994
 
                                        {
995
 
                                                // add this part on an individual line
996
 
                                                if( value.length() > 0 ) value += "\n";
997
 
                                                value += adr_parts[ a ];
998
 
                                        }
999
 
                                }
1000
 
 
1001
 
                        Set< String > types = extractTypes( params, Arrays.asList(
1002
 
                                "PREF", "WORK", "HOME" ) );
1003
 
 
1004
 
                        // add address
1005
 
                        int type;
1006
 
                        if( types.contains( "WORK" ) )
1007
 
                                type = TYPE_WORK;
1008
 
                        else
1009
 
                                type = TYPE_HOME;
1010
 
 
1011
 
                        addAddress( unescapeValue( value ), type );
1012
 
                }
1013
 
 
1014
 
                private void parseLABEL( String[] params, String value )
1015
 
                {
1016
 
                        Set< String > types = extractTypes( params, Arrays.asList(
1017
 
                                "PREF", "WORK", "HOME" ) );
1018
 
 
1019
 
                        // add address
1020
 
                        int type;
1021
 
                        if( types.contains( "WORK" ) )
1022
 
                                type = TYPE_WORK;
1023
 
                        else
1024
 
                                type = TYPE_HOME;
1025
 
 
1026
 
                        addAddress( unescapeValue( value ), type );
1027
 
                }
1028
 
 
1029
 
                private void parseNOTE( String[] params, String value )
1030
 
                {
1031
 
                        addNote( unescapeValue( value ) );
1032
 
                }
1033
 
 
1034
 
                private void parseBDAY( String[] params, String value )
1035
 
                {
1036
 
                        setBirthday( value );
 
860
                        for( int a = 0; a < adr_parts.length; a++ ) {
 
861
                                if( value.length() > 0 ) value += "\n";
 
862
                                value += adr_parts[ a ].trim();
 
863
                        }
 
864
 
 
865
                        Set< String > types = extractTypes( params, Arrays.asList(
 
866
                                "PREF", "WORK", "HOME", "INTERNET" ) );
 
867
 
 
868
                        // add address
 
869
                        int type;
 
870
                        if( types.contains( "WORK" ) )
 
871
                                type = Contacts.ContactMethods.TYPE_WORK;
 
872
                        else
 
873
                                type = Contacts.ContactMethods.TYPE_HOME;
 
874
 
 
875
                        addAddress( value, type );
1037
876
                }
1038
877
 
1039
878
                public void finaliseVcard()
1040
879
                        throws ParseException, ContactNotIdentifiableException
1041
880
                {
1042
881
                        // missing version (and data is present)
1043
 
                        if( _version == null && _content_lines != null )
 
882
                        if( _version == null && _buffers != null )
1044
883
                                throw new ParseException( R.string.error_vcf_malformed );
1045
884
 
1046
885
                        // finalise the parent class
1047
886
                        finalise();
1048
887
                }
1049
888
 
1050
 
                /**
1051
 
                 * Amongst the params, find the value of the first, only, of any with
1052
 
                 * the specified name.
1053
 
                 *
1054
 
                 * @param params
1055
 
                 * @param name
1056
 
                 * @return a value, or null
1057
 
                 */
1058
889
                private String checkParam( String[] params, String name )
1059
890
                {
1060
 
                        String[] res = checkParams( params, name );
1061
 
                        return res.length > 0? res[ 0 ] : null;
1062
 
                }
1063
 
 
1064
 
                /**
1065
 
                 * Amongst the params, find the values of any with the specified name.
1066
 
                 *
1067
 
                 * @param params
1068
 
                 * @param name
1069
 
                 * @return an array of values, or null
1070
 
                 */
1071
 
                private String[] checkParams( String[] params, String name )
1072
 
                {
1073
 
                        HashSet< String > ret = new HashSet< String >();
1074
 
 
1075
891
                        Pattern p = Pattern.compile(
1076
 
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$",
1077
 
                                Pattern.CASE_INSENSITIVE );
 
892
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$" );
1078
893
                        for( int i = 0; i < params.length; i++ ) {
1079
894
                                Matcher m = p.matcher( params[ i ] );
1080
895
                                if( m.matches() )
1081
 
                                        ret.add( m.group( 2 ) );
 
896
                                        return m.group( 2 );
1082
897
                        }
1083
 
 
1084
 
                        return (String[]) ret.toArray( new String[ ret.size() ] );
 
898
                        return null;
1085
899
                }
1086
900
 
1087
 
                /**
1088
 
                 * Amongst the params, return any type values present.  For v2.1 vCards,
1089
 
                 * those types are just parameters.  For v3.0, they are prefixed with
1090
 
                 * "TYPE=".  There may also be multiple type parameters.
1091
 
                 *
1092
 
                 * @param params an array of params to look for types in
1093
 
                 * @param valid_types an list of upper-case type values to look for
1094
 
                 * @return a set of present type values
1095
 
                 */
1096
901
                private Set< String > extractTypes( String[] params,
1097
902
                        List< String > valid_types )
1098
903
                {
1099
904
                        HashSet< String > types = new HashSet< String >();
1100
905
 
1101
906
                        // get 3.0-style TYPE= param
1102
 
                        String type_params[] = checkParams( params, "TYPE" );
1103
 
                        for( int a = 0; a < type_params.length; a++ )
1104
 
                        {
1105
 
                                // check for a comma-separated list of types (why? I don't think
1106
 
                                // this is in the specs!)
1107
 
                                String[] parts = type_params[ a ].split( "," );
1108
 
                                for( int i = 0; i < parts.length; i++ ) {
1109
 
                                        String ucpart = parts[ i ].toUpperCase( Locale.US );
1110
 
                                        if( valid_types.contains( ucpart ) )
1111
 
                                                types.add( ucpart );
1112
 
                                }
 
907
                        String type_param;
 
908
                        if( ( type_param = checkParam( params, "TYPE" ) ) != null ) {
 
909
                                String[] parts = type_param.split( "," );
 
910
                                for( int i = 0; i < parts.length; i++ )
 
911
                                        if( valid_types.contains( parts[ i ] ) )
 
912
                                                types.add( parts[ i ] );
1113
913
                        }
1114
914
 
1115
915
                        // get 2.1-style type param
1116
916
                        if( _version.equals( "2.1" ) ) {
1117
 
                                for( int i = 1; i < params.length; i++ ) {
1118
 
                                        String ucparam = params[ i ].toUpperCase( Locale.US );
1119
 
                                        if( valid_types.contains( ucparam ) )
1120
 
                                                types.add( ucparam );
1121
 
                                }
 
917
                                for( int i = 1; i < params.length; i++ )
 
918
                                        if( valid_types.contains( params[ i ] ) )
 
919
                                                types.add( params[ i ] );
1122
920
                        }
1123
921
 
1124
922
                        return types;
1146
944
                                else if( ch == '=' && i == in.limit() - 1 )
1147
945
                                {
1148
946
                                        // we found a '=' at the end of a line signifying a multi-
1149
 
                                        // line string, so we don't add it
 
947
                                        // line string, so we don't add it.
1150
948
                                        another = true;
1151
949
                                        continue;
1152
950
                                }