/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/org/waxworlds/edam/importcontacts/Intro.java

  • 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)

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/edam/importcontacts/Intro.java
33
33
public class Intro extends WizardActivity {
34
34
 
35
35
        @Override
36
 
        protected void onCreate( Bundle savedInstanceState )
 
36
        protected void onCreate( Bundle saved_instance_state )
37
37
        {
38
38
                setContentView( R.layout.intro );
39
 
                super.onCreate( savedInstanceState );
 
39
                super.onCreate( saved_instance_state );
40
40
 
41
41
                setNextActivity( ConfigureVCF.class );
42
42
 
43
43
                TextView link = (TextView)findViewById( R.id.intro_link );
44
 
                Linkify.addLinks( link, Pattern.compile( "The Import Contacts homepage" ),
 
44
                Linkify.addLinks( link,
 
45
                        Pattern.compile( "The Import Contacts homepage" ),
45
46
                        "", null, new Linkify.TransformFilter() {
46
47
                                public String transformUrl( Matcher match, String url ) {
47
48
                                        return "http://www.waxworlds.org/edam/software/android/import-contacts";