/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/VcardImporter.java

  • Committer: edam
  • Date: 2011-06-04 16:52:28 UTC
  • Revision ID: edam@waxworlds.org-20110604165228-jam230oo29u1m06u
- properly handle multiple TYPE= params in one entry in a v3.0 vCard
- when deciding which phone number to use as the pimary number, a voice number takes precedence over a non-voice (fax or pager) number of the same standing in terms of being preferred or not.

Show diffs side-by-side

added added

removed removed

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