/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/VCFImporter.java

  • Committer: edam
  • Date: 2011-03-13 18:58:52 UTC
  • Revision ID: edam@waxworlds.org-20110313185852-s74kvkbv8k0v0lwc
- accept parameters that are quoted (this doesn't appear to be part of the standards AFAICT, but Evolution apparently quotes parameter values)

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/edam/importcontacts/VCFImporter.java
350
350
                        }
351
351
 
352
352
                        // ignore empty lines
353
 
                        if( line.trim() == "" ) return;
 
353
                        if( line.trim().equals( "" ) ) return;
354
354
 
355
355
                        // split line into name and value parts (this may turn out to be
356
356
                        // unwanted if the line is a subsequent line in a multi-line
362
362
                        // malformed property:name pairs.
363
363
                        String name_and_params, string_value;
364
364
                        {
365
 
                                String[] bits = line.split(  ":", 2 );
366
 
                                if( bits.length == 2 ) {
367
 
                                        name_and_params = bits[ 0 ].trim();
368
 
                                        string_value = bits[ 1 ].trim();
 
365
                                String[] parts = line.split( ":", 2 );
 
366
                                if( parts.length == 2 ) {
 
367
                                        name_and_params = parts[ 0 ].trim();
 
368
                                        string_value = parts[ 1 ].trim();
369
369
                                        if( name_and_params.length() == 0 )
370
370
                                                throw new ParseException( R.string.error_vcf_malformed );
371
371
                                }
431
431
                                }
432
432
                                else
433
433
                                {
434
 
                                        // ignore empty values
435
 
                                        if( string_value.length() < 1 ) return;
436
 
 
437
434
                                        // calculate how many chars to skip from beginning of line
438
435
                                        // so we skip the property "name:" part
439
436
                                        int pos = buffer.position() + name_and_params.length() + 1;
448
445
                                }
449
446
 
450
447
                                // get parameter parts
451
 
                                String[] name_and_param_bits = name_and_params.split( ";" );
452
 
                                for( int i = 0; i < name_and_param_bits.length; i++ )
453
 
                                        name_and_param_bits[ i ] = name_and_param_bits[ i ].trim();
 
448
                                String[] name_param_parts = name_and_params.split( ";", -1 );
 
449
                                for( int i = 0; i < name_param_parts.length; i++ )
 
450
                                        name_param_parts[ i ] = name_param_parts[ i ].trim();
454
451
 
455
452
                                // parse encoding parameter
456
 
                                String encoding = checkParam( name_and_param_bits, "ENCODING" );
 
453
                                String encoding = checkParam( name_param_parts, "ENCODING" );
457
454
                                if( encoding != null ) encoding = encoding.toUpperCase();
458
455
                                if( encoding != null && !encoding.equals( "8BIT" ) &&
459
456
                                        !encoding.equals( "QUOTED-PRINTABLE" ) )
463
460
                                }
464
461
 
465
462
                                // parse charset parameter
466
 
                                String charset = checkParam( name_and_param_bits, "CHARSET" );
 
463
                                String charset = checkParam( name_param_parts, "CHARSET" );
467
464
                                if( charset != null ) charset = charset.toUpperCase();
468
465
                                if( charset != null && !charset.equals( "US-ASCII" ) &&
469
466
                                        !charset.equals( "ASCII" ) && !charset.equals( "UTF-8" ) )
477
474
                                if( encoding != null && encoding.equals( "QUOTED-PRINTABLE" ) )
478
475
                                        unencoding_result = unencodeQuotedPrintable( value );
479
476
//                              else if( encoding != null && encoding.equals( "BASE64" ) )
480
 
//                                      result = unencodeBase64( props[ 1 ], charset );
 
477
//                                      unencoding_result = unencodeBase64( props[ 1 ], charset );
481
478
                                if( unencoding_result != null ) {
482
479
                                        value = unencoding_result.getBuffer();
483
480
                                        _parser_in_multiline =
485
482
                                }
486
483
 
487
484
                                // convert 8-bit ASCII charset to US-ASCII
488
 
                                if( charset == null || charset == "ASCII" ) {
 
485
                                if( charset == null || charset.equals( "ASCII" ) ) {
489
486
                                        value = transcodeAsciiToUtf8( value );
490
487
                                        charset = "UTF-8";
491
488
                                }
509
506
                                String complete_value =
510
507
                                        _parser_buffered_value_so_far + string_value;
511
508
 
 
509
                                // ignore empty values
 
510
                                if( complete_value.length() < 1 ) return;
 
511
 
512
512
                                // parse some properties
513
 
                                if( name_and_param_bits[ 0 ].equals( "N" ) )
514
 
                                        parseN( name_and_param_bits, complete_value );
515
 
                                else if( name_and_param_bits[ 0 ].equals( "FN" ) )
516
 
                                        parseFN( name_and_param_bits, complete_value );
517
 
                                else if( name_and_param_bits[ 0 ].equals( "ORG" ) )
518
 
                                        parseORG( name_and_param_bits, complete_value );
519
 
                                else if( name_and_param_bits[ 0 ].equals( "TEL" ) )
520
 
                                        parseTEL( name_and_param_bits, complete_value );
521
 
                                else if( name_and_param_bits[ 0 ].equals( "EMAIL" ) )
522
 
                                        parseEMAIL( name_and_param_bits, complete_value );
 
513
                                if( name_param_parts[ 0 ].equals( "N" ) )
 
514
                                        parseN( name_param_parts, complete_value );
 
515
                                else if( name_param_parts[ 0 ].equals( "FN" ) )
 
516
                                        parseFN( name_param_parts, complete_value );
 
517
                                else if( name_param_parts[ 0 ].equals( "ORG" ) )
 
518
                                        parseORG( name_param_parts, complete_value );
 
519
                                else if( name_param_parts[ 0 ].equals( "TEL" ) )
 
520
                                        parseTEL( name_param_parts, complete_value );
 
521
                                else if( name_param_parts[ 0 ].equals( "EMAIL" ) )
 
522
                                        parseEMAIL( name_param_parts, complete_value );
523
523
                        }
524
524
                }
525
525
 
531
531
                        if( _name_level >= NAMELEVEL_N ) return;
532
532
 
533
533
                        // get name parts
534
 
                        String[] nameparts = value.split( ";" );
535
 
                        for( int i = 0; i < nameparts.length; i++ )
536
 
                                nameparts[ i ] = nameparts[ i ].trim();
 
534
                        String[] name_parts = value.split( ";" );
 
535
                        for( int i = 0; i < name_parts.length; i++ )
 
536
                                name_parts[ i ] = name_parts[ i ].trim();
537
537
 
538
538
                        // build name
539
539
                        value = "";
540
 
                        if( nameparts.length > 1 && nameparts[ 1 ].length() > 0 )
541
 
                                value += nameparts[ 1 ];
542
 
                        if( nameparts[ 0 ].length() > 0 )
543
 
                                value += ( value.length() == 0? "" : " " ) + nameparts[ 0 ];
 
540
                        if( name_parts.length > 1 && name_parts[ 1 ].length() > 0 )
 
541
                                value += name_parts[ 1 ];
 
542
                        if( name_parts.length > 0 && name_parts[ 0 ].length() > 0 )
 
543
                                value += ( value.length() == 0? "" : " " ) + name_parts[ 0 ];
544
544
 
545
545
                        // set name
546
546
                        setName( value );
570
570
                        if( _name_level >= NAMELEVEL_ORG ) return;
571
571
 
572
572
                        // get org parts
573
 
                        String[] orgparts = value.split( ";" );
574
 
                        for( int i = 0; i < orgparts.length; i++ )
575
 
                                orgparts[ i ] = orgparts[ i ].trim();
 
573
                        String[] org_parts = value.split( ";" );
 
574
                        for( int i = 0; i < org_parts.length; i++ )
 
575
                                org_parts[ i ] = org_parts[ i ].trim();
576
576
 
577
577
                        // build name
578
 
                        if( orgparts[ 0 ].length() == 0 && orgparts.length > 1 )
579
 
                                value = orgparts[ 1 ];
 
578
                        if( org_parts.length > 1 && org_parts[ 0 ].length() == 0 )
 
579
                                value = org_parts[ 1 ];
580
580
                        else
581
 
                                value = orgparts[ 0 ];
 
581
                                value = org_parts[ 0 ];
582
582
 
583
583
                        // set name
584
584
                        setName( value );
653
653
 
654
654
                private String checkParam( String[] params, String name )
655
655
                {
656
 
                        Pattern p = Pattern.compile( "^" + name + "[ \\t]*=[ \\t]*(.*)$" );
 
656
                        Pattern p = Pattern.compile(
 
657
                                        "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$" );
657
658
                        for( int i = 0; i < params.length; i++ ) {
658
659
                                Matcher m = p.matcher( params[ i ] );
659
660
                                if( m.matches() )
660
 
                                        return m.group( 1 );
 
661
                                        return m.group( 2 );
661
662
                        }
662
663
                        return null;
663
664
                }
664
665
 
665
666
                private Set< String > extractTypes( String[] params,
666
 
                                List< String > validTypes )
 
667
                                List< String > valid_types )
667
668
                {
668
669
                        HashSet< String > types = new HashSet< String >();
669
670
 
670
671
                        // get 3.0-style TYPE= param
671
 
                        String typeParam;
672
 
                        if( ( typeParam = checkParam( params, "TYPE" ) ) != null ) {
673
 
                                String[] bits = typeParam.split( "," );
674
 
                                for( int i = 0; i < bits.length; i++ )
675
 
                                        if( validTypes.contains( bits[ i ] ) )
676
 
                                                types.add( bits[ i ] );
 
672
                        String type_param;
 
673
                        if( ( type_param = checkParam( params, "TYPE" ) ) != null ) {
 
674
                                String[] parts = type_param.split( "," );
 
675
                                for( int i = 0; i < parts.length; i++ )
 
676
                                        if( valid_types.contains( parts[ i ] ) )
 
677
                                                types.add( parts[ i ] );
677
678
                        }
678
679
 
679
680
                        // get 2.1-style type param
680
681
                        if( _version.equals( "2.1" ) ) {
681
682
                                for( int i = 1; i < params.length; i++ )
682
 
                                        if( validTypes.contains( params[ i ] ) )
 
683
                                        if( valid_types.contains( params[ i ] ) )
683
684
                                                types.add( params[ i ] );
684
685
                        }
685
686