/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: 2016-03-28 18:13:50 UTC
  • Revision ID: tim@ed.am-20160328181350-ytxvox60fxj1tevm
fixed typo in strings

Show diffs side-by-side

added added

removed removed

src/am/ed/importcontacts/VcardImporter.java
252
252
                                                                R.string.error_vcf_notenoughinfo ).toString() );
253
253
                                                skipContact();
254
254
                                        }
255
 
                                        catch( Vcard.SkipImportException e ) {
256
 
                                                skipContact();
257
 
                                        }
258
255
 
259
256
                                        // discard this vcard
260
257
                                        vcard = null;
1038
1035
                }
1039
1036
 
1040
1037
                public void finaliseVcard()
1041
 
                        throws ParseException, ContactNotIdentifiableException,
1042
 
                                SkipImportException, AbortImportException
 
1038
                        throws ParseException, ContactNotIdentifiableException
1043
1039
                {
1044
 
                        // if there was content present, but no version line, then it must
1045
 
                        // be a version 2.1 vCard; process that content now
1046
 
                        if( _version == null && _content_lines != null ) {
1047
 
                                _version = "2.1";
1048
 
                                for( int i = 0; i < _content_lines.size(); i++ )
1049
 
                                        parseLine( _content_lines.get( i ) );
1050
 
                                _content_lines = null;
1051
 
                        }
 
1040
                        // missing version (and data is present)
 
1041
                        if( _version == null && _content_lines != null )
 
1042
                                throw new ParseException( R.string.error_vcf_malformed );
1052
1043
 
1053
1044
                        // finalise the parent class
1054
1045
                        finalise();