Merge pull request #152 from nextcloud/fixDoubleSlash

Fix double slash on search results with folder, e.g. "/test//folder//"
nextcloud · Jun 18, 2018 · 2c7ac04 · 2c7ac04
2 parents 060285b + 9f6a37e
commit 2c7ac04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/com/owncloud/android/lib/common/network/WebdavEntry.java b/src/com/owncloud/android/lib/common/network/WebdavEntry.java
@@ -84,7 +84,7 @@ public WebdavEntry(MultiStatusResponse ms, String splitElement) {
         if (ms.getStatus().length != 0) {
             mUri = ms.getHref();
 
-            mPath = mUri.split(splitElement, 2)[1];
+            mPath = mUri.split(splitElement, 2)[1].replace("//", "/");
 
             int status = ms.getStatus()[0].getStatusCode();
             if ( status == CODE_PROP_NOT_FOUND ) {

diff --git a/src/com/owncloud/android/lib/common/utils/WebDavFileUtils.java b/src/com/owncloud/android/lib/common/utils/WebDavFileUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Nextcloud Android client application
  *
  * @author Mario Danic
@@ -67,7 +67,7 @@ public ArrayList<Object> readData(MultiStatus remoteData,
         }
 
         // loop to update every child
-        RemoteFile remoteFile = null;
+        RemoteFile remoteFile;
         MultiStatusResponse[] responses = remoteData.getResponses();
         for (int i = start; i < responses.length; i++) {
             /// new OCFile instance with the data from the server