/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: 2014-03-02 10:58:49 UTC
  • Revision ID: tim@ed.am-20140302105849-m542carzc1d4m1t2
added permission to write to sdcard (how did this ever work!?)

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