/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-03-13 17:56:28 UTC
  • Revision ID: edam@waxworlds.org-20110313175628-4sletcgkyrsww0xx
- fixed a couple of java string comparison checks

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