/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

src/org/waxworlds/edam/importcontacts/VcardImporter.java
1
1
/*
2
2
 * VCFImporter.java
3
3
 *
4
 
 * Copyright (C) 2009 to 2011 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
7
 * to as "this program"). For more information, see
8
 
 * http://ed.am/dev/android/import-contacts
 
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() );
202
201
                                        buffer.limit() - buffer.position(), "US-ASCII" );
203
202
                        }
204
203
                        catch( UnsupportedEncodingException e ) {
205
 
                                // we know US-ASCII *is* supported, so appease the compiler...
 
204
                                // we know US-ASCII is supported, so appease the compiler...
206
205
                                line = "";
207
206
                        }
208
207
 
209
208
                        if( vcard == null ) {
210
209
                                // look for vcard beginning
211
 
                                if( line.matches( "^BEGIN[ \t]*:[ \t]*VCARD" ) ) {
 
210
                                if( line.matches( "^BEGIN:VCARD" ) ) {
212
211
                                        setProgress( _progress++ );
213
212
                                        vcard = new Vcard();
214
213
                                        vcard_start_line = cli.getLineNumber();
216
215
                        }
217
216
                        else {
218
217
                                // look for vcard content or ending
219
 
                                if( line.matches( "^END[ \t]*:[ \t]*VCARD" ) )
 
218
                                if( line.matches( "^END:VCARD" ) )
220
219
                                {
221
220
                                        // finalise the vcard/contact
222
221
                                        try {
351
350
                public boolean doesNextLineLookFolded()
352
351
                {
353
352
                        return _pos > 0 && _pos < _content.length &&
354
 
                                _content[ _pos - 1 ] == '\n' &&
355
 
                                ( _content[ _pos ] == ' ' || _content[ _pos ] == '\t' );
 
353
                                _content[ _pos - 1 ] == '\n' && _content[ _pos ] == ' ';
356
354
                }
357
355
 
358
356
                public int getLineNumber()
364
362
        private class Vcard extends ContactData
365
363
        {
366
364
                private final static int NAMELEVEL_NONE = 0;
367
 
                private final static int NAMELEVEL_N = 1;
368
 
                private final static int NAMELEVEL_FN = 2;
 
365
                private final static int NAMELEVEL_FN = 1;
 
366
                private final static int NAMELEVEL_N = 2;
369
367
 
370
368
                private final static int MULTILINE_NONE = 0;
371
369
                private final static int MULTILINE_ENCODED = 1; // v2.1 quoted-printable
372
370
                private final static int MULTILINE_ESCAPED = 2; // v2.1 \\CRLF
373
 
                private final static int MULTILINE_FOLDED = 3;  // MIME-DIR folding
 
371
                private final static int MULTILINE_FOLDED = 3;  // v3.0 folding
374
372
 
375
373
                private String _version = null;
376
374
                private Vector< ByteBuffer > _buffers = null;
474
472
 
475
473
                                // is it a version line?
476
474
                                if( name_and_params != null &&
477
 
                                        name_and_params.equalsIgnoreCase( "VERSION" ) )
 
475
                                        name_and_params.equals( "VERSION" ) )
478
476
                                {
479
477
                                        // yes, get it!
480
478
                                        String value = extractValueFromLine( buffer, line );
504
502
                        else
505
503
                        {
506
504
                                // name and params and the position in the buffer where the
507
 
                                // "value" part of the line starts
 
505
                                // "value" part of the line start
508
506
                                String name_and_params;
509
507
                                int pos;
510
508
 
540
538
                                }
541
539
                                else
542
540
                                {
543
 
                                        // skip empty lines
544
 
                                        if( line.trim().length() == 0 ) return;
545
 
 
546
541
                                        // get name and params from line, and since we're not
547
542
                                        // parsing a subsequent line in a multi-line, this should
548
543
                                        // not fail, or it's an error
573
568
 
574
569
                                // determine whether we care about this entry
575
570
                                final HashSet< String > interesting_fields =
576
 
                                        new HashSet< String >( Arrays.asList( new String[] { "N",
577
 
                                                "FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR", "LABEL" }
 
571
                                        new HashSet< String >( Arrays.asList( new String[]
 
572
                                                { "N", "FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR" }
578
573
                                ) );
579
574
                                boolean is_interesting_field =
580
 
                                        interesting_fields.contains(
581
 
                                                name_param_parts[ 0 ].toUpperCase( Locale.US ) );
 
575
                                        interesting_fields.contains( name_param_parts[ 0 ] );
582
576
 
583
577
                                // parse encoding parameter
584
578
                                String encoding = checkParam( name_param_parts, "ENCODING" );
585
 
                                if( encoding != null )
586
 
                                        encoding = encoding.toUpperCase( Locale.US );
 
579
                                if( encoding != null ) encoding = encoding.toUpperCase();
587
580
                                if( is_interesting_field && encoding != null &&
588
 
                                        !encoding.equalsIgnoreCase( "8BIT" ) &&
589
 
                                        !encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
590
 
                                        //&& !encoding.equalsIgnoreCase( "BASE64" ) )
 
581
                                        !encoding.equals( "8BIT" ) &&
 
582
                                        !encoding.equals( "QUOTED-PRINTABLE" ) )
 
583
                                        //&& !encoding.equals( "BASE64" ) )
591
584
                                {
592
585
                                        throw new ParseException( R.string.error_vcf_encoding );
593
586
                                }
594
587
 
595
588
                                // parse charset parameter
596
589
                                String charset = checkParam( name_param_parts, "CHARSET" );
597
 
                                if( charset != null )
598
 
                                        charset = charset.toUpperCase( Locale.US );
 
590
                                if( charset != null ) charset = charset.toUpperCase();
599
591
                                if( charset != null &&
600
 
                                        !charset.equalsIgnoreCase( "US-ASCII" ) &&
601
 
                                        !charset.equalsIgnoreCase( "ASCII" ) &&
602
 
                                        !charset.equalsIgnoreCase( "UTF-8" ) )
 
592
                                        !charset.equals( "US-ASCII" ) &&
 
593
                                        !charset.equals( "ASCII" ) &&
 
594
                                        !charset.equals( "UTF-8" ) )
603
595
                                {
604
596
                                        throw new ParseException( R.string.error_vcf_charset );
605
597
                                }
607
599
                                // do unencoding (or default to a fake unencoding result with
608
600
                                // the raw string)
609
601
                                UnencodeResult unencoding_result = null;
610
 
                                if( encoding != null &&
611
 
                                        encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
612
 
                                {
 
602
                                if( encoding != null && encoding.equals( "QUOTED-PRINTABLE" ) )
613
603
                                        unencoding_result = unencodeQuotedPrintable( value );
614
 
                                }
615
 
//                              else if( encoding != null &&
616
 
//                                      encoding.equalsIgnoreCase( "BASE64" ) )
617
 
//                              {
 
604
//                              else if( encoding != null && encoding.equals( "BASE64" ) )
618
605
//                                      unencoding_result = unencodeBase64( props[ 1 ], charset );
619
 
//                              }
620
606
                                if( unencoding_result != null ) {
621
607
                                        value = unencoding_result.getBuffer();
622
608
                                        if( unencoding_result.isAnotherLineRequired() )
623
609
                                                _parser_multiline_state = MULTILINE_ENCODED;
624
610
                                }
625
611
 
626
 
                                // convert 8-bit US-ASCII charset to UTF-8 (where no charset is
627
 
                                // specified for a v2.1 vcard entry, we assume it's US-ASCII)
628
 
                                if( ( charset == null && _version.equals( "2.1" ) ) ||
629
 
                                        ( charset != null && (
630
 
                                                charset.equalsIgnoreCase( "ASCII" ) ||
631
 
                                                charset.equalsIgnoreCase( "US-ASCII" ) ) ) )
632
 
                                {
 
612
                                // convert 8-bit ASCII charset to US-ASCII
 
613
                                if( charset == null || charset.equals( "ASCII" ) ) {
633
614
                                        value = transcodeAsciiToUtf8( value );
 
615
                                        charset = "UTF-8";
634
616
                                }
635
617
 
636
 
                                // process charset (value is now in UTF-8)
 
618
                                // process charset
637
619
                                String string_value;
638
620
                                try {
639
621
                                        string_value = new String( value.array(), value.position(),
640
 
                                                value.limit() - value.position(), "UTF-8" );
 
622
                                                value.limit() - value.position(), charset );
641
623
                                } catch( UnsupportedEncodingException e ) {
642
624
                                        throw new ParseException( R.string.error_vcf_charset );
643
625
                                }
645
627
                                // for some entries that have semicolon-separated value parts,
646
628
                                // check to see if the value ends in an escape character, which
647
629
                                // indicates that we have a multi-line value
648
 
                                if( ( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) ||
649
 
                                        name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) ||
650
 
                                        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" ) ) &&
651
633
                                        doesStringEndInAnEscapeChar( string_value ) )
652
634
                                {
653
635
                                        _parser_multiline_state = MULTILINE_ESCAPED;
655
637
                                                string_value.length() - 1 );
656
638
                                }
657
639
 
658
 
                                // if we know we're not in an encoding-based multi-line, check
659
 
                                // 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
660
642
                                if( _parser_multiline_state == MULTILINE_NONE &&
661
 
                                        next_line_looks_folded )
 
643
                                        _version.equals( "3.0" ) && next_line_looks_folded )
662
644
                                {
663
645
                                        _parser_multiline_state = MULTILINE_FOLDED;
664
646
                                }
676
658
                                if( complete_value.length() < 1 ) return;
677
659
 
678
660
                                // parse some properties
679
 
                                if( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) )
 
661
                                if( name_param_parts[ 0 ].equals( "N" ) )
680
662
                                        parseN( name_param_parts, complete_value );
681
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "FN" ) )
 
663
                                else if( name_param_parts[ 0 ].equals( "FN" ) )
682
664
                                        parseFN( name_param_parts, complete_value );
683
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) )
 
665
                                else if( name_param_parts[ 0 ].equals( "ORG" ) )
684
666
                                        parseORG( name_param_parts, complete_value );
685
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TITLE" ) )
 
667
                                else if( name_param_parts[ 0 ].equals( "TITLE" ) )
686
668
                                        parseTITLE( name_param_parts, complete_value );
687
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TEL" ) )
 
669
                                else if( name_param_parts[ 0 ].equals( "TEL" ) )
688
670
                                        parseTEL( name_param_parts, complete_value );
689
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "EMAIL" ) )
 
671
                                else if( name_param_parts[ 0 ].equals( "EMAIL" ) )
690
672
                                        parseEMAIL( name_param_parts, complete_value );
691
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) )
 
673
                                else if( name_param_parts[ 0 ].equals( "ADR" ) )
692
674
                                        parseADR( name_param_parts, complete_value );
693
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "LABEL" ) )
694
 
                                        parseLABEL( name_param_parts, complete_value );
695
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )
696
 
                                        parseNOTE( name_param_parts, complete_value );
697
675
                        }
698
676
                }
699
677
 
712
690
                        return ( count & 1 ) == 1;
713
691
                }
714
692
 
715
 
                private String[] splitValueByCharacter( String value, char character )
 
693
                private String[] splitValueBySemicolon( String value )
716
694
                {
717
 
                        // split string in to parts by specified character
 
695
                        // split string in to parts by semicolon
718
696
                        ArrayList< String > parts = new ArrayList< String >(
719
 
                                Arrays.asList( value.split( "" + character ) ) );
 
697
                                Arrays.asList( value.split(  ";" ) ) );
720
698
 
721
699
                        // go through parts
722
700
                        for( int a = 0; a < parts.size(); a++ )
730
708
                                if( a < parts.size() - 1 &&
731
709
                                        doesStringEndInAnEscapeChar( str ) )
732
710
                                {
733
 
                                        // append the escaped character, join the next part to this
734
 
                                        // part and remove the next part
 
711
                                        // join the next part to this part and remove the next part
735
712
                                        parts.set( a, str.substring( 0, str.length() - 1 ) +
736
 
                                                character + parts.get( a + 1 ) );
 
713
                                                ';' + parts.get( a + 1 ) );
737
714
                                        parts.remove( a + 1 );
738
715
 
739
716
                                        // re-visit this part
750
727
                        return parts.toArray( ret );
751
728
                }
752
729
 
753
 
                private String unescapeValue( String value )
754
 
                {
755
 
                        StringBuilder ret = new StringBuilder( value.length() );
756
 
                        boolean in_escape = false;
757
 
                        for( int a = 0; a < value.length(); a++ )
758
 
                        {
759
 
                                int c = value.codePointAt( a );
760
 
 
761
 
                                // process a normal character
762
 
                                if( !in_escape ) {
763
 
                                        if( c == '\\' )
764
 
                                                in_escape = true;
765
 
                                        else
766
 
                                                ret.append( Character.toChars( c ) );
767
 
                                        continue;
768
 
                                }
769
 
 
770
 
                                // process an escape sequence
771
 
                                in_escape = false;
772
 
                                switch( c )
773
 
                                {
774
 
                                case 'T':
775
 
                                case 't':
776
 
                                        // add tab (invalid/non-standard, but accepted)
777
 
                                        ret.append( '\t' );
778
 
                                        break;
779
 
                                case 'N':
780
 
                                case 'n':
781
 
                                        // add newline
782
 
                                        ret.append( '\n' );
783
 
                                        break;
784
 
                                case '\\':
785
 
                                case ',':
786
 
                                case ';':
787
 
                                        // add escaped character
788
 
                                        ret.append( Character.toChars( c ) );
789
 
                                        break;
790
 
                                default:
791
 
                                        // unknown escape sequence, so add it unescaped
792
 
                                        // (invalid/non-standard, but accepted)
793
 
                                        ret.append( "\\" );
794
 
                                        ret.append( Character.toChars( c ) );
795
 
                                        break;
796
 
                                }
797
 
                        }
798
 
 
799
 
                        return ret.toString();
800
 
                }
801
 
 
802
730
                private void parseN( String[] params, String value )
803
731
                {
804
732
                        // already got a better name?
805
733
                        if( _name_level >= NAMELEVEL_N ) return;
806
734
 
807
735
                        // get name parts
808
 
                        String[] name_parts = splitValueByCharacter( value, ';' );
 
736
                        String[] name_parts = splitValueBySemicolon( value );
809
737
 
810
738
                        // build name
811
739
                        value = "";
812
 
                        final int[] part_order = { 3, 1, 2, 0, 4 };
813
 
                        for( int a = 0; a < part_order.length; a++ )
814
 
                                if( name_parts.length > part_order[ a ] &&
815
 
                                        name_parts[ part_order[ a ] ].length() > 0 )
816
 
                                {
817
 
                                        // split this part in to it's comma-separated bits
818
 
                                        String[] name_part_parts = splitValueByCharacter(
819
 
                                                name_parts[ part_order[ a ] ], ',' );
820
 
                                        for( int b = 0; b < name_part_parts.length; b++ )
821
 
                                                if( name_part_parts[ b ].length() > 0 )
822
 
                                                {
823
 
                                                        if( value.length() == 0 ) value += " ";
824
 
                                                        value += name_part_parts[ b ];
825
 
                                                }
826
 
                                }
 
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 ];
827
744
 
828
745
                        // set name
829
 
                        setName( unescapeValue( value ) );
 
746
                        setName( value );
830
747
                        _name_level = NAMELEVEL_N;
831
748
                }
832
749
 
836
753
                        if( _name_level >= NAMELEVEL_FN ) return;
837
754
 
838
755
                        // set name
839
 
                        setName( unescapeValue( value ) );
 
756
                        setName( value );
840
757
                        _name_level = NAMELEVEL_FN;
841
758
                }
842
759
 
843
760
                private void parseORG( String[] params, String value )
844
761
                {
845
762
                        // get org parts
846
 
                        String[] org_parts = splitValueByCharacter( value, ';' );
 
763
                        String[] org_parts = splitValueBySemicolon( value );
847
764
                        if( org_parts == null || org_parts.length < 1 ) return;
848
765
 
849
766
                        // build organisation name
851
768
                                String.valueOf( org_parts[ 0 ] ) );
852
769
                        for( int a = 1; a < org_parts.length; a++ )
853
770
                                builder.append( ", " ).append( org_parts[ a ] );
854
 
                        String organisation = unescapeValue( builder.toString() );
 
771
                        String organisation = builder.toString();
855
772
 
856
773
                        // set organisation name (using a title we've previously found)
857
774
                        addOrganisation( organisation, _cached_title, true );
868
785
 
869
786
                private void parseTITLE( String[] params, String value )
870
787
                {
871
 
                        value = unescapeValue( value );
872
 
 
873
788
                        // if we previously had an organisation, look it up and append this
874
789
                        // title to it
875
790
                        if( _cached_organisation != null && hasOrganisations() ) {
901
816
                        int type;
902
817
                        if( types.contains( "FAX" ) )
903
818
                                if( types.contains( "HOME" ) )
904
 
                                        type = TYPE_FAX_HOME;
 
819
                                        type = PhonesColumns.TYPE_FAX_HOME;
905
820
                                else
906
 
                                        type = TYPE_FAX_WORK;
 
821
                                        type = PhonesColumns.TYPE_FAX_WORK;
907
822
                        else if( types.contains( "CELL" ) || types.contains( "VIDEO" ) )
908
 
                                type = TYPE_MOBILE;
 
823
                                type = PhonesColumns.TYPE_MOBILE;
909
824
                        else if( types.contains( "PAGER" ) )
910
 
                                type = TYPE_PAGER;
 
825
                                type = PhonesColumns.TYPE_PAGER;
911
826
                        else if( types.contains( "WORK" ) )
912
 
                                type = TYPE_WORK;
 
827
                                type = PhonesColumns.TYPE_WORK;
913
828
                        else
914
 
                                type = TYPE_HOME;
 
829
                                type = PhonesColumns.TYPE_HOME;
915
830
 
916
831
                        // add phone number
917
832
                        addNumber( value, type, is_preferred );
928
843
                        boolean is_preferred = types.contains( "PREF" );
929
844
                        int type;
930
845
                        if( types.contains( "WORK" ) )
931
 
                                type = TYPE_WORK;
 
846
                                type = Contacts.ContactMethods.TYPE_WORK;
932
847
                        else
933
 
                                type = TYPE_HOME;
 
848
                                type = Contacts.ContactMethods.TYPE_HOME;
934
849
 
935
 
                        addEmail( unescapeValue( value ), type, is_preferred );
 
850
                        addEmail( value, type, is_preferred );
936
851
                }
937
852
 
938
853
                private void parseADR( String[] params, String value )
939
854
                {
940
855
                        // get address parts
941
 
                        String[] adr_parts = splitValueByCharacter( value, ';' );
 
856
                        String[] adr_parts = splitValueBySemicolon( value );
942
857
 
943
858
                        // build address
944
859
                        value = "";
945
 
                        for( int a = 0; a < adr_parts.length; a++ )
946
 
                                if( adr_parts[ a ].length() > 0 )
947
 
                                {
948
 
                                        // version 3.0 vCards allow further splitting by comma
949
 
                                        if( _version.equals( "3.0" ) )
950
 
                                        {
951
 
                                                // split this part in to it's comma-separated bits and
952
 
                                                // add them on individual lines
953
 
                                                String[] adr_part_parts =
954
 
                                                        splitValueByCharacter( adr_parts[ a ], ',' );
955
 
                                                for( int b = 0; b < adr_part_parts.length; b++ )
956
 
                                                        if( adr_part_parts[ b ].length() > 0 )
957
 
                                                        {
958
 
                                                                if( value.length() > 0 ) value += "\n";
959
 
                                                                value += adr_part_parts[ b ];
960
 
                                                        }
961
 
                                        }
962
 
                                        else
963
 
                                        {
964
 
                                                // add this part on an individual line
965
 
                                                if( value.length() > 0 ) value += "\n";
966
 
                                                value += adr_parts[ a ];
967
 
                                        }
968
 
                                }
969
 
 
970
 
                        Set< String > types = extractTypes( params, Arrays.asList(
971
 
                                "PREF", "WORK", "HOME" ) );
972
 
 
973
 
                        // add address
974
 
                        int type;
975
 
                        if( types.contains( "WORK" ) )
976
 
                                type = TYPE_WORK;
977
 
                        else
978
 
                                type = TYPE_HOME;
979
 
 
980
 
                        addAddress( unescapeValue( value ), type );
981
 
                }
982
 
 
983
 
                private void parseLABEL( String[] params, String value )
984
 
                {
985
 
                        Set< String > types = extractTypes( params, Arrays.asList(
986
 
                                "PREF", "WORK", "HOME" ) );
987
 
 
988
 
                        // add address
989
 
                        int type;
990
 
                        if( types.contains( "WORK" ) )
991
 
                                type = TYPE_WORK;
992
 
                        else
993
 
                                type = TYPE_HOME;
994
 
 
995
 
                        addAddress( unescapeValue( value ), type );
996
 
                }
997
 
 
998
 
                private void parseNOTE( String[] params, String value )
999
 
                {
1000
 
                        addNote( unescapeValue( 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 );
1001
876
                }
1002
877
 
1003
878
                public void finaliseVcard()
1011
886
                        finalise();
1012
887
                }
1013
888
 
1014
 
                /**
1015
 
                 * Amongst the params, find the value of the first, only, of any with
1016
 
                 * the specified name
1017
 
                 * @param params
1018
 
                 * @param name
1019
 
                 * @return a value, or null
1020
 
                 */
1021
889
                private String checkParam( String[] params, String name )
1022
890
                {
1023
 
                        String[] res = checkParams( params, name );
1024
 
                        return res.length > 0? res[ 0 ] : null;
1025
 
                }
1026
 
 
1027
 
                /**
1028
 
                 * Amongst the params, find the values of any with the specified name
1029
 
                 * @param params
1030
 
                 * @param name
1031
 
                 * @return an array of values, or null
1032
 
                 */
1033
 
                private String[] checkParams( String[] params, String name )
1034
 
                {
1035
 
                        HashSet< String > ret = new HashSet< String >();
1036
 
 
1037
891
                        Pattern p = Pattern.compile(
1038
 
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$",
1039
 
                                Pattern.CASE_INSENSITIVE );
 
892
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$" );
1040
893
                        for( int i = 0; i < params.length; i++ ) {
1041
894
                                Matcher m = p.matcher( params[ i ] );
1042
895
                                if( m.matches() )
1043
 
                                        ret.add( m.group( 2 ) );
 
896
                                        return m.group( 2 );
1044
897
                        }
1045
 
 
1046
 
                        return (String[]) ret.toArray( new String[ ret.size() ] );
 
898
                        return null;
1047
899
                }
1048
900
 
1049
 
                /**
1050
 
                 * Amongst the params, return any type values present. For v2.1 vCards,
1051
 
                 * those types are just parameters. For v3.0, they are prefixed with
1052
 
                 * "TYPE=". There may also be multiple type parameters.
1053
 
                 * @param params an array of params to look for types in
1054
 
                 * @param valid_types an list of upper-case type values to look for
1055
 
                 * @return a set of present type values
1056
 
                 */
1057
901
                private Set< String > extractTypes( String[] params,
1058
902
                        List< String > valid_types )
1059
903
                {
1060
904
                        HashSet< String > types = new HashSet< String >();
1061
905
 
1062
906
                        // get 3.0-style TYPE= param
1063
 
                        String type_params[] = checkParams( params, "TYPE" );
1064
 
                        for( int a = 0; a < type_params.length; a++ )
1065
 
                        {
1066
 
                                // check for a comma-separated list of types (why? I don't think
1067
 
                                // this is in the specs!)
1068
 
                                String[] parts = type_params[ a ].split( "," );
1069
 
                                for( int i = 0; i < parts.length; i++ ) {
1070
 
                                        String ucpart = parts[ i ].toUpperCase( Locale.US );
1071
 
                                        if( valid_types.contains( ucpart ) )
1072
 
                                                types.add( ucpart );
1073
 
                                }
 
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 ] );
1074
913
                        }
1075
914
 
1076
915
                        // get 2.1-style type param
1077
916
                        if( _version.equals( "2.1" ) ) {
1078
 
                                for( int i = 1; i < params.length; i++ ) {
1079
 
                                        String ucparam = params[ i ].toUpperCase( Locale.US );
1080
 
                                        if( valid_types.contains( ucparam ) )
1081
 
                                                types.add( ucparam );
1082
 
                                }
 
917
                                for( int i = 1; i < params.length; i++ )
 
918
                                        if( valid_types.contains( params[ i ] ) )
 
919
                                                types.add( params[ i ] );
1083
920
                        }
1084
921
 
1085
922
                        return types;