Revision a06c1add src/com/rackspacecloud/android/ContainerObjectsActivity.java
| b/src/com/rackspacecloud/android/ContainerObjectsActivity.java | ||
|---|---|---|
| 567 | 567 |
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
| 568 | 568 |
super.onActivityResult(requestCode, resultCode, data); |
| 569 | 569 |
|
| 570 |
Log.d("info", "in containerobjactivity result");
|
|
| 571 |
|
|
| 570 | 572 |
if (resultCode == RESULT_OK) {
|
| 573 |
Log.d("info", "top called");
|
|
| 571 | 574 |
// a sub-activity kicked back, so we want to refresh the server list |
| 572 | 575 |
loadFiles(); |
| 573 | 576 |
} |
| 574 |
/*
|
|
| 575 |
if (requestCode == 56) {
|
|
| 577 |
if (requestCode == 55) {
|
|
| 578 |
Log.d("info", "bottom called");
|
|
| 576 | 579 |
if (resultCode == RESULT_OK) {
|
| 577 | 580 |
Intent viewIntent1 = new Intent(this, |
| 578 | 581 |
ListContainerActivity.class); |
| 579 |
startActivityForResult(viewIntent1, 56);
|
|
| 582 |
startActivityForResult(viewIntent1, 55);
|
|
| 580 | 583 |
} |
| 581 | 584 |
} |
| 582 |
*/ |
|
| 583 | 585 |
} |
| 584 | 586 |
|
| 585 | 587 |
private CloudServersException parseCloudServersException( |
| ... | ... | |
| 933 | 935 |
@Override |
| 934 | 936 |
protected Void doInBackground(Void... arg1) {
|
| 935 | 937 |
|
| 936 |
while(app.isDeletingObject()){
|
|
| 938 |
while(app.isDeletingContainer()){
|
|
| 937 | 939 |
// wait for process to finish |
| 938 | 940 |
// or have it be canceled |
| 939 | 941 |
if(deleteContainerTask.isCancelled()){
|
| ... | ... | |
| 949 | 951 |
*/ |
| 950 | 952 |
@Override |
| 951 | 953 |
protected void onPostExecute(Void arg1) {
|
| 954 |
setResult(RESULT_OK); |
|
| 952 | 955 |
finish(); |
| 953 | 956 |
} |
| 954 | 957 |
} |
Also available in: Unified diff