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

  • Committer: Tim Marston
  • Date: 2016-03-28 18:18:11 UTC
  • Revision ID: tim@ed.am-20160328181811-as61lllmvnv8e5os
handle vcards with missing vesion lines (treat as v2.1)

Show diffs side-by-side

added added

removed removed

src/am/ed/importcontacts/Merge.java
1
1
/*
2
2
 * Merge.java
3
3
 *
4
 
 * Copyright (C) 2009 Tim Marston <edam@waxworlds.org>
 
4
 * Copyright (C) 2009 Tim Marston <tim@ed.am>
5
5
 *
6
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
 
7
 * to as "this program").  For more information, see
 
8
 * http://ed.am/dev/android/import-contacts
9
9
 *
10
10
 * This program is free software: you can redistribute it and/or modify
11
11
 * it under the terms of the GNU General Public License as published by
21
21
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
22
 */
23
23
 
24
 
package org.waxworlds.importcontacts;
 
24
package am.ed.importcontacts;
25
25
 
26
26
import android.content.SharedPreferences;
27
27
import android.os.Bundle;
30
30
public class Merge extends WizardActivity
31
31
{
32
32
        @Override
33
 
        protected void onCreate( Bundle savedInstanceState )
 
33
        protected void onCreate( Bundle saved_instance_state )
34
34
        {
35
35
                setContentView( R.layout.merge );
36
 
                super.onCreate( savedInstanceState );
 
36
                super.onCreate( saved_instance_state );
37
37
 
38
 
                setNextState( ImportContacts.STATE_DOIT );
 
38
                setNextActivity( Doit.class );
39
39
        }
40
40
 
41
41
        @Override
47
47
 
48
48
                // radio button selection
49
49
                RadioGroup rg = (RadioGroup)findViewById( R.id.merge_setting );
50
 
                editor.putInt( "merge_setting", rg.getCheckedRadioButtonId() );
 
50
                editor.putInt( "merge_setting",
 
51
                        Doit.convertIdToAction( rg.getCheckedRadioButtonId() ) );
51
52
 
52
53
                editor.commit();
53
54
        }
61
62
 
62
63
                // radio button selection
63
64
                RadioGroup rg = (RadioGroup)findViewById( R.id.merge_setting );
64
 
                rg.check( prefs.getInt( "merge_setting", R.id.merge_prompt ) );
 
65
                rg.check( Doit.convertActionToId(
 
66
                        prefs.getInt( "merge_setting", Doit.ACTION_PROMPT ) ) );
65
67
        }
66
68
 
67
69