/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: 2010-12-11 23:57:07 UTC
  • Revision ID: edam@waxworlds.org-20101211235707-czyw48tt3hcopuwf
- read vCard files in as raw bytes now and convert to string only tentatively to check for version no.s and property names and params
- ASCII is now (correctly) the default charset
- added conversion from 8-bit ASCII to UTF-8 (not used on 7-bit US-ASCII) which works on raw bytes, not chars
- unencode quoted-printable now works on raw bytes, not chars

Show diffs side-by-side

added added

removed removed

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