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

  • Committer: edam
  • Date: 2010-10-17 18:43:13 UTC
  • Revision ID: edam@waxworlds.org-20101017184313-y2m6gsdzctjq5wtl
- changed case on charset and encoding warning strings (it looked bad)
- properly handle quoted-printable unencoding (including multi-line values)
- ignore blank lines in vCard
- ignore empty properties in vCard

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/edam/importcontacts/Merge.java
1
 
package org.waxworlds.importcontacts;
 
1
/*
 
2
 * Merge.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
package org.waxworlds.edam.importcontacts;
2
25
 
3
26
import android.content.SharedPreferences;
4
27
import android.os.Bundle;
12
35
                setContentView( R.layout.merge );
13
36
                super.onCreate( savedInstanceState );
14
37
 
15
 
                setNextState( ImportContacts.STATE_DOIT );
 
38
                setNextActivity( Doit.class );
16
39
        }
17
40
 
18
41
        @Override
24
47
 
25
48
                // radio button selection
26
49
                RadioGroup rg = (RadioGroup)findViewById( R.id.merge_setting );
27
 
                editor.putInt( "merge_setting", rg.getCheckedRadioButtonId() );
 
50
                editor.putInt( "merge_setting",
 
51
                                Doit.convertIdToAction( rg.getCheckedRadioButtonId() ) );
28
52
 
29
53
                editor.commit();
30
54
        }
38
62
 
39
63
                // radio button selection
40
64
                RadioGroup rg = (RadioGroup)findViewById( R.id.merge_setting );
41
 
                rg.check( prefs.getInt( "merge_setting", R.id.merge_prompt ) );
 
65
                rg.check( Doit.convertActionToId(
 
66
                                prefs.getInt( "merge_setting", Doit.ACTION_PROMPT ) ) );
42
67
        }
43
68
 
44
69