/android/import-contacts

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

« back to all changes in this revision

Viewing changes to src/org/waxworlds/edam/importcontacts/VCFImporter.java

  • Committer: edam
  • Date: 2011-05-02 18:28:24 UTC
  • Revision ID: edam@waxworlds.org-20110502182824-acgdi3qfxfzqgely
- fixed logic for vcard field types (home, work, cell, etc) so it works
- updated NEWS and TODO
- rewrote most of ContactsCache, including a new ContactIdentifier class to identify contacts in the cache and new cache building code
- contacts now identified in the same way that Andoid displays them (by name, or organisation, or number, or email, in that order)
- propper handling and support for organisations and titles
- validation of imported contact now done by Importer, not VcfImporter
- separated sanitisation and normalisation (for cache lookups)
- generacised PhoneData, EmailData and AddressData classes
- ContactData is now aware of primary numbers, emails and organisations (defaults to the first prefrred one seen, or the first one seen where none is preferred)

Show diffs side-by-side

added added

removed removed

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