/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: Tim Marston
  • Date: 2016-03-28 18:18:11 UTC
  • Revision ID: tim@ed.am-20160328181811-as61lllmvnv8e5os
handle vcards with missing vesion lines (treat as v2.1)

Show diffs side-by-side

added added

removed removed

1
1
/*
2
2
 * VCFImporter.java
3
3
 *
4
 
 * Copyright (C) 2009 to 2011 Tim Marston <edam@waxworlds.org>
 
4
 * Copyright (C) 2009 to 2013 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
8
 
 * http://www.waxworlds.org/edam/software/android/import-contacts
 
7
 * to as "this program").  For more information, see
 
8
 * http://ed.am/dev/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 org.waxworlds.edam.importcontacts;
 
24
package am.ed.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;
41
42
import java.util.NoSuchElementException;
42
43
import java.util.Set;
43
44
import java.util.Vector;
45
46
import java.util.regex.Pattern;
46
47
 
47
48
import android.content.SharedPreferences;
48
 
import android.provider.Contacts;
49
 
import android.provider.Contacts.PhonesColumns;
 
49
import android.os.Environment;
50
50
 
51
 
public class VCFImporter extends Importer
 
51
public class VcardImporter extends Importer
52
52
{
53
53
        private int _vcard_count = 0;
54
54
        private int _progress = 0;
55
55
 
56
 
        public VCFImporter( Doit doit )
 
56
        public VcardImporter( Doit doit )
57
57
        {
58
58
                super( doit );
59
59
        }
70
70
                File[] files = null;
71
71
                try
72
72
                {
 
73
                        // check SD card is mounted
 
74
                        String state = Environment.getExternalStorageState();
 
75
                        if( !Environment.MEDIA_MOUNTED.equals( state ) &&
 
76
                                !Environment.MEDIA_MOUNTED_READ_ONLY.equals( state ) )
 
77
                        {
 
78
                                showError( R.string.error_nosdcard );
 
79
                        }
 
80
 
73
81
                        // open directory
74
 
                        String path = "/sdcard" + prefs.getString( "location", "/" );
75
 
                        File file = new File( path );
 
82
                        File file = new File( Environment.getExternalStorageDirectory(),
 
83
                                prefs.getString( "location", "/" ) );
76
84
                        if( !file.exists() )
77
85
                                showError( R.string.error_locationnotfound );
78
86
 
82
90
                                // get files
83
91
                                class VCardFilter implements FilenameFilter {
84
92
                                        public boolean accept( File dir, String name ) {
85
 
                                                return name.toLowerCase().endsWith( ".vcf" );
 
93
                                                return name.toLowerCase( Locale.ENGLISH )
 
94
                                                        .endsWith( ".vcf" );
86
95
                                        }
87
96
                                }
88
97
                                files = file.listFiles( new VCardFilter() );
116
125
                setProgress( 0 );
117
126
                for( int i = 0; i < files.length; i++ )
118
127
                        importVCardFile( files[ i ] );
 
128
                setProgress( _vcard_count );
119
129
        }
120
130
 
121
131
        private void countVCardFile( File file ) throws AbortImportException
131
141
                        boolean in_vcard = false;
132
142
                        while( ( line = reader.readLine() ) != null )
133
143
                        {
134
 
                                if( !in_vcard ) {
 
144
                                if( !in_vcard )
 
145
                                {
135
146
                                        // look for vcard beginning
136
 
                                        if( line.matches( "^BEGIN:VCARD" ) ) {
 
147
                                        if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VCARD.*" ) ) {
137
148
                                                in_vcard = true;
138
149
                                                _vcard_count++;
139
150
                                        }
 
151
                                        // check for vMsg files
 
152
                                        else if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VMSG.*" ) ) {
 
153
                                                showError( getText( R.string.error_vcf_vmsgfile )
 
154
                                                        + file.getName() );
 
155
                                        }
140
156
                                }
141
 
                                else if( line.matches( "^END:VCARD" ) )
 
157
                                else if( line.matches( "(?i)END[ \t]*:[ \t]*VCARD.*" ) )
142
158
                                        in_vcard = false;
143
159
                        }
 
160
                        reader.close();
144
161
 
145
162
                }
146
163
                catch( FileNotFoundException e ) {
168
185
                        FileInputStream istream = new FileInputStream( file );
169
186
                        byte[] content = new byte[ (int)file.length() ];
170
187
                        istream.read( content );
 
188
                        istream.close();
171
189
 
172
190
                        // import
173
191
                        importVCardFileContent( content, file.getName() );
174
192
                }
 
193
                catch( OutOfMemoryError e ) {
 
194
                        showError( R.string.error_outofmemory );
 
195
                }
175
196
                catch( FileNotFoundException e ) {
176
197
                        showError( getText( R.string.error_filenotfound ) +
177
198
                                file.getName() );
185
206
                throws AbortImportException
186
207
        {
187
208
                // go through lines
188
 
                VCard vcard = null;
 
209
                Vcard vcard = null;
 
210
                int vcard_start_line = 0;
189
211
                ContentLineIterator cli = new ContentLineIterator( content );
190
212
                while( cli.hasNext() )
191
213
                {
192
 
                        ByteBuffer buffer = cli.next();
 
214
                        ContentLine content_line = cli.next();
193
215
 
194
 
                        // get a US-ASCII version of the line for processing
195
 
                        String line;
196
 
                        try {
197
 
                                line = new String( buffer.array(), buffer.position(),
198
 
                                        buffer.limit() - buffer.position(), "US-ASCII" );
199
 
                        }
200
 
                        catch( UnsupportedEncodingException e ) {
201
 
                                // we know US-ASCII is supported, so appease the compiler...
202
 
                                line = "";
203
 
                        }
 
216
                        // get a US-ASCII version of the string, for processing
 
217
                        String line = content_line.getUsAsciiLine();
204
218
 
205
219
                        if( vcard == null ) {
206
220
                                // look for vcard beginning
207
 
                                if( line.matches( "^BEGIN:VCARD" ) ) {
208
 
                                        setProgress( ++_progress );
209
 
                                        vcard = new VCard();
 
221
                                if( line.matches( "(?i)BEGIN[ \t]*:[ \t]*VCARD.*" ) ) {
 
222
                                        setProgress( _progress++ );
 
223
                                        vcard = new Vcard();
 
224
                                        vcard_start_line = cli.getLineNumber();
210
225
                                }
211
226
                        }
212
227
                        else {
213
228
                                // look for vcard content or ending
214
 
                                if( line.matches( "^END:VCARD" ) )
 
229
                                if( line.matches( "(?i)END[ \t]*:[ \t]*VCARD.*" ) )
215
230
                                {
216
 
                                        // store vcard and do away with it
 
231
                                        // finalise the vcard/contact
217
232
                                        try {
218
 
                                                vcard.finaliseParsing();
 
233
                                                vcard.finaliseVcard();
 
234
 
 
235
                                                // pass the finalised contact to the importer
219
236
                                                importContact( vcard );
220
237
                                        }
221
 
                                        catch( VCard.ParseException e ) {
222
 
                                                skipContact();
223
 
                                                if( !showContinue(
224
 
                                                        getText( R.string.error_vcf_parse ).toString()
225
 
                                                        + fileName + "\n" + e.getMessage() ) )
226
 
                                                {
227
 
                                                        finish( ACTION_ABORT );
228
 
                                                }
229
 
                                        }
230
 
                                        catch( VCard.SkipContactException e ) {
231
 
                                                skipContact();
232
 
                                                // do nothing
233
 
                                        }
 
238
                                        catch( Vcard.ParseException e ) {
 
239
                                                showContinueOrAbort(
 
240
                                                        getText( R.string.error_vcf_parse ).toString()
 
241
                                                        + fileName +
 
242
                                                        getText( R.string.error_vcf_parse_line ).toString()
 
243
                                                        + cli.getLineNumber() + ":\n" + e.getMessage() );
 
244
                                                skipContact();
 
245
                                        }
 
246
                                        catch( ContactData.ContactNotIdentifiableException e ) {
 
247
                                                showContinueOrAbort(
 
248
                                                        getText( R.string.error_vcf_parse ).toString()
 
249
                                                        + fileName +
 
250
                                                        getText( R.string.error_vcf_parse_line ).toString()
 
251
                                                        + vcard_start_line + ":\n" + getText(
 
252
                                                                R.string.error_vcf_notenoughinfo ).toString() );
 
253
                                                skipContact();
 
254
                                        }
 
255
                                        catch( Vcard.SkipImportException e ) {
 
256
                                                skipContact();
 
257
                                        }
 
258
 
 
259
                                        // discard this vcard
234
260
                                        vcard = null;
235
261
                                }
236
262
                                else
237
263
                                {
238
264
                                        // try giving the line to the vcard
239
265
                                        try {
240
 
                                                vcard.parseLine( buffer, line,
241
 
                                                        cli.doesNextLineLookFolded() );
 
266
                                                vcard.parseLine( content_line );
242
267
                                        }
243
 
                                        catch( VCard.ParseException e ) {
 
268
                                        catch( Vcard.ParseException e ) {
244
269
                                                skipContact();
245
 
                                                if( !showContinue(
 
270
                                                showContinueOrAbort(
246
271
                                                        getText( R.string.error_vcf_parse ).toString()
247
 
                                                        + fileName + "\n" + e.getMessage() ) )
248
 
                                                {
249
 
                                                        finish( ACTION_ABORT );
250
 
                                                }
 
272
                                                        + fileName +
 
273
                                                        getText( R.string.error_vcf_parse_line ).toString()
 
274
                                                        + cli.getLineNumber() + "\n" + e.getMessage() );
251
275
 
252
 
                                                // although we're continuing, we still need to abort
253
 
                                                // this vCard. Further lines will be ignored until we
 
276
                                                // Although we're continuing, we still need to abort
 
277
                                                // this vCard.  Further lines will be ignored until we
254
278
                                                // get to another BEGIN:VCARD line.
255
279
                                                vcard = null;
256
280
                                        }
257
 
                                        catch( VCard.SkipContactException e ) {
 
281
                                        catch( Vcard.SkipImportException e ) {
258
282
                                                skipContact();
259
 
                                                // abort this vCard. Further lines will be ignored until
 
283
                                                // Abort this vCard.  Further lines will be ignored until
260
284
                                                // we get to another BEGIN:VCARD line.
261
285
                                                vcard = null;
262
286
                                        }
265
289
                }
266
290
        }
267
291
 
268
 
        class ContentLineIterator implements Iterator< ByteBuffer >
 
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 >
269
335
        {
270
336
                protected byte[] _content = null;
271
337
                protected int _pos = 0;
 
338
                protected int _line = 0;
272
339
 
273
340
                public ContentLineIterator( byte[] content )
274
341
                {
282
349
                }
283
350
 
284
351
                @Override
285
 
                public ByteBuffer next()
 
352
                public ContentLine next()
286
353
                {
287
354
                        int initial_pos = _pos;
288
355
 
294
361
                                        int to = ( _pos > 0 && _content[ _pos - 1 ] == '\r' &&
295
362
                                                _pos > initial_pos )? _pos - 1 : _pos;
296
363
                                        _pos++;
297
 
                                        return ByteBuffer.wrap( _content, initial_pos,
298
 
                                                to - initial_pos );
 
364
                                        _line++;
 
365
                                        return new ContentLine(
 
366
                                                ByteBuffer.wrap( _content, initial_pos,
 
367
                                                        to - initial_pos ),
 
368
                                                doesNextLineLookFolded() );
299
369
                                }
300
370
 
301
371
                        // we didn't find one, but were there bytes left?
302
372
                        if( _pos != initial_pos ) {
303
373
                                int to = _pos;
304
374
                                _pos++;
305
 
                                return ByteBuffer.wrap( _content, initial_pos,
306
 
                                        to - initial_pos );
 
375
                                _line++;
 
376
                                return new ContentLine(
 
377
                                        ByteBuffer.wrap( _content, initial_pos,
 
378
                                                to - initial_pos ),
 
379
                                        doesNextLineLookFolded() );
307
380
                        }
308
381
 
309
382
                        // no bytes left
321
394
                 * onto the end of this one?
322
395
                 * @return
323
396
                 */
324
 
                public boolean doesNextLineLookFolded()
 
397
                private boolean doesNextLineLookFolded()
325
398
                {
326
399
                        return _pos > 0 && _pos < _content.length &&
327
 
                                _content[ _pos - 1 ] == '\n' && _content[ _pos ] == ' ';
 
400
                                _content[ _pos - 1 ] == '\n' &&
 
401
                                ( _content[ _pos ] == ' ' || _content[ _pos ] == '\t' );
 
402
                }
 
403
 
 
404
                public int getLineNumber()
 
405
                {
 
406
                        return _line;
328
407
                }
329
408
        }
330
409
 
331
 
        private class VCard extends ContactData
 
410
        private class Vcard extends ContactData
332
411
        {
333
412
                private final static int NAMELEVEL_NONE = 0;
334
 
                private final static int NAMELEVEL_FN = 1;
335
 
                private final static int NAMELEVEL_N = 2;
 
413
                private final static int NAMELEVEL_N = 1;
 
414
                private final static int NAMELEVEL_FN = 2;
336
415
 
337
416
                private final static int MULTILINE_NONE = 0;
338
417
                private final static int MULTILINE_ENCODED = 1; // v2.1 quoted-printable
339
418
                private final static int MULTILINE_ESCAPED = 2; // v2.1 \\CRLF
340
 
                private final static int MULTILINE_FOLDED = 3;  // v3.0 folding
 
419
                private final static int MULTILINE_FOLDED = 3;  // MIME-DIR folding
341
420
 
342
421
                private String _version = null;
343
 
                private Vector< ByteBuffer > _buffers = null;
 
422
                private Vector< ContentLine > _content_lines = null;
344
423
                private int _name_level = NAMELEVEL_NONE;
345
424
                private int _parser_multiline_state = MULTILINE_NONE;
346
425
                private String _parser_current_name_and_params = null;
382
461
 
383
462
                        public ParseException( int res )
384
463
                        {
385
 
                                super( VCFImporter.this.getText( res ).toString() );
 
464
                                super( VcardImporter.this.getText( res ).toString() );
386
465
                        }
387
466
                }
388
467
 
389
468
                @SuppressWarnings("serial")
390
 
                protected class SkipContactException extends Exception { }
 
469
                protected class SkipImportException extends Exception { }
391
470
 
392
 
                private String extractCollonPartFromLine( ByteBuffer buffer,
393
 
                        String line, boolean former )
 
471
                private String extractCollonPartFromLine( ContentLine content_line,
 
472
                        boolean former )
394
473
                {
395
 
                        String ret = null;
396
 
 
397
 
                        // get a US-ASCII version of the line for processing, unless we were
398
 
                        // supplied with one
399
 
                        if( line == null ) {
400
 
                                try {
401
 
                                        line = new String( buffer.array(), buffer.position(),
402
 
                                                buffer.limit() - buffer.position(), "US-ASCII" );
403
 
                                }
404
 
                                catch( UnsupportedEncodingException e ) {
405
 
                                        // we know US-ASCII is supported, so appease the compiler...
406
 
                                        line = "";
407
 
                                }
408
 
                        }
409
 
 
410
474
                        // split line into name and value parts and check to make sure we
411
475
                        // only got 2 parts and that the first part is not zero in length
412
 
                        String[] parts = line.split( ":", 2 );
 
476
                        String[] parts = content_line.getUsAsciiLine().split( ":", 2 );
413
477
                        if( parts.length == 2 && parts[ 0 ].length() > 0 )
414
 
                                ret = parts[ former? 0 : 1 ];
415
 
 
416
 
                        return ret;
417
 
                }
418
 
 
419
 
                private String extractNameAndParamsFromLine( ByteBuffer buffer,
420
 
                        String line )
421
 
                {
422
 
                        return extractCollonPartFromLine( buffer, line, true );
423
 
                }
424
 
 
425
 
                private String extractValueFromLine( ByteBuffer buffer, String line )
426
 
                {
427
 
                        return extractCollonPartFromLine( buffer, line, false );
428
 
                }
429
 
 
430
 
                public void parseLine( ByteBuffer buffer, String line,
431
 
                        boolean next_line_looks_folded )
432
 
                        throws ParseException, SkipContactException,
 
478
                                return parts[ former? 0 : 1 ].trim();
 
479
 
 
480
                        return null;
 
481
                }
 
482
 
 
483
                private String extractNameAndParamsFromLine( ContentLine content_line )
 
484
                {
 
485
                        return extractCollonPartFromLine( content_line, true );
 
486
                }
 
487
 
 
488
                private String extractValueFromLine( ContentLine content_line )
 
489
                {
 
490
                        return extractCollonPartFromLine( content_line, false );
 
491
                }
 
492
 
 
493
                public void parseLine( ContentLine content_line )
 
494
                        throws ParseException, SkipImportException,
433
495
                        AbortImportException
434
496
                {
435
497
                        // do we have a version yet?
437
499
                        {
438
500
                                // tentatively get name and params from line
439
501
                                String name_and_params =
440
 
                                        extractNameAndParamsFromLine( buffer, line );
 
502
                                        extractNameAndParamsFromLine( content_line );
441
503
 
442
504
                                // is it a version line?
443
505
                                if( name_and_params != null &&
444
 
                                        name_and_params.equals( "VERSION" ) )
 
506
                                        name_and_params.equalsIgnoreCase( "VERSION" ) )
445
507
                                {
446
508
                                        // yes, get it!
447
 
                                        String value = extractValueFromLine( buffer, line );
448
 
                                        if( !value.equals( "2.1" ) && !value.equals( "3.0" ) )
 
509
                                        String value = extractValueFromLine( content_line );
 
510
                                        if( value == null || (
 
511
                                                !value.equals( "2.1" ) && !value.equals( "3.0" ) ) )
 
512
                                        {
449
513
                                                throw new ParseException( R.string.error_vcf_version );
 
514
                                        }
450
515
                                        _version = value;
451
516
 
452
517
                                        // parse any buffers we've been accumulating while we waited
453
518
                                        // for a version
454
 
                                        if( _buffers != null )
455
 
                                                for( int i = 0; i < _buffers.size(); i++ )
456
 
                                                        parseLine( _buffers.get( i ), null,
457
 
                                                                i + 1 < _buffers.size() &&
458
 
                                                                _buffers.get( i + 1 ).hasRemaining() &&
459
 
                                                                _buffers.get( i + 1 ).get(
460
 
                                                                        _buffers.get( i + 1 ).position() ) == ' ' );
461
 
                                        _buffers = null;
 
519
                                        if( _content_lines != null )
 
520
                                                for( int i = 0; i < _content_lines.size(); i++ )
 
521
                                                        parseLine( _content_lines.get( i ) );
 
522
                                        _content_lines = null;
462
523
                                }
463
524
                                else
464
525
                                {
465
526
                                        // no, so stash this line till we get a version
466
 
                                        if( _buffers == null )
467
 
                                                _buffers = new Vector< ByteBuffer >();
468
 
                                        _buffers.add( buffer );
 
527
                                        if( _content_lines == null )
 
528
                                                _content_lines = new Vector< ContentLine >();
 
529
                                        _content_lines.add( content_line );
469
530
                                }
470
531
                        }
471
532
                        else
472
533
                        {
473
534
                                // name and params and the position in the buffer where the
474
 
                                // "value" part of the line start
 
535
                                // "value" part of the line starts
475
536
                                String name_and_params;
476
537
                                int pos;
477
538
 
483
544
 
484
545
                                        // skip some initial line characters, depending on the type
485
546
                                        // of multi-line we're handling
486
 
                                        pos = buffer.position();
 
547
                                        pos = content_line.getBuffer().position();
487
548
                                        switch( _parser_multiline_state )
488
549
                                        {
489
550
                                        case MULTILINE_FOLDED:
490
551
                                                pos++;
491
552
                                                break;
492
553
                                        case MULTILINE_ENCODED:
493
 
                                                while( pos < buffer.limit() && (
494
 
                                                        buffer.get( pos ) == ' ' ||
495
 
                                                        buffer.get( pos ) == '\t' ) )
 
554
                                                while( pos < content_line.getBuffer().limit() && (
 
555
                                                        content_line.getBuffer().get( pos ) == ' ' ||
 
556
                                                        content_line.getBuffer().get( pos ) == '\t' ) )
496
557
                                                {
497
558
                                                        pos++;
498
559
                                                }
507
568
                                }
508
569
                                else
509
570
                                {
 
571
                                        // skip empty lines
 
572
                                        if( content_line.getUsAsciiLine().trim().length() == 0 )
 
573
                                                return;
 
574
 
510
575
                                        // get name and params from line, and since we're not
511
576
                                        // parsing a subsequent line in a multi-line, this should
512
577
                                        // not fail, or it's an error
513
578
                                        name_and_params =
514
 
                                                extractNameAndParamsFromLine( buffer, line );
 
579
                                                extractNameAndParamsFromLine( content_line );
515
580
                                        if( name_and_params == null )
516
581
                                                throw new ParseException(
517
582
                                                        R.string.error_vcf_malformed );
518
583
 
519
584
                                        // calculate how many chars to skip from beginning of line
520
585
                                        // so we skip the property "name:" part
521
 
                                        pos = buffer.position() + name_and_params.length() + 1;
 
586
                                        pos = content_line.getBuffer().position() +
 
587
                                                name_and_params.length() + 1;
522
588
 
523
589
                                        // reset the saved multi-line state
524
590
                                        _parser_current_name_and_params = name_and_params;
527
593
 
528
594
                                // get value from buffer, as raw bytes
529
595
                                ByteBuffer value;
530
 
                                value = ByteBuffer.wrap( buffer.array(), pos,
531
 
                                        buffer.limit() - pos );
 
596
                                value = ByteBuffer.wrap( content_line.getBuffer().array(), pos,
 
597
                                        content_line.getBuffer().limit() - pos );
532
598
 
533
599
                                // get parameter parts
534
600
                                String[] name_param_parts = name_and_params.split( ";", -1 );
535
601
                                for( int i = 0; i < name_param_parts.length; i++ )
536
602
                                        name_param_parts[ i ] = name_param_parts[ i ].trim();
537
603
 
 
604
                                // determine whether we care about this entry
 
605
                                final HashSet< String > interesting_fields =
 
606
                                        new HashSet< String >( Arrays.asList( new String[] { "N",
 
607
                                                "FN", "ORG", "TITLE", "TEL", "EMAIL", "ADR", "LABEL" }
 
608
                                ) );
 
609
                                boolean is_interesting_field =
 
610
                                        interesting_fields.contains(
 
611
                                                name_param_parts[ 0 ].toUpperCase( Locale.ENGLISH ) );
 
612
 
538
613
                                // parse encoding parameter
539
614
                                String encoding = checkParam( name_param_parts, "ENCODING" );
540
 
                                if( encoding != null ) encoding = encoding.toUpperCase();
541
 
                                if( encoding != null && !encoding.equals( "8BIT" ) &&
542
 
                                        !encoding.equals( "QUOTED-PRINTABLE" ) )
543
 
                                        //&& !encoding.equals( "BASE64" ) )
 
615
                                if( encoding != null )
 
616
                                        encoding = encoding.toUpperCase( Locale.ENGLISH );
 
617
                                if( is_interesting_field && encoding != null &&
 
618
                                        !encoding.equalsIgnoreCase( "8BIT" ) &&
 
619
                                        !encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
 
620
                                        //&& !encoding.equalsIgnoreCase( "BASE64" ) )
544
621
                                {
545
622
                                        throw new ParseException( R.string.error_vcf_encoding );
546
623
                                }
547
624
 
548
625
                                // parse charset parameter
549
626
                                String charset = checkParam( name_param_parts, "CHARSET" );
550
 
                                if( charset != null ) charset = charset.toUpperCase();
551
 
                                if( charset != null && !charset.equals( "US-ASCII" ) &&
552
 
                                        !charset.equals( "ASCII" ) &&
553
 
                                        !charset.equals( "UTF-8" ) )
 
627
                                if( charset != null )
 
628
                                        charset = charset.toUpperCase( Locale.ENGLISH );
 
629
                                if( charset != null &&
 
630
                                        !charset.equalsIgnoreCase( "US-ASCII" ) &&
 
631
                                        !charset.equalsIgnoreCase( "ASCII" ) &&
 
632
                                        !charset.equalsIgnoreCase( "UTF-8" ) )
554
633
                                {
555
634
                                        throw new ParseException( R.string.error_vcf_charset );
556
635
                                }
558
637
                                // do unencoding (or default to a fake unencoding result with
559
638
                                // the raw string)
560
639
                                UnencodeResult unencoding_result = null;
561
 
                                if( encoding != null && encoding.equals( "QUOTED-PRINTABLE" ) )
 
640
                                if( encoding != null &&
 
641
                                        encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
 
642
                                {
562
643
                                        unencoding_result = unencodeQuotedPrintable( value );
563
 
//                              else if( encoding != null && encoding.equals( "BASE64" ) )
 
644
                                }
 
645
//                              else if( encoding != null &&
 
646
//                                      encoding.equalsIgnoreCase( "BASE64" ) )
 
647
//                              {
564
648
//                                      unencoding_result = unencodeBase64( props[ 1 ], charset );
 
649
//                              }
565
650
                                if( unencoding_result != null ) {
566
651
                                        value = unencoding_result.getBuffer();
567
652
                                        if( unencoding_result.isAnotherLineRequired() )
568
653
                                                _parser_multiline_state = MULTILINE_ENCODED;
569
654
                                }
570
655
 
571
 
                                // convert 8-bit ASCII charset to US-ASCII
572
 
                                if( charset == null || charset.equals( "ASCII" ) ) {
 
656
                                // convert 8-bit US-ASCII charset to UTF-8 (where no charset is
 
657
                                // specified for a v2.1 vcard entry, we assume it's US-ASCII)
 
658
                                if( ( charset == null && _version.equals( "2.1" ) ) ||
 
659
                                        ( charset != null && (
 
660
                                                charset.equalsIgnoreCase( "ASCII" ) ||
 
661
                                                charset.equalsIgnoreCase( "US-ASCII" ) ) ) )
 
662
                                {
573
663
                                        value = transcodeAsciiToUtf8( value );
574
 
                                        charset = "UTF-8";
575
664
                                }
576
665
 
577
 
                                // process charset
 
666
                                // process charset (value is now in UTF-8)
578
667
                                String string_value;
579
668
                                try {
580
669
                                        string_value = new String( value.array(), value.position(),
581
 
                                                value.limit() - value.position(), charset );
 
670
                                                value.limit() - value.position(), "UTF-8" );
582
671
                                } catch( UnsupportedEncodingException e ) {
583
672
                                        throw new ParseException( R.string.error_vcf_charset );
584
673
                                }
586
675
                                // for some entries that have semicolon-separated value parts,
587
676
                                // check to see if the value ends in an escape character, which
588
677
                                // indicates that we have a multi-line value
589
 
                                if( ( name_param_parts[ 0 ].equals( "N" ) ||
590
 
                                        name_param_parts[ 0 ].equals( "ORG" ) ||
591
 
                                        name_param_parts[ 0 ].equals( "ADR" ) ) &&
 
678
                                if( ( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) ||
 
679
                                        name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) ||
 
680
                                        name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) ) &&
592
681
                                        doesStringEndInAnEscapeChar( string_value ) )
593
682
                                {
594
683
                                        _parser_multiline_state = MULTILINE_ESCAPED;
596
685
                                                string_value.length() - 1 );
597
686
                                }
598
687
 
599
 
                                // now we know whether we're in an encoding multi-line,
600
 
                                // determine if we're in a v3 folded multi-line or not
 
688
                                // if we know we're not in an encoding-based multi-line, check
 
689
                                // to see if we're in a folded multi-line
601
690
                                if( _parser_multiline_state == MULTILINE_NONE &&
602
 
                                        _version.equals( "3.0" ) && next_line_looks_folded )
 
691
                                        content_line.doesNextLineLookFolded() )
603
692
                                {
604
693
                                        _parser_multiline_state = MULTILINE_FOLDED;
605
694
                                }
617
706
                                if( complete_value.length() < 1 ) return;
618
707
 
619
708
                                // parse some properties
620
 
                                if( name_param_parts[ 0 ].equals( "N" ) )
 
709
                                if( name_param_parts[ 0 ].equalsIgnoreCase( "N" ) )
621
710
                                        parseN( name_param_parts, complete_value );
622
 
                                else if( name_param_parts[ 0 ].equals( "FN" ) )
 
711
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "FN" ) )
623
712
                                        parseFN( name_param_parts, complete_value );
624
 
                                else if( name_param_parts[ 0 ].equals( "ORG" ) )
 
713
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ORG" ) )
625
714
                                        parseORG( name_param_parts, complete_value );
626
 
                                else if( name_param_parts[ 0 ].equals( "TITLE" ) )
 
715
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TITLE" ) )
627
716
                                        parseTITLE( name_param_parts, complete_value );
628
 
                                else if( name_param_parts[ 0 ].equals( "TEL" ) )
 
717
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "TEL" ) )
629
718
                                        parseTEL( name_param_parts, complete_value );
630
 
                                else if( name_param_parts[ 0 ].equals( "EMAIL" ) )
 
719
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "EMAIL" ) )
631
720
                                        parseEMAIL( name_param_parts, complete_value );
632
 
                                else if( name_param_parts[ 0 ].equals( "ADR" ) )
 
721
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "ADR" ) )
633
722
                                        parseADR( name_param_parts, complete_value );
 
723
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "LABEL" ) )
 
724
                                        parseLABEL( name_param_parts, complete_value );
 
725
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )
 
726
                                        parseNOTE( name_param_parts, complete_value );
 
727
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "BDAY" ) )
 
728
                                        parseBDAY( name_param_parts, complete_value );
634
729
                        }
635
730
                }
636
731
 
649
744
                        return ( count & 1 ) == 1;
650
745
                }
651
746
 
652
 
                private String[] splitValueBySemicolon( String value )
 
747
                private String[] splitValueByCharacter( String value, char character )
653
748
                {
654
 
                        // split string in to parts by semicolon
 
749
                        // split string in to parts by specified character
655
750
                        ArrayList< String > parts = new ArrayList< String >(
656
 
                                Arrays.asList( value.split(  ";" ) ) );
 
751
                                Arrays.asList( value.split( "" + character ) ) );
657
752
 
658
753
                        // go through parts
659
754
                        for( int a = 0; a < parts.size(); a++ )
660
755
                        {
661
756
                                String str = parts.get( a );
662
757
 
663
 
                                // look for parts that end in an escape character, but ignore
664
 
                                // the final part. We've already detected escape chars at the
 
758
                                // Look for parts that end in an escape character, but ignore
 
759
                                // the final part.  We've already detected escape chars at the
665
760
                                // end of the final part in parseLine() and handled multi-lines
666
761
                                // accordingly.
667
762
                                if( a < parts.size() - 1 &&
668
763
                                        doesStringEndInAnEscapeChar( str ) )
669
764
                                {
670
 
                                        // join the next part to this part and remove the next part
 
765
                                        // append the escaped character, join the next part to this
 
766
                                        // part and remove the next part
671
767
                                        parts.set( a, str.substring( 0, str.length() - 1 ) +
672
 
                                                ';' + parts.get( a + 1 ) );
 
768
                                                character + parts.get( a + 1 ) );
673
769
                                        parts.remove( a + 1 );
674
770
 
675
771
                                        // re-visit this part
686
782
                        return parts.toArray( ret );
687
783
                }
688
784
 
 
785
                private String unescapeValue( String value )
 
786
                {
 
787
                        StringBuilder ret = new StringBuilder( value.length() );
 
788
                        boolean in_escape = false;
 
789
                        for( int a = 0; a < value.length(); a++ )
 
790
                        {
 
791
                                int c = value.codePointAt( a );
 
792
 
 
793
                                // process a normal character
 
794
                                if( !in_escape ) {
 
795
                                        if( c == '\\' )
 
796
                                                in_escape = true;
 
797
                                        else
 
798
                                                ret.append( Character.toChars( c ) );
 
799
                                        continue;
 
800
                                }
 
801
 
 
802
                                // process an escape sequence
 
803
                                in_escape = false;
 
804
                                switch( c )
 
805
                                {
 
806
                                case 'T':
 
807
                                case 't':
 
808
                                        // add tab (invalid/non-standard, but accepted)
 
809
                                        ret.append( '\t' );
 
810
                                        break;
 
811
                                case 'N':
 
812
                                case 'n':
 
813
                                        // add newline
 
814
                                        ret.append( '\n' );
 
815
                                        break;
 
816
                                case '\\':
 
817
                                case ',':
 
818
                                case ';':
 
819
                                        // add escaped character
 
820
                                        ret.append( Character.toChars( c ) );
 
821
                                        break;
 
822
                                default:
 
823
                                        // unknown escape sequence, so add it unescaped
 
824
                                        // (invalid/non-standard, but accepted)
 
825
                                        ret.append( "\\" );
 
826
                                        ret.append( Character.toChars( c ) );
 
827
                                        break;
 
828
                                }
 
829
                        }
 
830
 
 
831
                        return ret.toString();
 
832
                }
 
833
 
689
834
                private void parseN( String[] params, String value )
690
835
                {
691
836
                        // already got a better name?
692
837
                        if( _name_level >= NAMELEVEL_N ) return;
693
838
 
694
839
                        // get name parts
695
 
                        String[] name_parts = splitValueBySemicolon( value );
 
840
                        String[] name_parts = splitValueByCharacter( value, ';' );
696
841
 
697
842
                        // build name
698
843
                        value = "";
699
 
                        if( name_parts.length > 1 && name_parts[ 1 ].length() > 0 )
700
 
                                value += name_parts[ 1 ];
701
 
                        if( name_parts.length > 0 && name_parts[ 0 ].length() > 0 )
702
 
                                value += ( value.length() == 0? "" : " " ) + name_parts[ 0 ];
 
844
                        final int[] part_order = { 3, 1, 2, 0, 4 };
 
845
                        for( int a = 0; a < part_order.length; a++ )
 
846
                                if( name_parts.length > part_order[ a ] &&
 
847
                                        name_parts[ part_order[ a ] ].length() > 0 )
 
848
                                {
 
849
                                        // split this part in to it's comma-separated bits
 
850
                                        String[] name_part_parts = splitValueByCharacter(
 
851
                                                name_parts[ part_order[ a ] ], ',' );
 
852
                                        for( int b = 0; b < name_part_parts.length; b++ )
 
853
                                                if( name_part_parts[ b ].length() > 0 )
 
854
                                                {
 
855
                                                        if( value.length() > 0 ) value += " ";
 
856
                                                        value += name_part_parts[ b ];
 
857
                                                }
 
858
                                }
703
859
 
704
860
                        // set name
705
 
                        setName( value );
 
861
                        setName( unescapeValue( value ) );
706
862
                        _name_level = NAMELEVEL_N;
707
863
                }
708
864
 
712
868
                        if( _name_level >= NAMELEVEL_FN ) return;
713
869
 
714
870
                        // set name
715
 
                        setName( value );
 
871
                        setName( unescapeValue( value ) );
716
872
                        _name_level = NAMELEVEL_FN;
717
873
                }
718
874
 
719
875
                private void parseORG( String[] params, String value )
720
876
                {
721
877
                        // get org parts
722
 
                        String[] org_parts = splitValueBySemicolon( value );
 
878
                        String[] org_parts = splitValueByCharacter( value, ';' );
723
879
                        if( org_parts == null || org_parts.length < 1 ) return;
724
880
 
725
881
                        // build organisation name
727
883
                                String.valueOf( org_parts[ 0 ] ) );
728
884
                        for( int a = 1; a < org_parts.length; a++ )
729
885
                                builder.append( ", " ).append( org_parts[ a ] );
730
 
                        String organisation = builder.toString();
 
886
                        String organisation = unescapeValue( builder.toString() );
731
887
 
732
888
                        // set organisation name (using a title we've previously found)
733
889
                        addOrganisation( organisation, _cached_title, true );
744
900
 
745
901
                private void parseTITLE( String[] params, String value )
746
902
                {
 
903
                        value = unescapeValue( value );
 
904
 
747
905
                        // if we previously had an organisation, look it up and append this
748
906
                        // title to it
749
907
                        if( _cached_organisation != null && hasOrganisations() ) {
775
933
                        int type;
776
934
                        if( types.contains( "FAX" ) )
777
935
                                if( types.contains( "HOME" ) )
778
 
                                        type = PhonesColumns.TYPE_FAX_HOME;
 
936
                                        type = TYPE_FAX_HOME;
779
937
                                else
780
 
                                        type = PhonesColumns.TYPE_FAX_WORK;
 
938
                                        type = TYPE_FAX_WORK;
781
939
                        else if( types.contains( "CELL" ) || types.contains( "VIDEO" ) )
782
 
                                type = PhonesColumns.TYPE_MOBILE;
 
940
                                type = TYPE_MOBILE;
783
941
                        else if( types.contains( "PAGER" ) )
784
 
                                type = PhonesColumns.TYPE_PAGER;
 
942
                                type = TYPE_PAGER;
785
943
                        else if( types.contains( "WORK" ) )
786
 
                                type = PhonesColumns.TYPE_WORK;
 
944
                                type = TYPE_WORK;
787
945
                        else
788
 
                                type = PhonesColumns.TYPE_HOME;
 
946
                                type = TYPE_HOME;
789
947
 
790
948
                        // add phone number
791
949
                        addNumber( value, type, is_preferred );
802
960
                        boolean is_preferred = types.contains( "PREF" );
803
961
                        int type;
804
962
                        if( types.contains( "WORK" ) )
805
 
                                type = Contacts.ContactMethods.TYPE_WORK;
 
963
                                type = TYPE_WORK;
806
964
                        else
807
 
                                type = Contacts.ContactMethods.TYPE_HOME;
 
965
                                type = TYPE_HOME;
808
966
 
809
 
                        addEmail( value, type, is_preferred );
 
967
                        addEmail( unescapeValue( value ), type, is_preferred );
810
968
                }
811
969
 
812
970
                private void parseADR( String[] params, String value )
813
971
                {
814
972
                        // get address parts
815
 
                        String[] adr_parts = splitValueBySemicolon( value );
 
973
                        String[] adr_parts = splitValueByCharacter( value, ';' );
816
974
 
817
975
                        // build address
818
976
                        value = "";
819
 
                        for( int a = 0; a < adr_parts.length; a++ ) {
820
 
                                if( value.length() > 0 ) value += "\n";
821
 
                                value += adr_parts[ a ].trim();
822
 
                        }
823
 
 
824
 
                        Set< String > types = extractTypes( params, Arrays.asList(
825
 
                                "PREF", "WORK", "HOME", "INTERNET" ) );
826
 
 
827
 
                        // add address
828
 
                        int type;
829
 
                        if( types.contains( "WORK" ) )
830
 
                                type = Contacts.ContactMethods.TYPE_WORK;
831
 
                        else
832
 
                                type = Contacts.ContactMethods.TYPE_HOME;
833
 
 
834
 
                        addAddress( value, type );
835
 
                }
836
 
 
837
 
                public void finaliseParsing()
838
 
                        throws ParseException, SkipContactException,
839
 
                        AbortImportException
840
 
                {
841
 
                        // missing version (and data is present)
842
 
                        if( _version == null && _buffers != null )
843
 
                                throw new ParseException( R.string.error_vcf_malformed );
844
 
 
845
 
                        // check if we should import this contact
846
 
                        try {
847
 
                                if( !isImportRequired( this ) )
848
 
                                        throw new SkipContactException();
849
 
                        }
850
 
                        catch( ContactNeedsMoreInfoException e ) {
851
 
                                throw new ParseException( R.string.error_vcf_notenoughinfo );
852
 
                        }
853
 
                }
854
 
 
 
977
                        for( int a = 0; a < adr_parts.length; a++ )
 
978
                                if( adr_parts[ a ].length() > 0 )
 
979
                                {
 
980
                                        // version 3.0 vCards allow further splitting by comma
 
981
                                        if( _version.equals( "3.0" ) )
 
982
                                        {
 
983
                                                // split this part in to it's comma-separated bits and
 
984
                                                // add them on individual lines
 
985
                                                String[] adr_part_parts =
 
986
                                                        splitValueByCharacter( adr_parts[ a ], ',' );
 
987
                                                for( int b = 0; b < adr_part_parts.length; b++ )
 
988
                                                        if( adr_part_parts[ b ].length() > 0 )
 
989
                                                        {
 
990
                                                                if( value.length() > 0 ) value += "\n";
 
991
                                                                value += adr_part_parts[ b ];
 
992
                                                        }
 
993
                                        }
 
994
                                        else
 
995
                                        {
 
996
                                                // add this part on an individual line
 
997
                                                if( value.length() > 0 ) value += "\n";
 
998
                                                value += adr_parts[ a ];
 
999
                                        }
 
1000
                                }
 
1001
 
 
1002
                        Set< String > types = extractTypes( params, Arrays.asList(
 
1003
                                "PREF", "WORK", "HOME" ) );
 
1004
 
 
1005
                        // add address
 
1006
                        int type;
 
1007
                        if( types.contains( "WORK" ) )
 
1008
                                type = TYPE_WORK;
 
1009
                        else
 
1010
                                type = TYPE_HOME;
 
1011
 
 
1012
                        addAddress( unescapeValue( value ), type );
 
1013
                }
 
1014
 
 
1015
                private void parseLABEL( String[] params, String value )
 
1016
                {
 
1017
                        Set< String > types = extractTypes( params, Arrays.asList(
 
1018
                                "PREF", "WORK", "HOME" ) );
 
1019
 
 
1020
                        // add address
 
1021
                        int type;
 
1022
                        if( types.contains( "WORK" ) )
 
1023
                                type = TYPE_WORK;
 
1024
                        else
 
1025
                                type = TYPE_HOME;
 
1026
 
 
1027
                        addAddress( unescapeValue( value ), type );
 
1028
                }
 
1029
 
 
1030
                private void parseNOTE( String[] params, String value )
 
1031
                {
 
1032
                        addNote( unescapeValue( value ) );
 
1033
                }
 
1034
 
 
1035
                private void parseBDAY( String[] params, String value )
 
1036
                {
 
1037
                        setBirthday( value );
 
1038
                }
 
1039
 
 
1040
                public void finaliseVcard()
 
1041
                        throws ParseException, ContactNotIdentifiableException,
 
1042
                                SkipImportException, AbortImportException
 
1043
                {
 
1044
                        // if there was content present, but no version line, then it must
 
1045
                        // be a version 2.1 vCard; process that content now
 
1046
                        if( _version == null && _content_lines != null ) {
 
1047
                                _version = "2.1";
 
1048
                                for( int i = 0; i < _content_lines.size(); i++ )
 
1049
                                        parseLine( _content_lines.get( i ) );
 
1050
                                _content_lines = null;
 
1051
                        }
 
1052
 
 
1053
                        // finalise the parent class
 
1054
                        finalise();
 
1055
                }
 
1056
 
 
1057
                /**
 
1058
                 * Amongst the params, find the value of the first, only, of any with
 
1059
                 * the specified name.
 
1060
                 *
 
1061
                 * @param params
 
1062
                 * @param name
 
1063
                 * @return a value, or null
 
1064
                 */
855
1065
                private String checkParam( String[] params, String name )
856
1066
                {
 
1067
                        String[] res = checkParams( params, name );
 
1068
                        return res.length > 0? res[ 0 ] : null;
 
1069
                }
 
1070
 
 
1071
                /**
 
1072
                 * Amongst the params, find the values of any with the specified name.
 
1073
                 *
 
1074
                 * @param params
 
1075
                 * @param name
 
1076
                 * @return an array of values, or null
 
1077
                 */
 
1078
                private String[] checkParams( String[] params, String name )
 
1079
                {
 
1080
                        HashSet< String > ret = new HashSet< String >();
 
1081
 
857
1082
                        Pattern p = Pattern.compile(
858
 
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$" );
 
1083
                                "^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$",
 
1084
                                Pattern.CASE_INSENSITIVE );
859
1085
                        for( int i = 0; i < params.length; i++ ) {
860
1086
                                Matcher m = p.matcher( params[ i ] );
861
1087
                                if( m.matches() )
862
 
                                        return m.group( 2 );
 
1088
                                        ret.add( m.group( 2 ) );
863
1089
                        }
864
 
                        return null;
 
1090
 
 
1091
                        return (String[]) ret.toArray( new String[ ret.size() ] );
865
1092
                }
866
1093
 
 
1094
                /**
 
1095
                 * Amongst the params, return any type values present.  For v2.1 vCards,
 
1096
                 * those types are just parameters.  For v3.0, they are prefixed with
 
1097
                 * "TYPE=".  There may also be multiple type parameters.
 
1098
                 *
 
1099
                 * @param params an array of params to look for types in
 
1100
                 * @param valid_types an list of upper-case type values to look for
 
1101
                 * @return a set of present type values
 
1102
                 */
867
1103
                private Set< String > extractTypes( String[] params,
868
1104
                        List< String > valid_types )
869
1105
                {
870
1106
                        HashSet< String > types = new HashSet< String >();
871
1107
 
872
1108
                        // get 3.0-style TYPE= param
873
 
                        String type_param;
874
 
                        if( ( type_param = checkParam( params, "TYPE" ) ) != null ) {
875
 
                                String[] parts = type_param.split( "," );
876
 
                                for( int i = 0; i < parts.length; i++ )
877
 
                                        if( valid_types.contains( parts[ i ] ) )
878
 
                                                types.add( parts[ i ] );
 
1109
                        String type_params[] = checkParams( params, "TYPE" );
 
1110
                        for( int a = 0; a < type_params.length; a++ )
 
1111
                        {
 
1112
                                // check for a comma-separated list of types (why? I don't think
 
1113
                                // this is in the specs!)
 
1114
                                String[] parts = type_params[ a ].split( "," );
 
1115
                                for( int i = 0; i < parts.length; i++ ) {
 
1116
                                        String ucpart = parts[ i ].toUpperCase( Locale.ENGLISH );
 
1117
                                        if( valid_types.contains( ucpart ) )
 
1118
                                                types.add( ucpart );
 
1119
                                }
879
1120
                        }
880
1121
 
881
1122
                        // get 2.1-style type param
882
1123
                        if( _version.equals( "2.1" ) ) {
883
 
                                for( int i = 1; i < params.length; i++ )
884
 
                                        if( valid_types.contains( params[ i ] ) )
885
 
                                                types.add( params[ i ] );
 
1124
                                for( int i = 1; i < params.length; i++ ) {
 
1125
                                        String ucparam = params[ i ].toUpperCase( Locale.ENGLISH );
 
1126
                                        if( valid_types.contains( ucparam ) )
 
1127
                                                types.add( ucparam );
 
1128
                                }
886
1129
                        }
887
1130
 
888
1131
                        return types;
910
1153
                                else if( ch == '=' && i == in.limit() - 1 )
911
1154
                                {
912
1155
                                        // we found a '=' at the end of a line signifying a multi-
913
 
                                        // line string, so we don't add it.
 
1156
                                        // line string, so we don't add it
914
1157
                                        another = true;
915
1158
                                        continue;
916
1159
                                }