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

  • Committer: edam
  • Date: 2010-07-04 14:44:48 UTC
  • Revision ID: edam@waxworlds.org-20100704144448-1m30v811opup20fs
- got rid of the pretend ImportContacts activity alltogether (and made the Intro activity the startup one)
- massively simplified the WizzardActivity class so it works propperly
- moved all code to org.waxworlds.edam
- added an "aborted" message when the importion is aborted
- simplified the 3 actions the worker thread can take when stopping (only 2 were actualy used) to "aborted" or "alldone"
- changed intro message to match website
- bugfix: don't blow up when the My Contacts group is missing

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/edam/importcontacts/Doit.java
1
1
/*
2
2
 * Doit.java
3
3
 *
4
 
 * Copyright (C) 2009 Tim Marston <tim@ed.am>
 
4
 * Copyright (C) 2009 Tim Marston <edam@waxworlds.org>
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://ed.am/dev/android/import-contacts
 
7
 * to as "this program"). For more information, see
 
8
 * http://www.waxworlds.org/edam/software/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 am.ed.importcontacts;
 
24
package org.waxworlds.edam.importcontacts;
25
25
 
26
26
import android.app.AlertDialog;
27
27
import android.app.Dialog;
68
68
        public final static int NEXT_BEGIN = 0;
69
69
        public final static int NEXT_CLOSE = 1;
70
70
 
71
 
        private boolean _started_progress;
72
 
        private int _max_progress;
73
 
        private int _tmp_progress;
 
71
        private boolean _startedProgress;
 
72
        private int _maxProgress;
 
73
        private int _tmpProgress;
74
74
        private int _progress;
75
 
        protected String _dialog_message;
76
 
        private Dialog _merge_prompt_dialog;
77
 
        private boolean _merge_prompt_always_selected;
78
 
        private int _next_action;
79
 
        private int _current_dialog_id;
 
75
        protected String _dialogMessage;
 
76
        private Dialog _mergePromptDialog;
 
77
        private boolean _mergePromptAlwaysSelected;
 
78
        private int _nextAction;
 
79
        private int _currentDialogId;
80
80
 
81
 
        private int _count_overwrites;
82
 
        private int _count_creates;
83
 
        private int _count_merges;
84
 
        private int _count_skips;
 
81
        private int _countOverwrites;
 
82
        private int _countCreates;
 
83
        private int _countMerges;
 
84
        private int _countSkips;
85
85
 
86
86
        protected Importer _importer = null;
87
87
 
99
99
                                ( (Button)findViewById( R.id.back ) ).setEnabled( false );
100
100
                                updateNext( NEXT_CLOSE );
101
101
                                findViewById( R.id.doit_abort_disp ).setVisibility(
102
 
                                        View.GONE );
 
102
                                                View.GONE );
103
103
                                break;
104
104
                        case MESSAGE_ABORT:
105
105
                                manualAbort();
106
106
                                break;
107
107
                        case MESSAGE_ERROR:
108
 
                                _dialog_message = (String)msg.obj;
 
108
                                _dialogMessage = (String)msg.obj;
109
109
                                showDialog( DIALOG_ERROR );
110
110
                                break;
111
111
                        case MESSAGE_CONTINUEORABORT:
112
 
                                _dialog_message = (String)msg.obj;
 
112
                                _dialogMessage = (String)msg.obj;
113
113
                                showDialog( DIALOG_CONTINUEORABORT );
114
114
                                break;
115
115
                        case MESSAGE_SETPROGRESSMESSAGE:
116
116
                                ( (TextView)findViewById( R.id.doit_percentage ) ).
117
 
                                        setText( (String)msg.obj );
 
117
                                                setText( (String)msg.obj );
118
118
                                break;
119
119
                        case MESSAGE_SETMAXPROGRESS:
120
 
                                if( _max_progress > 0 ) {
121
 
                                        if( _tmp_progress == _max_progress - 1 )
122
 
                                                _tmp_progress = (Integer)msg.obj;
123
 
                                        if( _progress == _max_progress - 1 )
 
120
                                if( _maxProgress > 0 ) {
 
121
                                        if( _tmpProgress == _maxProgress - 1 )
 
122
                                                _tmpProgress = (Integer)msg.obj;
 
123
                                        if( _progress == _maxProgress - 1 )
124
124
                                                _progress = (Integer)msg.obj;
125
125
                                }
126
 
                                _max_progress = (Integer)msg.obj;
 
126
                                _maxProgress = (Integer)msg.obj;
127
127
                                updateProgress();
128
128
                                break;
129
129
                        case MESSAGE_SETTMPPROGRESS:
130
 
                                _tmp_progress = (Integer)msg.obj;
 
130
                                _tmpProgress = (Integer)msg.obj;
131
131
                                updateProgress();
132
132
                                break;
133
133
                        case MESSAGE_SETPROGRESS:
134
 
                                _started_progress = true;
 
134
                                _startedProgress = true;
135
135
                                _progress = (Integer)msg.obj;
136
136
                                updateProgress();
137
137
                                break;
138
138
                        case MESSAGE_MERGEPROMPT:
139
 
                                _dialog_message = (String)msg.obj;
 
139
                                _dialogMessage = (String)msg.obj;
140
140
                                showDialog( DIALOG_MERGEPROMPT );
141
141
                                break;
142
142
                        case MESSAGE_CONTACTOVERWRITTEN:
143
 
                                _count_overwrites++;
 
143
                                _countOverwrites++;
144
144
                                updateStats();
145
145
                                break;
146
146
                        case MESSAGE_CONTACTCREATED:
147
 
                                _count_creates++;
 
147
                                _countCreates++;
148
148
                                updateStats();
149
149
                                break;
150
150
                        case MESSAGE_CONTACTMERGED:
151
 
                                _count_merges++;
 
151
                                _countMerges++;
152
152
                                updateStats();
153
153
                                break;
154
154
                        case MESSAGE_CONTACTSKIPPED:
155
 
                                _count_skips++;
 
155
                                _countSkips++;
156
156
                                updateStats();
157
157
                                break;
158
158
                        default:
162
162
        }
163
163
 
164
164
        @Override
165
 
        protected void onCreate(Bundle saved_instance_state)
 
165
        protected void onCreate(Bundle savedInstanceState)
166
166
        {
167
167
                setContentView( R.layout.doit );
168
 
                super.onCreate( saved_instance_state );
 
168
                super.onCreate( savedInstanceState );
169
169
 
170
170
                // hide page 2
171
171
                ( findViewById( R.id.doit_page_2 ) ).setVisibility( View.GONE );
178
178
                        }
179
179
                } );
180
180
 
181
 
                _started_progress = false;
182
 
                _max_progress = 0;
183
 
                _tmp_progress = 0;
 
181
                _startedProgress = false;
 
182
                _maxProgress = 0;
 
183
                _tmpProgress = 0;
184
184
                _progress = 0;
185
185
                _handler = new DoitHandler();
186
186
 
187
 
                _count_overwrites = 0;
188
 
                _count_creates = 0;
189
 
                _count_merges = 0;
190
 
                _count_skips = 0;
 
187
                _countOverwrites = 0;
 
188
                _countCreates = 0;
 
189
                _countMerges = 0;
 
190
                _countSkips = 0;
191
191
 
192
192
                updateNext( NEXT_BEGIN );
193
193
 
200
200
        {
201
201
                super.onPause();
202
202
 
 
203
                // close any open dialogs
 
204
                try {
 
205
                        dismissDialog( _currentDialogId );
 
206
                }
 
207
                catch( Exception e ) {
 
208
                }
 
209
 
203
210
                // saving the state of an import sounds complicated! Lets just abort!
204
 
                if( _next_action != NEXT_CLOSE )
205
 
                        manualAbort( true );
 
211
                manualAbort( true );
206
212
        }
207
213
 
208
214
        @Override
217
223
                                .setMessage( "" )
218
224
                                .setPositiveButton( R.string.error_ok,
219
225
                                        new DialogInterface.OnClickListener() {
220
 
                                                public void onClick( DialogInterface dialog,
221
 
                                                        int whichButton )
 
226
                                                public void onClick(DialogInterface dialog,
 
227
                                                        int whichButton)
222
228
                                                {
223
 
                                                        if( Doit.this != null )
224
 
                                                                Doit.this._importer.wake();
 
229
                                                        Doit.this._importer.wake();
225
230
                                                }
226
231
                                        } )
227
 
                                .setOnCancelListener( _dialog_on_cancel_listener )
 
232
                                .setOnCancelListener( _dialogOnCancelListener )
228
233
                                .create();
229
234
                case DIALOG_CONTINUEORABORT:
230
235
                        return new AlertDialog.Builder( this )
233
238
                                .setMessage( "" )
234
239
                                .setPositiveButton( R.string.error_continue,
235
240
                                        new DialogInterface.OnClickListener() {
236
 
                                                public void onClick( DialogInterface dialog,
237
 
                                                        int which_button )
 
241
                                                public void onClick(DialogInterface dialog,
 
242
                                                        int whichButton)
238
243
                                                {
239
 
                                                        if( Doit.this != null )
240
 
                                                                Doit.this._importer.wake(
241
 
                                                                        Importer.RESPONSE_POSITIVE );
 
244
                                                        Doit.this._importer.wake(
 
245
                                                                Importer.RESPONSE_POSITIVE );
242
246
                                                }
243
247
                                        } )
244
248
                                .setNegativeButton( R.string.error_abort,
245
249
                                        new DialogInterface.OnClickListener() {
246
 
                                                public void onClick( DialogInterface dialog,
247
 
                                                        int which_button )
 
250
                                                public void onClick(DialogInterface dialog,
 
251
                                                        int whichButton)
248
252
                                                {
249
 
                                                        if( Doit.this != null )
250
 
                                                                Doit.this._importer.wake(
251
 
                                                                        Importer.RESPONSE_NEGATIVE );
 
253
                                                        Doit.this._importer.wake(
 
254
                                                                Importer.RESPONSE_NEGATIVE );
252
255
                                                }
253
256
                                        } )
254
 
                                .setOnCancelListener( _dialog_on_cancel_listener )
 
257
                                .setOnCancelListener( _dialogOnCancelListener )
255
258
                                .create();
256
259
                case DIALOG_MERGEPROMPT:
257
260
                        // custom layout in an AlertDialog
258
261
                        LayoutInflater factory = LayoutInflater.from( this );
259
 
                        final View dialog_view = factory.inflate(
 
262
                        final View dialogView = factory.inflate(
260
263
                                R.layout.mergeprompt, null );
261
 
                        ( (CheckBox)dialog_view.findViewById( R.id.mergeprompt_always ) ).
 
264
                        ( (CheckBox)dialogView.findViewById( R.id.mergeprompt_always ) ).
262
265
                                setOnCheckedChangeListener(
263
266
                                        new CompoundButton.OnCheckedChangeListener() {
264
 
                                                public void onCheckedChanged(
265
 
                                                        CompoundButton button_view, boolean is_checked )
 
267
                                                public void onCheckedChanged( CompoundButton buttonView,
 
268
                                                        boolean isChecked )
266
269
                                                {
267
 
                                                        if( Doit.this != null )
268
 
                                                                Doit.this._merge_prompt_always_selected =
269
 
                                                                        is_checked;
 
270
                                                        Doit.this._mergePromptAlwaysSelected = isChecked;
270
271
                                                }
271
272
                                        } );
272
 
                        ( (Button)dialog_view.findViewById( R.id.merge_keep ) ).
273
 
                                setOnClickListener( _merge_prompt_button_listener );
274
 
                        ( (Button)dialog_view.findViewById( R.id.merge_overwrite ) ).
275
 
                                setOnClickListener( _merge_prompt_button_listener );
276
 
                        ( (Button)dialog_view.findViewById( R.id.merge_merge ) ).
277
 
                                setOnClickListener( _merge_prompt_button_listener );
278
 
                        ( (Button)dialog_view.findViewById( R.id.abort ) ).
279
 
                                setOnClickListener( _merge_prompt_button_listener );
280
 
                        _merge_prompt_always_selected = false;
 
273
                        ( (Button)dialogView.findViewById( R.id.merge_keep ) ).
 
274
                                setOnClickListener( _mergePromptButtonListener );
 
275
                        ( (Button)dialogView.findViewById( R.id.merge_overwrite ) ).
 
276
                                setOnClickListener( _mergePromptButtonListener );
 
277
                        ( (Button)dialogView.findViewById( R.id.merge_merge ) ).
 
278
                                setOnClickListener( _mergePromptButtonListener );
 
279
                        ( (Button)dialogView.findViewById( R.id.abort ) ).
 
280
                                setOnClickListener( _mergePromptButtonListener );
 
281
                        _mergePromptAlwaysSelected = false;
281
282
                        return new AlertDialog.Builder( this )
282
283
                                .setIcon( R.drawable.alert_dialog_icon )
283
284
                                .setTitle( R.string.mergeprompt_title )
284
 
                                .setView( dialog_view )
285
 
                                .setOnCancelListener( _dialog_on_cancel_listener )
 
285
                                .setView( dialogView )
 
286
                                .setOnCancelListener( _dialogOnCancelListener )
286
287
                                .create();
287
288
                }
288
289
                return null;
289
290
        }
290
291
 
291
 
        private OnClickListener _merge_prompt_button_listener =
292
 
                new OnClickListener()
293
 
        {
 
292
        private OnClickListener _mergePromptButtonListener = new OnClickListener() {
294
293
                public void onClick( View view )
295
294
                {
296
 
                        if( Doit.this == null ) return;
297
 
 
298
295
                        // handle abort
299
296
                        if( view.getId() == R.id.abort )
300
297
                                manualAbort();
301
298
 
302
 
                        // else, response (just check we haven't aborted already!)
303
 
                        else if( Doit.this._importer != null ) {
304
 
                                int response_extra = _merge_prompt_always_selected?
305
 
                                        Importer.RESPONSEEXTRA_ALWAYS : Importer.RESPONSEEXTRA_NONE;
 
299
                        // else, response
 
300
                        else {
 
301
                                int responseExtra = _mergePromptAlwaysSelected?
 
302
                                                Importer.RESPONSEEXTRA_ALWAYS : Importer.RESPONSEEXTRA_NONE;
306
303
                                Doit.this._importer.wake( convertIdToAction( view.getId() ),
307
 
                                        response_extra );
 
304
                                                responseExtra );
308
305
                        }
309
306
 
310
307
                        // close dialog and free (don't keep a reference)
311
 
                        Doit.this._merge_prompt_dialog.dismiss();
312
 
                        Doit.this._merge_prompt_dialog = null;
 
308
                        Doit.this._mergePromptDialog.dismiss();
 
309
                        Doit.this._mergePromptDialog = null;
313
310
                }
314
311
        };
315
312
 
319
316
                Button next = (Button)findViewById( R.id.next );
320
317
                next.setEnabled( false );
321
318
 
322
 
                switch( _next_action )
 
319
                switch( _nextAction )
323
320
                {
324
321
                case NEXT_BEGIN:
325
322
                        importContacts();
336
333
                manualAbort( false );
337
334
        }
338
335
 
339
 
        private void manualAbort( boolean show_toaster_popup )
 
336
        private void manualAbort( boolean showToasterPopup )
340
337
        {
341
 
                abortImport( show_toaster_popup );
 
338
                abortImport( showToasterPopup );
342
339
 
343
340
                updateNext( NEXT_CLOSE );
344
341
                ( (Button)findViewById( R.id.back ) ).setEnabled( true );
347
344
                        setVisibility( View.VISIBLE );
348
345
                ( (TextView)findViewById( R.id.doit_alldone ) ).
349
346
                        setVisibility( View.GONE );
350
 
 
351
 
                // close any open dialogs
352
 
                try {
353
 
                        dismissDialog( _current_dialog_id );
354
 
                }
355
 
                catch( Exception e ) {
356
 
                        // ignore errors
357
 
                }
358
347
        }
359
348
 
360
 
        private void updateNext( int next_action )
 
349
        private void updateNext( int nextAction )
361
350
        {
362
351
                Button next = (Button)findViewById( R.id.next );
363
 
                switch( next_action ) {
 
352
                switch( nextAction ) {
364
353
                case NEXT_BEGIN:        next.setText( R.string.doit_begin ); break;
365
354
                case NEXT_CLOSE:        next.setText( R.string.doit_close ); break;
366
355
                }
367
356
                next.setEnabled( true );
368
 
                _next_action = next_action;
 
357
                _nextAction = nextAction;
369
358
        }
370
359
 
371
360
        public static int convertIdToAction( int id ) {
386
375
                }
387
376
        }
388
377
 
389
 
        private DialogInterface.OnCancelListener _dialog_on_cancel_listener =
390
 
                new DialogInterface.OnCancelListener()
391
 
        {
 
378
        private DialogInterface.OnCancelListener _dialogOnCancelListener =
 
379
                        new DialogInterface.OnCancelListener() {
392
380
                public void onCancel( DialogInterface dialog ) {
393
 
                        manualAbort();
 
381
                        setResult( RESULT_CANCELED );
 
382
                        finish();
394
383
                }
395
384
        };
396
385
 
397
 
 
398
386
        @Override
399
 
        protected void onActivityResult( int request_code, int result_code,
400
 
                Intent data )
 
387
        protected void onActivityResult( int requestCode, int resultCode,
 
388
                        Intent data )
401
389
        {
402
390
                // if we're cancelling, abort any import
403
 
                if( result_code == RESULT_CANCELED )
 
391
                if( resultCode == RESULT_CANCELED )
404
392
                        abortImport( true );
405
393
        }
406
394
 
407
395
        @Override
408
 
        protected void onPrepareDialog( int id, Dialog dialog )
 
396
        protected void onPrepareDialog(int id, Dialog dialog)
409
397
        {
410
 
                _current_dialog_id = id;
 
398
                _currentDialogId = id;
411
399
 
412
400
                switch( id )
413
401
                {
414
402
                case DIALOG_ERROR:      // fall through
415
403
                case DIALOG_CONTINUEORABORT:
416
404
                        // set dialog message
417
 
                        ( (AlertDialog)dialog ).setMessage( _dialog_message );
 
405
                        ( (AlertDialog)dialog ).setMessage( _dialogMessage );
418
406
                        break;
419
407
                case DIALOG_MERGEPROMPT:
420
408
                        // set contact's name
421
 
                        ( (TextView)dialog.findViewById( R.id.mergeprompt_name ) )
422
 
                                .setText( _dialog_message );
 
409
                        ( (TextView)dialog.findViewById( R.id.mergeprompt_name ) ).setText(
 
410
                                        _dialogMessage );
423
411
                        // and set up reference to dialog
424
 
                        _merge_prompt_dialog = dialog;
 
412
                        _mergePromptDialog = dialog;
425
413
                        break;
426
414
                }
427
415
 
438
426
                ( (Button)findViewById( R.id.back ) ).setEnabled( false );
439
427
 
440
428
                // create importer
441
 
                _importer = new VcardImporter( this );
 
429
                _importer = new VCFImporter( this );
442
430
 
443
431
                // start the service's thread
444
432
                _importer.start();
447
435
        private void updateProgress()
448
436
        {
449
437
                ProgressBar bar = (ProgressBar)findViewById( R.id.doit_progress );
450
 
                TextView out_of = (TextView)findViewById( R.id.doit_outof );
 
438
                TextView outOf = (TextView)findViewById( R.id.doit_outof );
451
439
 
452
 
                if( _max_progress > 0 )
 
440
                if( _maxProgress > 0 )
453
441
                {
454
 
                        bar.setMax( _max_progress );
455
 
                        bar.setSecondaryProgress( _tmp_progress );
 
442
                        bar.setMax( _maxProgress );
 
443
                        bar.setSecondaryProgress( _tmpProgress );
456
444
 
457
 
                        if( _started_progress )
 
445
                        if( _startedProgress )
458
446
                        {
459
447
                                ( (TextView)findViewById( R.id.doit_percentage ) ).setText(
460
 
                                        (int)Math.round( 100 * _progress / _max_progress ) + "%" );
461
 
                                out_of.setText( _progress + "/" + _max_progress );
 
448
                                                (int)Math.round( 100 * _progress / _maxProgress ) + "%" );
 
449
                                outOf.setText( _progress + "/" + _maxProgress );
462
450
                                bar.setProgress( _progress );
463
451
                        }
464
452
                }
467
455
        private void updateStats()
468
456
        {
469
457
                ( (TextView)findViewById( R.id.doit_overwrites ) ).setText(
470
 
                        "" + _count_overwrites );
 
458
                                "" + _countOverwrites );
471
459
                ( (TextView)findViewById( R.id.doit_creates ) ).setText(
472
 
                        "" + _count_creates );
 
460
                                "" + _countCreates );
473
461
                ( (TextView)findViewById( R.id.doit_merges ) ).setText(
474
 
                        "" + _count_merges );
 
462
                                "" + _countMerges );
475
463
                ( (TextView)findViewById( R.id.doit_skips ) ).setText(
476
 
                        "" + _count_skips );
 
464
                                "" + _countSkips );
477
465
        }
478
466
 
479
 
        private void abortImport( boolean show_toaster_popup )
 
467
        private void abortImport( boolean showToasterPopup )
480
468
        {
481
469
                if( _importer != null )
482
470
                {
493
481
                                }
494
482
 
495
483
                                // notify the user
496
 
                                if( show_toaster_popup )
 
484
                                if( showToasterPopup )
497
485
                                        Toast.makeText( this, R.string.doit_importaborted,
498
 
                                                Toast.LENGTH_LONG ).show();
 
486
                                                        Toast.LENGTH_LONG ).show();
499
487
                        }
500
488
                }
501
489