Revision 94abc2c7 src/com/rackspace/cloud/android/ContainerObjectsActivity.java
| b/src/com/rackspace/cloud/android/ContainerObjectsActivity.java | ||
|---|---|---|
| 73 | 73 |
private AddObjectListenerTask task; |
| 74 | 74 |
private DeleteObjectListenerTask deleteObjTask; |
| 75 | 75 |
private DeleteContainerListenerTask deleteContainerTask; |
| 76 |
|
|
| 76 | 77 |
|
| 77 | 78 |
@Override |
| 78 | 79 |
public void onCreate(Bundle savedInstanceState) {
|
| ... | ... | |
| 289 | 290 |
} |
| 290 | 291 |
|
| 291 | 292 |
protected void displayCurrentFiles() {
|
| 292 |
setTitle(container.getName()+": /"+currentPath); |
|
| 293 |
if(container.getOtherUser()==null) |
|
| 294 |
setTitle(container.getName()+": /"+currentPath); |
|
| 295 |
else |
|
| 296 |
setTitle(container.getOtherUser()+":"+container.getName()+"/"+currentPath); |
|
| 293 | 297 |
if (app.getCurFiles().size() == 0) {
|
| 294 | 298 |
displayNoFilesCell(); |
| 295 | 299 |
} else {
|
| ... | ... | |
| 381 | 385 |
viewIntent.putExtra("container", app.getCurFiles()
|
| 382 | 386 |
.get(position)); |
| 383 | 387 |
viewIntent.putExtra("cdnUrl", container.getCdnUrl());
|
| 388 |
if(container.getOtherUser()!=null) |
|
| 389 |
viewIntent.putExtra("otherUser", container.getOtherUser());
|
|
| 384 | 390 |
viewIntent.putExtra("containerNames", container.getName());
|
| 385 | 391 |
viewIntent.putExtra("isCdnEnabled", cdnEnabledIs);
|
| 386 | 392 |
startActivityForResult(viewIntent, 55); // arbitrary number; |
| ... | ... | |
| 455 | 461 |
viewIntent = new Intent(this, ContainerObjectDetails.class); |
| 456 | 462 |
viewIntent.putExtra("container", obj);
|
| 457 | 463 |
viewIntent.putExtra("cdnUrl", container.getCdnUrl());
|
| 464 |
if(container.getOtherUser()!=null) |
|
| 465 |
viewIntent.putExtra("otherUser", container.getOtherUser());
|
|
| 458 | 466 |
viewIntent.putExtra("containerNames", container.getName());
|
| 459 | 467 |
viewIntent.putExtra("isCdnEnabled", cdnEnabledIs);
|
| 460 | 468 |
startActivityForResult(viewIntent, 55); |
| ... | ... | |
| 770 | 778 |
.createList(container.getName(), path[0]); |
| 771 | 779 |
else |
| 772 | 780 |
files = (new ContainerObjectManager(getContext())) |
| 773 |
.createOtherList(container.getName(), container.getOtherUser()); |
|
| 781 |
.createOtherList(container.getName(), container.getOtherUser(),path[0]);
|
|
| 774 | 782 |
} |
| 775 | 783 |
} catch (CloudServersException e) {
|
| 776 | 784 |
exception = e; |
Also available in: Unified diff