From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 13 Nov 2015 16:41:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/descendIntoFolder' into beta
X-Git-Tag: beta-20151122~26
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/423b208d68690f482c735f16ad73f721506e7c8b?hp=--cc

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

423b208d68690f482c735f16ad73f721506e7c8b
diff --cc src/com/owncloud/android/ui/activity/Uploader.java
index 0194092d,4efb8d0d..37363e45
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@@ -605,8 -607,13 +605,12 @@@ public class Uploader extends FileActiv
      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()),