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

Unverified Commit 2c7533c2 authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #141 from nextcloud/userIdForWebdavSearch 

Use userId for webdav search
parents 4c04d440 f9f8cb29

src/com/owncloud/android/lib/common/utils/WebDavFileUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class WebDavFileUtils { 
                                      OwnCloudClient client,

                                      boolean isReadFolderOperation,

                                      boolean isSearchOperation,

                                      String username) {

                                      String userId) {

        ArrayList<Object> mFolderAndFiles = new ArrayList<>();



        WebdavEntry we;
@@ -61,8 +61,8 @@ public class WebDavFileUtils { 
        }



        String stripString = client.getWebdavUri().getPath();

        if (isSearchOperation && username != null) {

            stripString = stripString.substring(0, stripString.lastIndexOf("/")) + "/dav/files/" + username;

        if (isSearchOperation && userId != null) {

            stripString = stripString.substring(0, stripString.lastIndexOf("/")) + "/dav/files/" + userId;

            stripString = stripString.replaceAll(" ", "%20");

        }

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

+5 −3
Original line number Diff line number Diff line
@@ -65,13 +65,15 @@ public class SearchOperation extends RemoteOperation { 
    }



    private String searchQuery;

    private String userId;

    private SearchType searchType;

    private boolean filterOutFiles;



    public SearchOperation(String query, SearchType searchType, boolean filterOutFiles) {

    public SearchOperation(String query, SearchType searchType, boolean filterOutFiles, String userId) {

        this.searchQuery = query;

        this.searchType = searchType;

        this.filterOutFiles = filterOutFiles;

        this.userId = userId;

    }



    @Override
@@ -100,7 +102,7 @@ public class SearchOperation extends RemoteOperation { 
                    MultiStatus dataInServer = searchMethod.getResponseBodyAsMultiStatus();

                    WebDavFileUtils webDavFileUtils = new WebDavFileUtils();

                    ArrayList<Object> mFolderAndFiles = webDavFileUtils.readData(dataInServer, client, false, true,

                            client.getCredentials().getUsername());

                            userId);



                    // Result of the operation

                    result = new RemoteOperationResult(true, status, searchMethod.getResponseHeaders());
@@ -204,7 +206,7 @@ public class SearchOperation extends RemoteOperation { 
        Element scopeElement = query.createElementNS(DAV_NAMESPACE, "d:scope");

        Element hrefElement = query.createElementNS(DAV_NAMESPACE, "d:href");

        Element depthElement = query.createElementNS(DAV_NAMESPACE, "d:depth");

        Text hrefTextElement = query.createTextNode("/files/" + getClient().getCredentials().getUsername());

        Text hrefTextElement = query.createTextNode("/files/" + userId);

        Text depthTextElement = query.createTextNode("infinity");

        Element whereElement = query.createElementNS(DAV_NAMESPACE, "d:where");

        Element folderElement = null;