/android/import-contacts

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

« back to all changes in this revision

Viewing changes to src/am/ed/importcontacts/VcardImporter.java

  • Committer: Tim Marston
  • Date: 2013-09-16 20:15:38 UTC
  • Revision ID: tim@ed.am-20130916201538-w2s54x86ml6kvjft
prevent NPE

Show diffs side-by-side

added added

removed removed

src/am/ed/importcontacts/VcardImporter.java
471
471
                private String extractCollonPartFromLine( ContentLine content_line,
472
472
                        boolean former )
473
473
                {
474
 
                        String ret = null;
475
 
 
476
474
                        // split line into name and value parts and check to make sure we
477
475
                        // only got 2 parts and that the first part is not zero in length
478
476
                        String[] parts = content_line.getUsAsciiLine().split( ":", 2 );
479
477
                        if( parts.length == 2 && parts[ 0 ].length() > 0 )
480
 
                                ret = parts[ former? 0 : 1 ];
 
478
                                return parts[ former? 0 : 1 ].trim();
481
479
 
482
 
                        return ret;
 
480
                        return null;
483
481
                }
484
482
 
485
483
                private String extractNameAndParamsFromLine( ContentLine content_line )
486
484
                {
487
 
                        return extractCollonPartFromLine( content_line, true ).trim();
 
485
                        return extractCollonPartFromLine( content_line, true );
488
486
                }
489
487
 
490
488
                private String extractValueFromLine( ContentLine content_line )
508
506
                                        name_and_params.equalsIgnoreCase( "VERSION" ) )
509
507
                                {
510
508
                                        // yes, get it!
511
 
                                        String value = extractValueFromLine( content_line ).trim();
512
 
                                        if( !value.equals( "2.1" ) && !value.equals( "3.0" ) )
 
509
                                        String value = extractValueFromLine( content_line );
 
510
                                        if( value == null || (
 
511
                                                !value.equals( "2.1" ) && !value.equals( "3.0" ) ) )
 
512
                                        {
513
513
                                                throw new ParseException( R.string.error_vcf_version );
 
514
                                        }
514
515
                                        _version = value;
515
516
 
516
517
                                        // parse any buffers we've been accumulating while we waited