/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-13 06:35:26 UTC
  • Revision ID: edam@waxworlds.org-20090113063526-l9t1s9git4bav60a
- new contact's phone numebrs and email addresses are added to the caches after those contacts are updated to account for the situation where the same contact is imported again from another file (or the contact exists twice in the same file!?)

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
 
1
24
package org.waxworlds.importcontacts;
2
25
 
3
26
import java.io.BufferedReader;
175
198
                                                if( !showContinue(
176
199
                                                                getText( R.string.error_vcf_parse ).toString()
177
200
                                                                + fileName + "\n" + e.getMessage() ) )
178
 
                                                        abort();
 
201
                                                        finish( ACTION_ABORT );
179
202
                                        }
180
203
                                        catch( VCard.SkipContactException e ) {
181
204
                                                skipContact();
194
217
                                                if( !showContinue(
195
218
                                                                getText( R.string.error_vcf_parse ).toString()
196
219
                                                                + fileName + "\n" + e.getMessage() ) )
197
 
                                                        abort();
 
220
                                                        finish( ACTION_ABORT );
198
221
 
199
222
                                                // although we're continuing, we still need to abort
200
223
                                                // this vCard. Further lines will be ignored until we