(root)/android/import-contacts
» Revision
40
(compared to revision 41)
: src/org/waxworlds/edam/importcontacts/Doit.java
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
- browse files at revision 40
- compare with another revision
- download diff
- download tarball
- view history from revision 40
- Committer: edam
- Date: 2011-05-02 18:28:24 UTC
- Revision ID: edam@waxworlds.org-20110502182824-acgdi3qfxfzqgely
- fixed logic for vcard field types (home, work, cell, etc) so it works
- updated NEWS and TODO
- rewrote most of ContactsCache, including a new ContactIdentifier class to identify contacts in the cache and new cache building code
- contacts now identified in the same way that Andoid displays them (by name, or organisation, or number, or email, in that order)
- propper handling and support for organisations and titles
- validation of imported contact now done by Importer, not VcfImporter
- separated sanitisation and normalisation (for cache lookups)
- generacised PhoneData, EmailData and AddressData classes
- ContactData is now aware of primary numbers, emails and organisations (defaults to the first prefrred one seen, or the first one seen where none is preferred)
- updated NEWS and TODO
- rewrote most of ContactsCache, including a new ContactIdentifier class to identify contacts in the cache and new cache building code
- contacts now identified in the same way that Andoid displays them (by name, or organisation, or number, or email, in that order)
- propper handling and support for organisations and titles
- validation of imported contact now done by Importer, not VcfImporter
- separated sanitisation and normalisation (for cache lookups)
- generacised PhoneData, EmailData and AddressData classes
- ContactData is now aware of primary numbers, emails and organisations (defaults to the first prefrred one seen, or the first one seen where none is preferred)
- files modified:
- TODO
added
removed
src/org/waxworlds/edam/importcontacts/Doit.java
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
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:
117
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
201
201
super.onPause();
202
202
203
203
// saving the state of an import sounds complicated! Lets just abort!
204
if( _next_action != NEXT_CLOSE )
204
if( _nextAction != NEXT_CLOSE )
205
205
manualAbort( true );
206
206
}
207
207
217
217
.setMessage( "" )
218
218
.setPositiveButton( R.string.error_ok,
219
219
new DialogInterface.OnClickListener() {
220
public void onClick( DialogInterface dialog,
221
int whichButton )
220
public void onClick(DialogInterface dialog,
221
int whichButton)
222
222
{
223
223
Doit.this._importer.wake();
224
224
}
225
225
} )
226
.setOnCancelListener( _dialog_on_cancel_listener )
226
.setOnCancelListener( _dialogOnCancelListener )
227
227
.create();
228
228
case DIALOG_CONTINUEORABORT:
229
229
return new AlertDialog.Builder( this )
232
232
.setMessage( "" )
233
233
.setPositiveButton( R.string.error_continue,
234
234
new DialogInterface.OnClickListener() {
235
public void onClick( DialogInterface dialog,
236
int which_button )
235
public void onClick(DialogInterface dialog,
236
int whichButton)
237
237
{
238
238
Doit.this._importer.wake(
239
239
Importer.RESPONSE_POSITIVE );
241
241
} )
242
242
.setNegativeButton( R.string.error_abort,
243
243
new DialogInterface.OnClickListener() {
244
public void onClick( DialogInterface dialog,
245
int which_button )
244
public void onClick(DialogInterface dialog,
245
int whichButton)
246
246
{
247
247
Doit.this._importer.wake(
248
248
Importer.RESPONSE_NEGATIVE );
249
249
}
250
250
} )
251
.setOnCancelListener( _dialog_on_cancel_listener )
251
.setOnCancelListener( _dialogOnCancelListener )
252
252
.create();
253
253
case DIALOG_MERGEPROMPT:
254
254
// custom layout in an AlertDialog
255
255
LayoutInflater factory = LayoutInflater.from( this );
256
final View dialog_view = factory.inflate(
256
final View dialogView = factory.inflate(
257
257
R.layout.mergeprompt, null );
258
( (CheckBox)dialog_view.findViewById( R.id.mergeprompt_always ) ).
258
( (CheckBox)dialogView.findViewById( R.id.mergeprompt_always ) ).
259
259
setOnCheckedChangeListener(
260
260
new CompoundButton.OnCheckedChangeListener() {
261
public void onCheckedChanged(
262
CompoundButton button_view, boolean is_checked )
261
public void onCheckedChanged( CompoundButton buttonView,
262
boolean isChecked )
263
263
{
264
Doit.this._merge_prompt_always_selected =
265
is_checked;
264
Doit.this._mergePromptAlwaysSelected = isChecked;
266
265
}
267
266
} );
268
( (Button)dialog_view.findViewById( R.id.merge_keep ) ).
269
setOnClickListener( _merge_prompt_button_listener );
270
( (Button)dialog_view.findViewById( R.id.merge_overwrite ) ).
271
setOnClickListener( _merge_prompt_button_listener );
272
( (Button)dialog_view.findViewById( R.id.merge_merge ) ).
273
setOnClickListener( _merge_prompt_button_listener );
274
( (Button)dialog_view.findViewById( R.id.abort ) ).
275
setOnClickListener( _merge_prompt_button_listener );
276
_merge_prompt_always_selected = false;
267
( (Button)dialogView.findViewById( R.id.merge_keep ) ).
268
setOnClickListener( _mergePromptButtonListener );
269
( (Button)dialogView.findViewById( R.id.merge_overwrite ) ).
270
setOnClickListener( _mergePromptButtonListener );
271
( (Button)dialogView.findViewById( R.id.merge_merge ) ).
272
setOnClickListener( _mergePromptButtonListener );
273
( (Button)dialogView.findViewById( R.id.abort ) ).
274
setOnClickListener( _mergePromptButtonListener );
275
_mergePromptAlwaysSelected = false;
277
276
return new AlertDialog.Builder( this )
278
277
.setIcon( R.drawable.alert_dialog_icon )
279
278
.setTitle( R.string.mergeprompt_title )
280
.setView( dialog_view )
281
.setOnCancelListener( _dialog_on_cancel_listener )
279
.setView( dialogView )
280
.setOnCancelListener( _dialogOnCancelListener )
282
281
.create();
283
282
}
284
283
return null;
285
284
}
286
285
287
private OnClickListener _merge_prompt_button_listener =
288
new OnClickListener()
289
{
286
private OnClickListener _mergePromptButtonListener = new OnClickListener() {
290
287
public void onClick( View view )
291
288
{
292
289
// handle abort
295
292
296
293
// else, response (just check we haven't aborted already!)
297
294
else if( Doit.this._importer != null ) {
298
int response_extra = _merge_prompt_always_selected?
295
int responseExtra = _mergePromptAlwaysSelected?
299
296
Importer.RESPONSEEXTRA_ALWAYS : Importer.RESPONSEEXTRA_NONE;
300
297
Doit.this._importer.wake( convertIdToAction( view.getId() ),
301
response_extra );
298
responseExtra );
302
299
}
303
300
304
301
// close dialog and free (don't keep a reference)
305
Doit.this._merge_prompt_dialog.dismiss();
306
Doit.this._merge_prompt_dialog = null;
302
Doit.this._mergePromptDialog.dismiss();
303
Doit.this._mergePromptDialog = null;
307
304
}
308
305
};
309
306
313
310
Button next = (Button)findViewById( R.id.next );
314
311
next.setEnabled( false );
315
312
316
switch( _next_action )
313
switch( _nextAction )
317
314
{
318
315
case NEXT_BEGIN:
319
316
importContacts();
330
327
manualAbort( false );
331
328
}
332
329
333
private void manualAbort( boolean show_toaster_popup )
330
private void manualAbort( boolean showToasterPopup )
334
331
{
335
abortImport( show_toaster_popup );
332
abortImport( showToasterPopup );
336
333
337
334
updateNext( NEXT_CLOSE );
338
335
( (Button)findViewById( R.id.back ) ).setEnabled( true );
344
341
345
342
// close any open dialogs
346
343
try {
347
dismissDialog( _current_dialog_id );
344
dismissDialog( _currentDialogId );
348
345
}
349
346
catch( Exception e ) {
350
347
// ignore errors
351
348
}
352
349
}
353
350
354
private void updateNext( int next_action )
351
private void updateNext( int nextAction )
355
352
{
356
353
Button next = (Button)findViewById( R.id.next );
357
switch( next_action ) {
354
switch( nextAction ) {
358
355
case NEXT_BEGIN: next.setText( R.string.doit_begin ); break;
359
356
case NEXT_CLOSE: next.setText( R.string.doit_close ); break;
360
357
}
361
358
next.setEnabled( true );
362
_next_action = next_action;
359
_nextAction = nextAction;
363
360
}
364
361
365
362
public static int convertIdToAction( int id ) {
380
377
}
381
378
}
382
379
383
private DialogInterface.OnCancelListener _dialog_on_cancel_listener =
384
new DialogInterface.OnCancelListener()
385
{
380
private DialogInterface.OnCancelListener _dialogOnCancelListener =
381
new DialogInterface.OnCancelListener() {
386
382
public void onCancel( DialogInterface dialog ) {
387
383
manualAbort();
388
384
}
390
386
391
387
392
388
@Override
393
protected void onActivityResult( int request_code, int result_code,
394
Intent data )
389
protected void onActivityResult( int requestCode, int resultCode,
390
Intent data )
395
391
{
396
392
// if we're cancelling, abort any import
397
if( result_code == RESULT_CANCELED )
393
if( resultCode == RESULT_CANCELED )
398
394
abortImport( true );
399
395
}
400
396
401
397
@Override
402
protected void onPrepareDialog( int id, Dialog dialog )
398
protected void onPrepareDialog(int id, Dialog dialog)
403
399
{
404
_current_dialog_id = id;
400
_currentDialogId = id;
405
401
406
402
switch( id )
407
403
{
408
404
case DIALOG_ERROR: // fall through
409
405
case DIALOG_CONTINUEORABORT:
410
406
// set dialog message
411
( (AlertDialog)dialog ).setMessage( _dialog_message );
407
( (AlertDialog)dialog ).setMessage( _dialogMessage );
412
408
break;
413
409
case DIALOG_MERGEPROMPT:
414
410
// set contact's name
415
( (TextView)dialog.findViewById( R.id.mergeprompt_name ) )
416
.setText( _dialog_message );
411
( (TextView)dialog.findViewById( R.id.mergeprompt_name ) ).setText(
412
_dialogMessage );
417
413
// and set up reference to dialog
418
_merge_prompt_dialog = dialog;
414
_mergePromptDialog = dialog;
419
415
break;
420
416
}
421
417
441
437
private void updateProgress()
442
438
{
443
439
ProgressBar bar = (ProgressBar)findViewById( R.id.doit_progress );
444
TextView out_of = (TextView)findViewById( R.id.doit_outof );
440
TextView outOf = (TextView)findViewById( R.id.doit_outof );
445
441
446
if( _max_progress > 0 )
442
if( _maxProgress > 0 )
447
443
{
448
bar.setMax( _max_progress );
449
bar.setSecondaryProgress( _tmp_progress );
444
bar.setMax( _maxProgress );
445
bar.setSecondaryProgress( _tmpProgress );
450
446
451
if( _started_progress )
447
if( _startedProgress )
452
448
{
453
449
( (TextView)findViewById( R.id.doit_percentage ) ).setText(
454
(int)Math.round( 100 * _progress / _max_progress ) + "%" );
455
out_of.setText( _progress + "/" + _max_progress );
450
(int)Math.round( 100 * _progress / _maxProgress ) + "%" );
451
outOf.setText( _progress + "/" + _maxProgress );
456
452
bar.setProgress( _progress );
457
453
}
458
454
}
461
457
private void updateStats()
462
458
{
463
459
( (TextView)findViewById( R.id.doit_overwrites ) ).setText(
464
"" + _count_overwrites );
460
"" + _countOverwrites );
465
461
( (TextView)findViewById( R.id.doit_creates ) ).setText(
466
"" + _count_creates );
462
"" + _countCreates );
467
463
( (TextView)findViewById( R.id.doit_merges ) ).setText(
468
"" + _count_merges );
464
"" + _countMerges );
469
465
( (TextView)findViewById( R.id.doit_skips ) ).setText(
470
"" + _count_skips );
466
"" + _countSkips );
471
467
}
472
468
473
private void abortImport( boolean show_toaster_popup )
469
private void abortImport( boolean showToasterPopup )
474
470
{
475
471
if( _importer != null )
476
472
{
487
483
}
488
484
489
485
// notify the user
490
if( show_toaster_popup )
486
if( showToasterPopup )
491
487
Toast.makeText( this, R.string.doit_importaborted,
492
488
Toast.LENGTH_LONG ).show();
493
489
}
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480