From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 29 Oct 2015 08:40:44 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/owncloud/android into descendIntoFolder
X-Git-Tag: beta-20151122~26^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4704e947da86120b055e6bea0c397f3e0efcbea2?hp=00c6d8bffe0908415558e37449e4d4b140da7b0a

Merge branch 'master' of https://github.com/owncloud/android into descendIntoFolder
---

diff --git a/src/com/owncloud/android/operations/CreateFolderOperation.java b/src/com/owncloud/android/operations/CreateFolderOperation.java
index b020b92c..0b3343c6 100644
--- a/src/com/owncloud/android/operations/CreateFolderOperation.java
+++ b/src/com/owncloud/android/operations/CreateFolderOperation.java
@@ -121,4 +121,8 @@ public class CreateFolderOperation extends SyncOperation implements OnRemoteOper
             Log_OC.d(TAG, "Create directory " + mRemotePath + " in Database");
         }
     }
+
+    public String getRemotePath() {
+        return mRemotePath;
+    }
 }
diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java
index d221bc92..4efb8d0d 100644
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@ -608,6 +608,9 @@ public class Uploader extends FileActivity
                                                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();