/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-07-13 17:41:49 UTC
  • Revision ID: edam@waxworlds.org-20100713174149-pynofo872e5ug6d4
- added compatibility with 8BIT encoding

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/edam/importcontacts/Merge.java
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 org.waxworlds.edam.importcontacts;
25
25
 
26
26
import android.content.SharedPreferences;
27
27
import android.os.Bundle;
35
35
                setContentView( R.layout.merge );
36
36
                super.onCreate( savedInstanceState );
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