Revision 7fe017f5
b/src/com/rackspacecloud/android/ListAccountsActivity.java | ||
---|---|---|
58 | 58 |
private Context context; |
59 | 59 |
//need to store if the user has successfully logged in |
60 | 60 |
private boolean loggedIn; |
61 |
private AuthenticateTask authTask; |
|
62 |
private LoadImagesTask imageTask; |
|
63 |
private LoadFlavorsTask flavorTask; |
|
64 | 61 |
|
65 | 62 |
public void onCreate(Bundle savedInstanceState) { |
66 | 63 |
super.onCreate(savedInstanceState); |
... | ... | |
272 | 269 |
public void login() { |
273 | 270 |
//showActivityIndicators(); |
274 | 271 |
//setLoginPreferences(); |
275 |
authTask = new AuthenticateTask(); |
|
276 |
authTask.execute((Void[]) null); |
|
272 |
new AuthenticateTask().execute((Void[]) null); |
|
277 | 273 |
} |
278 | 274 |
|
279 | 275 |
//setup menu for when menu button is pressed |
... | ... | |
413 | 409 |
authenticating = true; |
414 | 410 |
if(dialog == null || !dialog.isShowing()){ |
415 | 411 |
dialog = ProgressDialog.show(ListAccountsActivity.this, "", "Authenticating...", true); |
416 |
dialog.setCancelable(true); |
|
417 |
dialog.setOnCancelListener(new OnCancelListener() { |
|
418 |
|
|
419 |
@Override |
|
420 |
public void onCancel(DialogInterface dialog) { |
|
421 |
if(authTask != null){ |
|
422 |
authTask.cancel(true); |
|
423 |
} |
|
424 |
if(imageTask != null){ |
|
425 |
imageTask.cancel(true); |
|
426 |
} |
|
427 |
if(flavorTask != null){ |
|
428 |
flavorTask.cancel(true); |
|
429 |
} |
|
430 |
hideDialog(); |
|
431 |
} |
|
432 |
}); |
|
433 | 412 |
} |
434 | 413 |
} |
435 | 414 |
|
... | ... | |
460 | 439 |
protected void onPostExecute(Boolean result) { |
461 | 440 |
if (result.booleanValue()) { |
462 | 441 |
//startActivity(tabViewIntent); |
463 |
imageTask = new LoadImagesTask(); |
|
464 |
imageTask.execute((Void[]) null); |
|
442 |
new LoadImagesTask().execute((Void[]) null); |
|
465 | 443 |
} else { |
466 | 444 |
hideDialog(); |
467 | 445 |
showAlert("Login Failure", "Authentication failed. Please check your User Name and API Key."); |
... | ... | |
526 | 504 |
return; |
527 | 505 |
} |
528 | 506 |
|
529 |
flavorTask = new LoadFlavorsTask(); |
|
530 |
flavorTask.execute((Void[]) null); |
|
507 |
new LoadFlavorsTask().execute((Void[]) null); |
|
531 | 508 |
} else { |
532 | 509 |
hideDialog(); |
533 | 510 |
showAlert("Login Failure", "There was a problem loading server images. Please try again."); |
Also available in: Unified diff