/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/Merge.java

  • Committer: edam
  • Date: 2011-03-19 20:33:09 UTC
  • Revision ID: edam@waxworlds.org-20110319203309-5dzfyqrxwk94jtin
- formatting: removed some double-indents on overrunning lines
- updated TODO and NEWS
- rewrote central logic of parser so it makes more sense, looks nicer and has a small optimisation (getting name and params from line only when necessary)
- optimised unnecessary mutliple converting of lines to US-ASCII
- re-wrote line extraction from vcards so that we can lookahead for v3 folded lines
- added support for v3 folded lines

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/edam/importcontacts/Merge.java
30
30
public class Merge extends WizardActivity
31
31
{
32
32
        @Override
33
 
        protected void onCreate( Bundle saved_instance_state )
 
33
        protected void onCreate( Bundle savedInstanceState )
34
34
        {
35
35
                setContentView( R.layout.merge );
36
 
                super.onCreate( saved_instance_state );
 
36
                super.onCreate( savedInstanceState );
37
37
 
38
38
                setNextActivity( Doit.class );
39
39
        }