(root)/android/import-contacts
» Revision
117
(compared to revision 102)
: src/am/ed/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/am/ed/importcontacts/VcardImporter.java
- browse files at revision 117
- compare with another revision
- download diff
- download tarball
- view history from revision 117
- Committer: Tim Marston
- Date: 2016-03-28 18:18:11 UTC
- Revision ID: tim@ed.am-20160328181811-as61lllmvnv8e5os
handle vcards with missing vesion lines (treat as v2.1)
- files added:
- res/drawable/family_pic.jpg
- files removed:
- res/drawable/family_pic.png
- files modified:
- AndroidManifest.xml
added
removed
src/am/ed/importcontacts/VcardImporter.java
45
45
import java.util.regex.Matcher;
46
46
import java.util.regex.Pattern;
47
47
48
import android.annotation.SuppressLint;
49
48
import android.content.SharedPreferences;
49
import android.os.Environment;
50
50
51
51
public class VcardImporter extends Importer
52
52
{
58
58
super( doit );
59
59
}
60
60
61
@SuppressLint( "SdCardPath" )
62
61
@Override
63
62
protected void onImport() throws AbortImportException
64
63
{
71
70
File[] files = null;
72
71
try
73
72
{
73
// check SD card is mounted
74
String state = Environment.getExternalStorageState();
75
if( !Environment.MEDIA_MOUNTED.equals( state ) &&
76
!Environment.MEDIA_MOUNTED_READ_ONLY.equals( state ) )
77
{
78
showError( R.string.error_nosdcard );
79
}
80
74
81
// open directory
75
String path = "/sdcard" + prefs.getString( "location", "/" );
76
File file = new File( path );
82
File file = new File( Environment.getExternalStorageDirectory(),
83
prefs.getString( "location", "/" ) );
77
84
if( !file.exists() )
78
85
showError( R.string.error_locationnotfound );
79
86
83
90
// get files
84
91
class VCardFilter implements FilenameFilter {
85
92
public boolean accept( File dir, String name ) {
86
return name.toLowerCase( Locale.US ).endsWith( ".vcf" );
93
return name.toLowerCase( Locale.ENGLISH )
94
.endsWith( ".vcf" );
87
95
}
88
96
}
89
97
files = file.listFiles( new VCardFilter() );
228
236
importContact( vcard );
229
237
}
230
238
catch( Vcard.ParseException e ) {
231
if( !showContinue(
239
showContinueOrAbort(
232
240
getText( R.string.error_vcf_parse ).toString()
233
241
+ fileName +
234
242
getText( R.string.error_vcf_parse_line ).toString()
235
+ cli.getLineNumber() + ":\n" + e.getMessage() ) )
236
{
237
finish( ACTION_ABORT );
238
}
239
else
240
skipContact();
243
+ cli.getLineNumber() + ":\n" + e.getMessage() );
244
skipContact();
241
245
}
242
246
catch( ContactData.ContactNotIdentifiableException e ) {
243
if( !showContinue(
247
showContinueOrAbort(
244
248
getText( R.string.error_vcf_parse ).toString()
245
249
+ fileName +
246
250
getText( R.string.error_vcf_parse_line ).toString()
247
251
+ vcard_start_line + ":\n" + getText(
248
R.string.error_vcf_notenoughinfo ).toString()
249
) )
250
{
251
finish( ACTION_ABORT );
252
}
253
else
254
skipContact();
252
R.string.error_vcf_notenoughinfo ).toString() );
253
skipContact();
254
}
255
catch( Vcard.SkipImportException e ) {
256
skipContact();
255
257
}
256
258
257
259
// discard this vcard
265
267
}
266
268
catch( Vcard.ParseException e ) {
267
269
skipContact();
268
if( !showContinue(
270
showContinueOrAbort(
269
271
getText( R.string.error_vcf_parse ).toString()
270
272
+ fileName +
271
273
getText( R.string.error_vcf_parse_line ).toString()
272
+ cli.getLineNumber() + "\n" + e.getMessage() ) )
273
{
274
finish( ACTION_ABORT );
275
}
274
+ cli.getLineNumber() + "\n" + e.getMessage() );
276
275
277
276
// Although we're continuing, we still need to abort
278
277
// this vCard. Further lines will be ignored until we
609
608
) );
610
609
boolean is_interesting_field =
611
610
interesting_fields.contains(
612
name_param_parts[ 0 ].toUpperCase( Locale.US ) );
611
name_param_parts[ 0 ].toUpperCase( Locale.ENGLISH ) );
613
612
614
613
// parse encoding parameter
615
614
String encoding = checkParam( name_param_parts, "ENCODING" );
616
615
if( encoding != null )
617
encoding = encoding.toUpperCase( Locale.US );
616
encoding = encoding.toUpperCase( Locale.ENGLISH );
618
617
if( is_interesting_field && encoding != null &&
619
618
!encoding.equalsIgnoreCase( "8BIT" ) &&
620
619
!encoding.equalsIgnoreCase( "QUOTED-PRINTABLE" ) )
626
625
// parse charset parameter
627
626
String charset = checkParam( name_param_parts, "CHARSET" );
628
627
if( charset != null )
629
charset = charset.toUpperCase( Locale.US );
628
charset = charset.toUpperCase( Locale.ENGLISH );
630
629
if( charset != null &&
631
630
!charset.equalsIgnoreCase( "US-ASCII" ) &&
632
631
!charset.equalsIgnoreCase( "ASCII" ) &&
1039
1038
}
1040
1039
1041
1040
public void finaliseVcard()
1042
throws ParseException, ContactNotIdentifiableException
1041
throws ParseException, ContactNotIdentifiableException,
1042
SkipImportException, AbortImportException
1043
1043
{
1044
// missing version (and data is present)
1045
if( _version == null && _content_lines != null )
1046
throw new ParseException( R.string.error_vcf_malformed );
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
}
1047
1052
1048
1053
// finalise the parent class
1049
1054
finalise();
1108
1113
// this is in the specs!)
1109
1114
String[] parts = type_params[ a ].split( "," );
1110
1115
for( int i = 0; i < parts.length; i++ ) {
1111
String ucpart = parts[ i ].toUpperCase( Locale.US );
1116
String ucpart = parts[ i ].toUpperCase( Locale.ENGLISH );
1112
1117
if( valid_types.contains( ucpart ) )
1113
1118
types.add( ucpart );
1114
1119
}
1117
1122
// get 2.1-style type param
1118
1123
if( _version.equals( "2.1" ) ) {
1119
1124
for( int i = 1; i < params.length; i++ ) {
1120
String ucparam = params[ i ].toUpperCase( Locale.US );
1125
String ucparam = params[ i ].toUpperCase( Locale.ENGLISH );
1121
1126
if( valid_types.contains( ucparam ) )
1122
1127
types.add( ucparam );
1123
1128
}
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480