Revision 05a718db src/com/rackspace/cloud/android/ContainerObjectsActivity.java
| b/src/com/rackspace/cloud/android/ContainerObjectsActivity.java | ||
|---|---|---|
| 6 | 6 |
import java.net.URLEncoder; |
| 7 | 7 |
import java.util.ArrayList; |
| 8 | 8 |
import java.util.Arrays; |
| 9 |
import java.util.Collections; |
|
| 9 | 10 |
import java.util.List; |
| 10 | 11 |
|
| 11 | 12 |
import org.apache.http.HttpResponse; |
| ... | ... | |
| 17 | 18 |
import android.content.DialogInterface; |
| 18 | 19 |
import android.content.Intent; |
| 19 | 20 |
import android.database.Cursor; |
| 21 |
import android.hardware.Camera.PreviewCallback; |
|
| 20 | 22 |
import android.net.Uri; |
| 21 | 23 |
import android.os.AsyncTask; |
| 22 | 24 |
import android.os.Bundle; |
| ... | ... | |
| 191 | 193 |
goUpDirectory(); |
| 192 | 194 |
} |
| 193 | 195 |
} |
| 194 |
|
|
| 196 |
List<ContainerObjects> previousFiles = new ArrayList<ContainerObjects>(); |
|
| 195 | 197 |
/* |
| 196 | 198 |
* go to the current directory's parent and display that data |
| 197 | 199 |
*/ |
| ... | ... | |
| 200 | 202 |
0, |
| 201 | 203 |
currentPath.substring(0, currentPath.length() - 2).lastIndexOf( |
| 202 | 204 |
"/") + 1); |
| 203 |
loadCurrentDirectoryFiles(); |
|
| 204 |
displayCurrentFiles(); |
|
| 205 |
if(container.getName().equalsIgnoreCase(Container.MYSHARED)){
|
|
| 206 |
loadCurrentDirectoryFiles(); |
|
| 207 |
displayCurrentFiles(); |
|
| 208 |
} |
|
| 209 |
else if(previousFiles!=null&&previousFiles.size()>0){
|
|
| 210 |
files = previousFiles.toArray(new ContainerObjects[]{});
|
|
| 211 |
previousFiles=null; |
|
| 212 |
loadCurrentDirectoryFiles(); |
|
| 213 |
displayCurrentFiles(); |
|
| 214 |
} |
|
| 215 |
else |
|
| 216 |
loadFiles(); |
|
| 217 |
//now executing new call |
|
| 218 |
|
|
| 205 | 219 |
} |
| 206 | 220 |
|
| 207 | 221 |
/* |
| ... | ... | |
| 209 | 223 |
*/ |
| 210 | 224 |
private void loadFiles() {
|
| 211 | 225 |
// displayLoadingCell(); |
| 212 |
new LoadFilesTask().execute(); |
|
| 226 |
new LoadFilesTask().execute(currentPath);
|
|
| 213 | 227 |
} |
| 214 | 228 |
|
| 215 | 229 |
/* |
| ... | ... | |
| 343 | 357 |
if (app.getCurFiles().get(position).getContentType() |
| 344 | 358 |
.startsWith("application/directory")) {
|
| 345 | 359 |
currentPath = app.getCurFiles().get(position).getCName() + "/"; |
| 346 |
loadCurrentDirectoryFiles(); |
|
| 347 |
displayCurrentFiles(); |
|
| 360 |
if(container.getName().equalsIgnoreCase(Container.MYSHARED)){
|
|
| 361 |
loadCurrentDirectoryFiles(); |
|
| 362 |
displayCurrentFiles(); |
|
| 363 |
} |
|
| 364 |
else{
|
|
| 365 |
previousFiles = Arrays.asList(files); |
|
| 366 |
loadFiles(); |
|
| 367 |
} |
|
| 368 |
//loadCurrentDirectoryFiles(); |
|
| 369 |
//displayCurrentFiles(); |
|
| 348 | 370 |
} |
| 349 | 371 |
|
| 350 | 372 |
else {
|
| ... | ... | |
| 366 | 388 |
super.onCreateOptionsMenu(menu); |
| 367 | 389 |
MenuInflater inflater = getMenuInflater(); |
| 368 | 390 |
inflater.inflate(R.menu.view_container_object_list_menu, menu); |
| 391 |
menu.findItem(R.id.enable_cdn).setVisible(false); |
|
| 392 |
if(Container.TRASH.equalsIgnoreCase(container.getName())){
|
|
| 393 |
menu.findItem(R.id.delete_container).setVisible(false); |
|
| 394 |
menu.findItem(R.id.add_folder).setVisible(false); |
|
| 395 |
menu.findItem(R.id.add_file).setVisible(false); |
|
| 396 |
} |
|
| 369 | 397 |
return true; |
| 370 | 398 |
} |
| 371 | 399 |
|
| ... | ... | |
| 613 | 641 |
} else {
|
| 614 | 642 |
if (container.getOtherUser() == null) |
| 615 | 643 |
files = (new ContainerObjectManager(getContext())) |
| 616 |
.createList(true, container.getName()); |
|
| 644 |
.createList(true, container.getName(),path[0]);
|
|
| 617 | 645 |
else |
| 618 | 646 |
files = (new ContainerObjectManager(getContext())) |
| 619 | 647 |
.createOtherList(true, container.getName(), |
Also available in: Unified diff