/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-21 21:05:13 UTC
  • Revision ID: tim@ed.am-20121221210513-scyf50006hqadgjw
updated NEWS

Show diffs side-by-side

added added

removed removed

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