Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 1f8a3b94 authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

fix changes due to rebase 



Signed-off-by: default avatartobiasKaminsky <tobias@kaminsky.me>
parent 8ad6fd99

src/com/owncloud/android/lib/resources/files/ReadFileVersionsOperation.java

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class ReadFileVersionsOperation extends RemoteOperation { 
                throw new IllegalArgumentException("UserId may not be empty!");

            }



            String uri = client.getNewWebdavUri(false) + "/versions/" + userId + "/versions/" + fileId;

            String uri = client.getNewWebdavUri() + "/versions/" + userId + "/versions/" + fileId;

            DavPropertyNameSet propSet = WebdavUtils.getFileVersionPropSet();



            query = new PropFindMethod(uri, propSet, DavConstants.DEPTH_1);
@@ -142,7 +142,7 @@ public class ReadFileVersionsOperation extends RemoteOperation { 
        versions = new ArrayList<>();



        // parse data from remote folder

        String splitElement = client.getNewWebdavUri(false).getPath();

        String splitElement = client.getNewWebdavUri().getPath();



        // loop to update every child

        for (int i = 1; i < remoteData.getResponses().length; ++i) {