/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

48
48
                // radio button selection
49
49
                RadioGroup rg = (RadioGroup)findViewById( R.id.merge_setting );
50
50
                editor.putInt( "merge_setting",
51
 
                                Doit.convertIdToAction( rg.getCheckedRadioButtonId() ) );
 
51
                        Doit.convertIdToAction( rg.getCheckedRadioButtonId() ) );
52
52
 
53
53
                editor.commit();
54
54
        }
63
63
                // radio button selection
64
64
                RadioGroup rg = (RadioGroup)findViewById( R.id.merge_setting );
65
65
                rg.check( Doit.convertActionToId(
66
 
                                prefs.getInt( "merge_setting", Doit.ACTION_PROMPT ) ) );
 
66
                        prefs.getInt( "merge_setting", Doit.ACTION_PROMPT ) ) );
67
67
        }
68
68
 
69
69