Merge pull request #763 from nextcloud/backport/761/stable-2.8

[stable-2.8] Fix username encoding in file paths
nextcloud · Nov 25, 2021 · 99bcaa3 · 99bcaa3
2 parents f4a8b46 + 2e8c589
commit 99bcaa3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java b/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -301,7 +301,7 @@ public String getFilesDavUri(String path) {
     }
 
     public Uri getFilesDavUri() {
-        return Uri.parse(getDavUri() + "/files/" + userId);
+        return Uri.parse(getDavUri() + "/files/" + getUserId());
     }
 
     public Uri getUploadUri() {

diff --git a/src/main/java/com/owncloud/android/lib/common/utils/WebDavFileUtils.java b/src/main/java/com/owncloud/android/lib/common/utils/WebDavFileUtils.java
@@ -61,23 +61,18 @@ public ArrayList<RemoteFile> readData(MultiStatus remoteData,
 
         if (isReadFolderOperation) {
             we = new WebdavEntry(remoteData.getResponses()[0],
-                    client.getFilesDavUri().getPath());
+                    client.getFilesDavUri().getEncodedPath());
             mFolderAndFiles.add(fillOCFile(we));
         } else {
             start = 0;
         }
 
-        String stripString = client.getFilesDavUri().getPath();
-        if (isSearchOperation) {
-            stripString = stripString.replaceAll(" ", "%20");
-        }
-
         // loop to update every child
         RemoteFile remoteFile;
         MultiStatusResponse[] responses = remoteData.getResponses();
         for (int i = start; i < responses.length; i++) {
             /// new OCFile instance with the data from the server
-            we = new WebdavEntry(responses[i], stripString);
+            we = new WebdavEntry(responses[i], client.getFilesDavUri().getEncodedPath());
             remoteFile = fillOCFile(we);
             mFolderAndFiles.add(remoteFile);
         }

diff --git a/src/main/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperation.java b/src/main/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperation.java
@@ -91,7 +91,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
                 // Parse response
                 MultiStatus resp = propfind.getResponseBodyAsMultiStatus();
                 WebdavEntry we = new WebdavEntry(resp.getResponses()[0],
-                        client.getFilesDavUri().getPath());
+                        client.getFilesDavUri().getEncodedPath());
                 RemoteFile remoteFile = new RemoteFile(we);
                 ArrayList<Object> files = new ArrayList<Object>();
                 files.add(remoteFile);

diff --git a/src/main/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperation.java b/src/main/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperation.java
@@ -141,14 +141,14 @@ private void readData(MultiStatus remoteData, OwnCloudClient client) {
         mFolderAndFiles = new ArrayList<>();
 
         // parse data from remote folder 
-        WebdavEntry we = new WebdavEntry(remoteData.getResponses()[0], client.getFilesDavUri().getPath());
+        WebdavEntry we = new WebdavEntry(remoteData.getResponses()[0], client.getFilesDavUri().getEncodedPath());
         mFolderAndFiles.add(fillOCFile(we));
 
         // loop to update every child
         RemoteFile remoteFile;
         for (int i = 1; i < remoteData.getResponses().length; ++i) {
             /// new OCFile instance with the data from the server
-            we = new WebdavEntry(remoteData.getResponses()[i], client.getFilesDavUri().getPath());
+            we = new WebdavEntry(remoteData.getResponses()[i], client.getFilesDavUri().getEncodedPath());
             remoteFile = fillOCFile(we);
             mFolderAndFiles.add(remoteFile);
         }