To get this branch, use:
bzr branch
http://bzr.ed.am/android/import-contacts
« back to all changes in this revision
Viewing changes to res/layout/mergeprompt.xml
- 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)
- 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)
- files added:
- NEWS
- gen
- gen/org
- gen/org/waxworlds
- gen/org/waxworlds/edam
- gen/org/waxworlds/edam/importcontacts
- src/org/waxworlds/edam
- files removed:
- src/org/waxworlds/importcontacts/ImportContacts.java
- files renamed:
- src/org/waxworlds/importcontacts/R.java => gen/org/waxworlds/edam/importcontacts/R.java
- res/layout/import_vcf.xml => res/layout/configure_vcf.xml
- src/org/waxworlds/importcontacts/ => src/org/waxworlds/edam/importcontacts/
- src/org/waxworlds/importcontacts/ImportVCF.java => src/org/waxworlds/edam/importcontacts/ConfigureVCF.java
- src/org/waxworlds/importcontacts/VCFImporter.java => src/org/waxworlds/edam/importcontacts/VcardImporter.java
- files modified:
- .classpath
added
removed
res/layout/mergeprompt.xml
