/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 gen/org/waxworlds/edam/importcontacts/R.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

92
92
        public static final int error_ok=0x7f040030;
93
93
        public static final int error_title=0x7f04002f;
94
94
        public static final int error_unabletoaddcontact=0x7f04003a;
95
 
        public static final int error_vcf_charset=0x7f04003f;
96
 
        public static final int error_vcf_encoding=0x7f040040;
97
 
        public static final int error_vcf_malformed=0x7f04003c;
98
 
        public static final int error_vcf_notenoughinfo=0x7f04003d;
 
95
        public static final int error_vcf_charset=0x7f040040;
 
96
        public static final int error_vcf_encoding=0x7f040041;
 
97
        public static final int error_vcf_malformed=0x7f04003d;
 
98
        public static final int error_vcf_notenoughinfo=0x7f04003e;
99
99
        public static final int error_vcf_parse=0x7f04003b;
100
 
        public static final int error_vcf_version=0x7f04003e;
 
100
        public static final int error_vcf_parse_line=0x7f04003c;
 
101
        public static final int error_vcf_version=0x7f04003f;
101
102
        public static final int filechooser_current_dir=0x7f04000f;
102
103
        public static final int filechooser_current_file=0x7f040010;
103
104
        public static final int filechooser_ok=0x7f040011;