Revision 3e180b04 src/com/rackspacecloud/android/ContainerObjectsActivity.java
| b/src/com/rackspacecloud/android/ContainerObjectsActivity.java | ||
|---|---|---|
| 202 | 202 |
if(task != null){
|
| 203 | 203 |
task.cancel(true); |
| 204 | 204 |
} |
| 205 |
|
|
| 206 |
if(deleteObjTask != null){
|
|
| 207 |
deleteObjTask.cancel(true); |
|
| 208 |
} |
|
| 209 |
|
|
| 210 |
if(deleteContainerTask != null){
|
|
| 211 |
deleteContainerTask.cancel(true); |
|
| 212 |
} |
|
| 213 |
|
|
| 205 | 214 |
} |
| 206 | 215 |
|
| 207 | 216 |
/* |
| ... | ... | |
| 568 | 577 |
super.onActivityResult(requestCode, resultCode, data); |
| 569 | 578 |
|
| 570 | 579 |
if (resultCode == RESULT_OK && requestCode == 56) {
|
| 571 |
Log.d("info", "top called");
|
|
| 572 | 580 |
// a sub-activity kicked back, so we want to refresh the server list |
| 573 | 581 |
loadFiles(); |
| 574 | 582 |
} |
| 575 |
/* |
|
| 576 |
if (requestCode == 55) {
|
|
| 577 |
Log.d("info", "bottom called");
|
|
| 578 |
if (resultCode == RESULT_OK) {
|
|
| 579 |
Intent viewIntent1 = new Intent(this, |
|
| 580 |
ListContainerActivity.class); |
|
| 581 |
startActivityForResult(viewIntent1, 55); |
|
| 582 |
} |
|
| 583 |
|
|
| 584 |
// deleted file so need to update the list |
|
| 585 |
if (requestCode == 55 && resultCode == 99) {
|
|
| 586 |
loadFiles(); |
|
| 583 | 587 |
} |
| 584 |
*/ |
|
| 588 |
|
|
| 585 | 589 |
} |
| 586 | 590 |
|
| 587 | 591 |
private CloudServersException parseCloudServersException( |
| ... | ... | |
| 798 | 802 |
} |
| 799 | 803 |
if (statusCode == 204) {
|
| 800 | 804 |
setResult(Activity.RESULT_OK); |
| 801 |
} else {hideDialog();
|
|
| 805 |
} else {
|
|
| 806 |
hideDialog(); |
|
| 802 | 807 |
CloudServersException cse = parseCloudServersException(response); |
| 803 | 808 |
if ("".equals(cse.getMessage())) {
|
| 804 | 809 |
startFileError("There was a problem deleting your folder.", bundle);
|
Also available in: Unified diff