/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/ConfigureVCF.java

  • Committer: edam
  • Date: 2010-10-28 15:49:21 UTC
  • Revision ID: edam@waxworlds.org-20101028154921-98svlxlpno3cpzb8
- added file chooser
- changed file/dir entry box for a button that opens the file chooser
- added dialog to ask if you want to select a dir to scan or a file
- fixed bug where you could abort as dialog opened and the dialog wasn't cancelled
- fixed crash where you could abort as the merge prompt opened and it would try to use the just-destroyed importer
- fixed bug where closing the application at the end would show "aborted!" erroniously

Show diffs side-by-side

added added

removed removed

61
61
                setNextActivity( Merge.class );
62
62
 
63
63
                // create file chooser
64
 
                _file_chooser = new FileChooser( this );
 
64
                _file_chooser = new FileChooser();
65
65
                String[] extensions = { "vcf" };
66
66
                _file_chooser.setExtensions( extensions );
67
67
                _file_chooser.setDismissListener(
179
179
                        break;
180
180
 
181
181
                case DIALOG_FILECHOOSER:
182
 
                        ret = _file_chooser.onCreateDialog();
 
182
                        ret = _file_chooser.onCreateDialog( this );
183
183
                        break;
184
184
                }
185
185