(root)/android/import-contacts
» Revision
44
(compared to revision 46)
: src/org/waxworlds/edam/importcontacts/VcardImporter.java
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
- browse files at revision 44
- compare with another revision
- download diff
- download tarball
- view history from revision 44
- Committer: edam
- Date: 2011-05-30 19:20:17 UTC
- Revision ID: edam@waxworlds.org-20110530192017-5c09k4kgpov02gja
- added checks for Doit.this == null when handling dialog buttons (I managed to abort an import as a duplicate contacts dialog was shown, but can't reproduce it now)
- added line no.s to vcard parsing errors
- update progress bar after a contact is imported, not before
- fixed bug introduced in last commit where a contacts were imported after finaliseVcard()ing failed
- don't show unknown encoding errors for vcard fields that we don't care about (which ignores base64 encoded photos, for example)
- added line no.s to vcard parsing errors
- update progress bar after a contact is imported, not before
- fixed bug introduced in last commit where a contacts were imported after finaliseVcard()ing failed
- don't show unknown encoding errors for vcard fields that we don't care about (which ignores base64 encoded photos, for example)
added
removed
src/org/waxworlds/edam/importcontacts/VcardImporter.java
362
362
private class Vcard extends ContactData
363
363
{
364
364
private final static int NAMELEVEL_NONE = 0;
365
private final static int NAMELEVEL_N = 1;
366
private final static int NAMELEVEL_FN = 2;
365
private final static int NAMELEVEL_FN = 1;
366
private final static int NAMELEVEL_N = 2;
367
367
368
368
private final static int MULTILINE_NONE = 0;
369
369
private final static int MULTILINE_ENCODED = 1; // v2.1 quoted-printable
609
609
_parser_multiline_state = MULTILINE_ENCODED;
610
610
}
611
611
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
{
612
// convert 8-bit ASCII charset to US-ASCII
613
if( charset == null || charset.equals( "ASCII" ) ) {
619
614
value = transcodeAsciiToUtf8( value );
615
charset = "UTF-8";
620
616
}
621
617
622
// process charset (value is now in UTF-8)
618
// process charset
623
619
String string_value;
624
620
try {
625
621
string_value = new String( value.array(), value.position(),
626
value.limit() - value.position(), "UTF-8" );
622
value.limit() - value.position(), charset );
627
623
} catch( UnsupportedEncodingException e ) {
628
624
throw new ParseException( R.string.error_vcf_charset );
629
625
}
694
690
return ( count & 1 ) == 1;
695
691
}
696
692
697
private String[] splitValueByCharacter( String value, char character )
693
private String[] splitValueBySemicolon( String value )
698
694
{
699
// split string in to parts by specified character
695
// split string in to parts by semicolon
700
696
ArrayList< String > parts = new ArrayList< String >(
701
Arrays.asList( value.split( "" + character ) ) );
697
Arrays.asList( value.split( ";" ) ) );
702
698
703
699
// go through parts
704
700
for( int a = 0; a < parts.size(); a++ )
712
708
if( a < parts.size() - 1 &&
713
709
doesStringEndInAnEscapeChar( str ) )
714
710
{
715
// append the escaped character, join the next part to this
716
// part and remove the next part
711
// join the next part to this part and remove the next part
717
712
parts.set( a, str.substring( 0, str.length() - 1 ) +
718
character + parts.get( a + 1 ) );
713
';' + parts.get( a + 1 ) );
719
714
parts.remove( a + 1 );
720
715
721
716
// re-visit this part
732
727
return parts.toArray( ret );
733
728
}
734
729
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();
776
}
777
778
730
private void parseN( String[] params, String value )
779
731
{
780
732
// already got a better name?
781
733
if( _name_level >= NAMELEVEL_N ) return;
782
734
783
735
// get name parts
784
String[] name_parts = splitValueByCharacter( value, ';' );
736
String[] name_parts = splitValueBySemicolon( value );
785
737
786
738
// build name
787
739
value = "";
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
}
740
if( name_parts.length > 1 && name_parts[ 1 ].length() > 0 )
741
value += name_parts[ 1 ];
742
if( name_parts.length > 0 && name_parts[ 0 ].length() > 0 )
743
value += ( value.length() == 0? "" : " " ) + name_parts[ 0 ];
803
744
804
745
// set name
805
setName( unescapeValue( value ) );
746
setName( value );
806
747
_name_level = NAMELEVEL_N;
807
748
}
808
749
812
753
if( _name_level >= NAMELEVEL_FN ) return;
813
754
814
755
// set name
815
setName( unescapeValue( value ) );
756
setName( value );
816
757
_name_level = NAMELEVEL_FN;
817
758
}
818
759
819
760
private void parseORG( String[] params, String value )
820
761
{
821
762
// get org parts
822
String[] org_parts = splitValueByCharacter( value, ';' );
763
String[] org_parts = splitValueBySemicolon( value );
823
764
if( org_parts == null || org_parts.length < 1 ) return;
824
765
825
766
// build organisation name
827
768
String.valueOf( org_parts[ 0 ] ) );
828
769
for( int a = 1; a < org_parts.length; a++ )
829
770
builder.append( ", " ).append( org_parts[ a ] );
830
String organisation = unescapeValue( builder.toString() );
771
String organisation = builder.toString();
831
772
832
773
// set organisation name (using a title we've previously found)
833
774
addOrganisation( organisation, _cached_title, true );
844
785
845
786
private void parseTITLE( String[] params, String value )
846
787
{
847
value = unescapeValue( value );
848
849
788
// if we previously had an organisation, look it up and append this
850
789
// title to it
851
790
if( _cached_organisation != null && hasOrganisations() ) {
908
847
else
909
848
type = Contacts.ContactMethods.TYPE_HOME;
910
849
911
addEmail( unescapeValue( value ), type, is_preferred );
850
addEmail( value, type, is_preferred );
912
851
}
913
852
914
853
private void parseADR( String[] params, String value )
915
854
{
916
855
// get address parts
917
String[] adr_parts = splitValueByCharacter( value, ';' );
856
String[] adr_parts = splitValueBySemicolon( value );
918
857
919
858
// build address
920
859
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
}
860
for( int a = 0; a < adr_parts.length; a++ ) {
861
if( value.length() > 0 ) value += "\n";
862
value += adr_parts[ a ].trim();
863
}
934
864
935
865
Set< String > types = extractTypes( params, Arrays.asList(
936
866
"PREF", "WORK", "HOME", "INTERNET" ) );
942
872
else
943
873
type = Contacts.ContactMethods.TYPE_HOME;
944
874
945
addAddress( unescapeValue( value ), type );
875
addAddress( value, type );
946
876
}
947
877
948
878
public void finaliseVcard()
956
886
finalise();
957
887
}
958
888
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
*/
966
889
private String checkParam( String[] params, String name )
967
890
{
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
891
Pattern p = Pattern.compile(
983
892
"^" + name + "[ \\t]*=[ \\t]*(\"?)(.*)\\1$" );
984
893
for( int i = 0; i < params.length; i++ ) {
985
894
Matcher m = p.matcher( params[ i ] );
986
895
if( m.matches() )
987
ret.add( m.group( 2 ) );
896
return m.group( 2 );
988
897
}
989
990
return (String[]) ret.toArray( new String[ ret.size() ] );
898
return null;
991
899
}
992
900
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
*/
1001
901
private Set< String > extractTypes( String[] params,
1002
902
List< String > valid_types )
1003
903
{
1004
904
HashSet< String > types = new HashSet< String >();
1005
905
1006
906
// get 3.0-style TYPE= param
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( "," );
907
String type_param;
908
if( ( type_param = checkParam( params, "TYPE" ) ) != null ) {
909
String[] parts = type_param.split( "," );
1013
910
for( int i = 0; i < parts.length; i++ )
1014
911
if( valid_types.contains( parts[ i ] ) )
1015
912
types.add( parts[ i ] );
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480