/android/import-contacts

To get this branch, use:
bzr branch http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to src/am/ed/importcontacts/VcardImporter.java

  • Committer: edam
  • Date: 2012-12-30 17:17:51 UTC
  • Revision ID: tim@ed.am-20121230171751-8ni3r9bf7pqpa2ng
less strict parsing of vcard begin/end lines and version numbers

Show diffs side-by-side

added added

removed removed

src/am/ed/importcontacts/VcardImporter.java
1
1
/*
2
2
 * VCFImporter.java
3
3
 *
4
 
 * Copyright (C) 2009 to 2013 Tim Marston <tim@ed.am>
 
4
 * Copyright (C) 2009 to 2011 Tim Marston <tim@ed.am>
5
5
 *
6
6
 * This file is part of the Import Contacts program (hereafter referred
7
 
 * to as "this program").  For more information, see
 
7
 * to as "this program"). For more information, see
8
8
 * http://ed.am/dev/android/import-contacts
9
9
 *
10
10
 * This program is free software: you can redistribute it and/or modify
133
133
                        boolean in_vcard = false;
134
134
                        while( ( line = reader.readLine() ) != null )
135
135
                        {
136
 
                                if( !in_vcard )
137
 
                                {
 
136
                                if( !in_vcard ) {
138
137
                                        // look for vcard beginning
139
 
                                        if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VCARD.*" ) ) {
 
138
                                        if( line.matches( "^BEGIN[ \t]*:[ \t]*VCARD.*$" ) ) {
140
139
                                                in_vcard = true;
141
140
                                                _vcard_count++;
142
141
                                        }
143
 
                                        // check for vMsg files
144
 
                                        else if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VMSG.*" ) ) {
145
 
                                                showError( getText( R.string.error_vcf_vmsgfile )
146
 
                                                        + file.getName() );
147
 
                                        }
148
142
                                }
149
 
                                else if( line.matches( "(?i)END[ \t]*:[ \t]*VCARD.*" ) )
 
143
                                else if( line.matches( "^END[ \t]*:[ \t]*VCARD.*$" ) )
150
144
                                        in_vcard = false;
151
145
                        }
152
146
 
209
203
 
210
204
                        if( vcard == null ) {
211
205
                                // look for vcard beginning
212
 
                                if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VCARD.*" ) ) {
 
206
                                if( line.matches( "^BEGIN[ \t]*:[ \t]*VCARD.*$" ) ) {
213
207
                                        setProgress( _progress++ );
214
208
                                        vcard = new Vcard();
215
209
                                        vcard_start_line = cli.getLineNumber();
217
211
                        }
218
212
                        else {
219
213
                                // look for vcard content or ending
220
 
                                if( line.matches( "(?i)END[ \t]*:[ \t]*VCARD.*" ) )
 
214
                                if( line.matches( "^END[ \t]*:[ \t]*VCARD.*$" ) )
221
215
                                {
222
216
                                        // finalise the vcard/contact
223
217
                                        try {
273
267
                                                        finish( ACTION_ABORT );
274
268
                                                }
275
269
 
276
 
                                                // Although we're continuing, we still need to abort
277
 
                                                // this vCard.  Further lines will be ignored until we
 
270
                                                // although we're continuing, we still need to abort
 
271
                                                // this vCard. Further lines will be ignored until we
278
272
                                                // get to another BEGIN:VCARD line.
279
273
                                                vcard = null;
280
274
                                        }
281
275
                                        catch( Vcard.SkipImportException e ) {
282
276
                                                skipContact();
283
 
                                                // Abort this vCard.  Further lines will be ignored until
 
277
                                                // abort this vCard. Further lines will be ignored until
284
278
                                                // we get to another BEGIN:VCARD line.
285
279
                                                vcard = null;
286
280
                                        }
471
465
                private String extractCollonPartFromLine( ContentLine content_line,
472
466
                        boolean former )
473
467
                {
 
468
                        String ret = null;
 
469
 
474
470
                        // split line into name and value parts and check to make sure we
475
471
                        // only got 2 parts and that the first part is not zero in length
476
472
                        String[] parts = content_line.getUsAsciiLine().split( ":", 2 );
477
473
                        if( parts.length == 2 && parts[ 0 ].length() > 0 )
478
 
                                return parts[ former? 0 : 1 ].trim();
 
474
                                ret = parts[ former? 0 : 1 ];
479
475
 
480
 
                        return null;
 
476
                        return ret;
481
477
                }
482
478
 
483
479
                private String extractNameAndParamsFromLine( ContentLine content_line )
484
480
                {
485
 
                        return extractCollonPartFromLine( content_line, true );
 
481
                        return extractCollonPartFromLine( content_line, true ).trim();
486
482
                }
487
483
 
488
484
                private String extractValueFromLine( ContentLine content_line )
506
502
                                        name_and_params.equalsIgnoreCase( "VERSION" ) )
507
503
                                {
508
504
                                        // yes, get it!
509
 
                                        String value = extractValueFromLine( content_line );
510
 
                                        if( value == null || (
511
 
                                                !value.equals( "2.1" ) && !value.equals( "3.0" ) ) )
512
 
                                        {
 
505
                                        String value = extractValueFromLine( content_line ).trim();
 
506
                                        if( !value.equals( "2.1" ) && !value.equals( "3.0" ) )
513
507
                                                throw new ParseException( R.string.error_vcf_version );
514
 
                                        }
515
508
                                        _version = value;
516
509
 
517
510
                                        // parse any buffers we've been accumulating while we waited
724
717
                                        parseLABEL( name_param_parts, complete_value );
725
718
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )
726
719
                                        parseNOTE( name_param_parts, complete_value );
727
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "BDAY" ) )
728
 
                                        parseBDAY( name_param_parts, complete_value );
729
720
                        }
730
721
                }
731
722
 
755
746
                        {
756
747
                                String str = parts.get( a );
757
748
 
758
 
                                // Look for parts that end in an escape character, but ignore
759
 
                                // the final part.  We've already detected escape chars at the
 
749
                                // look for parts that end in an escape character, but ignore
 
750
                                // the final part. We've already detected escape chars at the
760
751
                                // end of the final part in parseLine() and handled multi-lines
761
752
                                // accordingly.
762
753
                                if( a < parts.size() - 1 &&
1032
1023
                        addNote( unescapeValue( value ) );
1033
1024
                }
1034
1025
 
1035
 
                private void parseBDAY( String[] params, String value )
1036
 
                {
1037
 
                        setBirthday( value );
1038
 
                }
1039
 
 
1040
1026
                public void finaliseVcard()
1041
1027
                        throws ParseException, ContactNotIdentifiableException
1042
1028
                {
1050
1036
 
1051
1037
                /**
1052
1038
                 * Amongst the params, find the value of the first, only, of any with
1053
 
                 * the specified name.
1054
 
                 *
 
1039
                 * the specified name
1055
1040
                 * @param params
1056
1041
                 * @param name
1057
1042
                 * @return a value, or null
1063
1048
                }
1064
1049
 
1065
1050
                /**
1066
 
                 * Amongst the params, find the values of any with the specified name.
1067
 
                 *
 
1051
                 * Amongst the params, find the values of any with the specified name
1068
1052
                 * @param params
1069
1053
                 * @param name
1070
1054
                 * @return an array of values, or null
1086
1070
                }
1087
1071
 
1088
1072
                /**
1089
 
                 * Amongst the params, return any type values present.  For v2.1 vCards,
1090
 
                 * those types are just parameters.  For v3.0, they are prefixed with
1091
 
                 * "TYPE=".  There may also be multiple type parameters.
1092
 
                 *
 
1073
                 * Amongst the params, return any type values present. For v2.1 vCards,
 
1074
                 * those types are just parameters. For v3.0, they are prefixed with
 
1075
                 * "TYPE=". There may also be multiple type parameters.
1093
1076
                 * @param params an array of params to look for types in
1094
1077
                 * @param valid_types an list of upper-case type values to look for
1095
1078
                 * @return a set of present type values
1147
1130
                                else if( ch == '=' && i == in.limit() - 1 )
1148
1131
                                {
1149
1132
                                        // we found a '=' at the end of a line signifying a multi-
1150
 
                                        // line string, so we don't add it
 
1133
                                        // line string, so we don't add it.
1151
1134
                                        another = true;
1152
1135
                                        continue;
1153
1136
                                }