/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-07-19 15:57:39 UTC
  • Revision ID: tim@ed.am-20130719155739-50w182nof760psos
Tags: 1.3.3
bump version no. to 1.3.3

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 2011 Tim Marston <tim@ed.am>
 
4
 * Copyright (C) 2009 to 2013 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 );
726
728
                        }
727
729
                }
728
730
 
752
754
                        {
753
755
                                String str = parts.get( a );
754
756
 
755
 
                                // look for parts that end in an escape character, but ignore
756
 
                                // the final part. We've already detected escape chars at the
 
757
                                // Look for parts that end in an escape character, but ignore
 
758
                                // the final part.  We've already detected escape chars at the
757
759
                                // end of the final part in parseLine() and handled multi-lines
758
760
                                // accordingly.
759
761
                                if( a < parts.size() - 1 &&
1029
1031
                        addNote( unescapeValue( value ) );
1030
1032
                }
1031
1033
 
 
1034
                private void parseBDAY( String[] params, String value )
 
1035
                {
 
1036
                        setBirthday( value );
 
1037
                }
 
1038
 
1032
1039
                public void finaliseVcard()
1033
1040
                        throws ParseException, ContactNotIdentifiableException
1034
1041
                {
1042
1049
 
1043
1050
                /**
1044
1051
                 * Amongst the params, find the value of the first, only, of any with
1045
 
                 * the specified name
 
1052
                 * the specified name.
 
1053
                 *
1046
1054
                 * @param params
1047
1055
                 * @param name
1048
1056
                 * @return a value, or null
1054
1062
                }
1055
1063
 
1056
1064
                /**
1057
 
                 * Amongst the params, find the values of any with the specified name
 
1065
                 * Amongst the params, find the values of any with the specified name.
 
1066
                 *
1058
1067
                 * @param params
1059
1068
                 * @param name
1060
1069
                 * @return an array of values, or null
1076
1085
                }
1077
1086
 
1078
1087
                /**
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.
 
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
                 *
1082
1092
                 * @param params an array of params to look for types in
1083
1093
                 * @param valid_types an list of upper-case type values to look for
1084
1094
                 * @return a set of present type values
1136
1146
                                else if( ch == '=' && i == in.limit() - 1 )
1137
1147
                                {
1138
1148
                                        // we found a '=' at the end of a line signifying a multi-
1139
 
                                        // line string, so we don't add it.
 
1149
                                        // line string, so we don't add it
1140
1150
                                        another = true;
1141
1151
                                        continue;
1142
1152
                                }