Merge remote-tracking branch 'remotes/upstream/descendIntoFolder' into beta

diff --combined src/com/owncloud/android/ui/activity/Uploader.java
index 0194092,4efb8d0..37363e4
--- 1/src/com/owncloud/android/ui/activity/Uploader.java
--- 2/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@@ -333,7 -333,8 +333,7 @@@ public class Uploader extends FileActiv
      public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
          // click on folder in the list
          Log_OC.d(TAG, "on item click");
 -        // TODO Enable when "On Device" is recovered ?
 -        Vector<OCFile> tmpfiles = getStorageManager().getFolderContent(mFile /*, false*/);
 +        Vector<OCFile> tmpfiles = getStorageManager().getFolderContent(mFile, false);
          if (tmpfiles.size() <= 0) return;
          // filter on dirtype
          Vector<OCFile> files = new Vector<OCFile>();
@@@ -417,7 -418,8 +417,7 @@@
  
          mFile = getStorageManager().getFileByPath(full_path);
          if (mFile != null) {
 -            // TODO Enable when "On Device" is recovered ?
 -            Vector<OCFile> files = getStorageManager().getFolderContent(mFile/*, false*/);
 +            Vector<OCFile> files = getStorageManager().getFolderContent(mFile, false);
              List<HashMap<String, Object>> data = new LinkedList<HashMap<String,Object>>();
              for (OCFile f : files) {
                  HashMap<String, Object> h = new HashMap<String, Object>();
@@@ -605,8 -607,13 +605,12 @@@
      private void onCreateFolderOperationFinish(CreateFolderOperation operation,
                                                 RemoteOperationResult result) {
          if (result.isSuccess()) {
+             dismissLoadingDialog();
+             String remotePath = operation.getRemotePath().substring(0, operation.getRemotePath().length() -1);
+             String newFolder = remotePath.substring(remotePath.lastIndexOf("/") + 1);
+             mParents.push(newFolder);
              populateDirectoryList();
          } else {
 -            dismissLoadingDialog();
              try {
                  Toast msg = Toast.makeText(this, 
                          ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()), 
@@@ -654,6 -661,7 +658,6 @@@
      public boolean onCreateOptionsMenu(Menu menu) {
          MenuInflater inflater = getMenuInflater();
          inflater.inflate(R.menu.main_menu, menu);
 -        menu.findItem(R.id.action_upload).setVisible(false);
          menu.findItem(R.id.action_sort).setVisible(false);
          menu.findItem(R.id.action_sync_account).setVisible(false);
          return true;