/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/importcontacts/VCFImporter.java

  • Committer: edam
  • Date: 2009-01-11 12:58:54 UTC
  • Revision ID: edam@waxworlds.org-20090111125854-u8ofzso4jatk12me
- added "all done" message
- rewrote Importer.finish() to make the exit process more consistent
- moved Doit's message definitions to Doit
- ensure the importer is destroyed in Doit.onPause()
- only show the toaster popup if a) there is an importer to abort, and b) the abort actually did something (i.e., it's not already aborted)
- bugfix: added some checks for abortion to the Importer after wait()ing after a dialog. Importer.wake() now alsy does a notify() to break out of dialog waits.
- also, made Importer.checkAbort() protected, so it can be checked from specific importers as desired

Show diffs side-by-side

added added

removed removed

175
175
                                                if( !showContinue(
176
176
                                                                getText( R.string.error_vcf_parse ).toString()
177
177
                                                                + fileName + "\n" + e.getMessage() ) )
178
 
                                                        abort();
 
178
                                                        finish( ACTION_ABORT );
179
179
                                        }
180
180
                                        catch( VCard.SkipContactException e ) {
181
181
                                                skipContact();
194
194
                                                if( !showContinue(
195
195
                                                                getText( R.string.error_vcf_parse ).toString()
196
196
                                                                + fileName + "\n" + e.getMessage() ) )
197
 
                                                        abort();
 
197
                                                        finish( ACTION_ABORT );
198
198
 
199
199
                                                // although we're continuing, we still need to abort
200
200
                                                // this vCard. Further lines will be ignored until we