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

Unverified Commit 3a53b667 authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

fix changes due to rebase 



Signed-off-by: default avatartobiasKaminsky <tobias@kaminsky.me>
parent 80c51988

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

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

            }



            String baseUri = client.getNewWebdavUri(false) + "/trashbin/" + userId + "/trash/";

            String baseUri = client.getNewWebdavUri() + "/trashbin/" + userId + "/trash/";

            DavPropertyNameSet propSet = WebdavUtils.getTrashbinPropSet();

                

            query = new PropFindMethod(baseUri + WebdavUtils.encodePath(remotePath), propSet, DavConstants.DEPTH_1);
@@ -142,7 +142,7 @@ public class ReadRemoteTrashbinFolderOperation extends RemoteOperation { 


        // parse data from remote folder

        WebdavEntry we;

        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) {

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

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class RemoveTrashbinFileOperation extends RemoteOperation { 
        DeleteMethod delete = null;



        try {

            delete = new DeleteMethod(client.getNewWebdavUri(false) + WebdavUtils.encodePath(remotePath));

            delete = new DeleteMethod(client.getNewWebdavUri() + WebdavUtils.encodePath(remotePath));

            int status = client.executeMethod(delete, REMOVE_READ_TIMEOUT, REMOVE_CONNECTION_TIMEOUT);



            delete.getResponseBodyAsString();   // exhaust the response, although not interesting