/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-10 19:16:04 UTC
  • Revision ID: edam@waxworlds.org-20090110191604-24xjo5brlvislhqw
- added toaster message about import abortion in onPause()
- added TODO list

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/importcontacts/VCFImporter.java
1
 
/*
2
 
 * VCFImporter.java
3
 
 *
4
 
 * Copyright (C) 2009 Tim Marston <edam@waxworlds.org>
5
 
 *
6
 
 * This file is part of the Import Contacts program (hereafter referred
7
 
 * to as "this program"). For more information, see
8
 
 * http://www.waxworlds.org/edam/software/android/import-contacts
9
 
 *
10
 
 * This program is free software: you can redistribute it and/or modify
11
 
 * it under the terms of the GNU General Public License as published by
12
 
 * the Free Software Foundation, either version 3 of the License, or
13
 
 * (at your option) any later version.
14
 
 *
15
 
 * This program is distributed in the hope that it will be useful,
16
 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 
 * GNU General Public License for more details.
19
 
 *
20
 
 * You should have received a copy of the GNU General Public License
21
 
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
 
 */
23
 
 
24
1
package org.waxworlds.importcontacts;
25
2
 
26
3
import java.io.BufferedReader;
198
175
                                                if( !showContinue(
199
176
                                                                getText( R.string.error_vcf_parse ).toString()
200
177
                                                                + fileName + "\n" + e.getMessage() ) )
201
 
                                                        finish( ACTION_ABORT );
 
178
                                                        abort();
202
179
                                        }
203
180
                                        catch( VCard.SkipContactException e ) {
204
181
                                                skipContact();
217
194
                                                if( !showContinue(
218
195
                                                                getText( R.string.error_vcf_parse ).toString()
219
196
                                                                + fileName + "\n" + e.getMessage() ) )
220
 
                                                        finish( ACTION_ABORT );
 
197
                                                        abort();
221
198
 
222
199
                                                // although we're continuing, we still need to abort
223
200
                                                // this vCard. Further lines will be ignored until we