/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-05-10 12:16:15 UTC
  • Revision ID: tim@ed.am-20130510121615-g8qhsu0h3t0ymrt6
Tags: 1.3.2
fix spacing in NEWS

Show diffs side-by-side

added added

removed removed

src/am/ed/importcontacts/VcardImporter.java
1
1
/*
2
2
 * VCFImporter.java
3
3
 *
4
 
 * Copyright (C) 2009 to 2013 Tim Marston <tim@ed.am>
 
4
 * Copyright (C) 2009 to 2011 Tim Marston <tim@ed.am>
5
5
 *
6
6
 * This file is part of the Import Contacts program (hereafter referred
7
 
 * to as "this program").  For more information, see
 
7
 * to as "this program"). For more information, see
8
8
 * http://ed.am/dev/android/import-contacts
9
9
 *
10
10
 * This program is free software: you can redistribute it and/or modify
273
273
                                                        finish( ACTION_ABORT );
274
274
                                                }
275
275
 
276
 
                                                // Although we're continuing, we still need to abort
277
 
                                                // this vCard.  Further lines will be ignored until we
 
276
                                                // although we're continuing, we still need to abort
 
277
                                                // this vCard. Further lines will be ignored until we
278
278
                                                // get to another BEGIN:VCARD line.
279
279
                                                vcard = null;
280
280
                                        }
281
281
                                        catch( Vcard.SkipImportException e ) {
282
282
                                                skipContact();
283
 
                                                // Abort this vCard.  Further lines will be ignored until
 
283
                                                // abort this vCard. Further lines will be ignored until
284
284
                                                // we get to another BEGIN:VCARD line.
285
285
                                                vcard = null;
286
286
                                        }
723
723
                                        parseLABEL( name_param_parts, complete_value );
724
724
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "NOTE" ) )
725
725
                                        parseNOTE( name_param_parts, complete_value );
726
 
                                else if( name_param_parts[ 0 ].equalsIgnoreCase( "BDAY" ) )
727
 
                                        parseBDAY( name_param_parts, complete_value );
728
726
                        }
729
727
                }
730
728
 
754
752
                        {
755
753
                                String str = parts.get( a );
756
754
 
757
 
                                // Look for parts that end in an escape character, but ignore
758
 
                                // the final part.  We've already detected escape chars at the
 
755
                                // look for parts that end in an escape character, but ignore
 
756
                                // the final part. We've already detected escape chars at the
759
757
                                // end of the final part in parseLine() and handled multi-lines
760
758
                                // accordingly.
761
759
                                if( a < parts.size() - 1 &&
1031
1029
                        addNote( unescapeValue( value ) );
1032
1030
                }
1033
1031
 
1034
 
                private void parseBDAY( String[] params, String value )
1035
 
                {
1036
 
                        setBirthday( value );
1037
 
                }
1038
 
 
1039
1032
                public void finaliseVcard()
1040
1033
                        throws ParseException, ContactNotIdentifiableException
1041
1034
                {
1049
1042
 
1050
1043
                /**
1051
1044
                 * Amongst the params, find the value of the first, only, of any with
1052
 
                 * the specified name.
1053
 
                 *
 
1045
                 * the specified name
1054
1046
                 * @param params
1055
1047
                 * @param name
1056
1048
                 * @return a value, or null
1062
1054
                }
1063
1055
 
1064
1056
                /**
1065
 
                 * Amongst the params, find the values of any with the specified name.
1066
 
                 *
 
1057
                 * Amongst the params, find the values of any with the specified name
1067
1058
                 * @param params
1068
1059
                 * @param name
1069
1060
                 * @return an array of values, or null
1085
1076
                }
1086
1077
 
1087
1078
                /**
1088
 
                 * Amongst the params, return any type values present.  For v2.1 vCards,
1089
 
                 * those types are just parameters.  For v3.0, they are prefixed with
1090
 
                 * "TYPE=".  There may also be multiple type parameters.
1091
 
                 *
 
1079
                 * Amongst the params, return any type values present. For v2.1 vCards,
 
1080
                 * those types are just parameters. For v3.0, they are prefixed with
 
1081
                 * "TYPE=". There may also be multiple type parameters.
1092
1082
                 * @param params an array of params to look for types in
1093
1083
                 * @param valid_types an list of upper-case type values to look for
1094
1084
                 * @return a set of present type values
1146
1136
                                else if( ch == '=' && i == in.limit() - 1 )
1147
1137
                                {
1148
1138
                                        // we found a '=' at the end of a line signifying a multi-
1149
 
                                        // line string, so we don't add it
 
1139
                                        // line string, so we don't add it.
1150
1140
                                        another = true;
1151
1141
                                        continue;
1152
1142
                                }