/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: 2011-05-30 15:33:01 UTC
  • Revision ID: edam@waxworlds.org-20110530153301-oor6ci9b3hf9clul
- refactored some code to do with how contacts are imported
- Vcards (and ContactData) instances now generate a CacheIdentifier when they are finalised so that ContactData instances that do not have enough information to identify them can be discovered then
- importContact() now calls the private method checkForDuplicate(), renamed from isImportRequired(), and return if it is not
- importContact() and checkForDuplicate() now use the ContactData's generated CacheIdentifier

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/edam/importcontacts/Merge.java
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
38
                setNextActivity( Doit.class );
39
39
        }
48
48
                // radio button selection
49
49
                RadioGroup rg = (RadioGroup)findViewById( R.id.merge_setting );
50
50
                editor.putInt( "merge_setting",
51
 
                                Doit.convertIdToAction( rg.getCheckedRadioButtonId() ) );
 
51
                        Doit.convertIdToAction( rg.getCheckedRadioButtonId() ) );
52
52
 
53
53
                editor.commit();
54
54
        }
63
63
                // radio button selection
64
64
                RadioGroup rg = (RadioGroup)findViewById( R.id.merge_setting );
65
65
                rg.check( Doit.convertActionToId(
66
 
                                prefs.getInt( "merge_setting", Doit.ACTION_PROMPT ) ) );
 
66
                        prefs.getInt( "merge_setting", Doit.ACTION_PROMPT ) ) );
67
67
        }
68
68
 
69
69