gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue with spaces in user ids

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-05-02 10:57:49 +02:00 committed by Mario Đanić
parent 71de8a5245
commit db46330d6e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java
View File

@ -20,6 +20,7 @@
package com.nextcloud.talk.components.filebrowser.webdav; package com.nextcloud.talk.components.filebrowser.webdav;
import android.net.Uri;
import at.bitfire.dav4android.DavResource; import at.bitfire.dav4android.DavResource;
import at.bitfire.dav4android.Response; import at.bitfire.dav4android.Response;
import at.bitfire.dav4android.exception.DavException; import at.bitfire.dav4android.exception.DavException;
@ -34,14 +35,15 @@ import okhttp3.HttpUrl;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class ReadFilesystemOperation { public class ReadFilesystemOperation {
private final OkHttpClient okHttpClient; private final OkHttpClient okHttpClient;
private final String url; private final String url;
private final String basePath;
private final int depth; private final int depth;
private final int cutOff;
public ReadFilesystemOperation(OkHttpClient okHttpClient, UserEntity currentUser, String path, int depth) { public ReadFilesystemOperation(OkHttpClient okHttpClient, UserEntity currentUser, String path, int depth) {
OkHttpClient.Builder okHttpClientBuilder = okHttpClient.newBuilder(); OkHttpClient.Builder okHttpClientBuilder = okHttpClient.newBuilder();
@ -49,7 +51,8 @@ public class ReadFilesystemOperation {
okHttpClientBuilder.followSslRedirects(false); okHttpClientBuilder.followSslRedirects(false);
okHttpClientBuilder.authenticator(new RestModule.MagicAuthenticator(ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken()), "Authorization")); okHttpClientBuilder.authenticator(new RestModule.MagicAuthenticator(ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken()), "Authorization"));
this.okHttpClient = okHttpClientBuilder.build(); this.okHttpClient = okHttpClientBuilder.build();
basePath = currentUser.getBaseUrl() + DavUtils.DAV_PATH + currentUser.getUserId(); String basePath = currentUser.getBaseUrl() + DavUtils.DAV_PATH + currentUser.getUserId();
cutOff = (currentUser.getBaseUrl() + DavUtils.DAV_PATH + Uri.encode(currentUser.getUserId(), String.valueOf(StandardCharsets.UTF_8))).length();
this.url = basePath + path; this.url = basePath + path;
this.depth = depth; this.depth = depth;
} }
@ -86,10 +89,10 @@ public class ReadFilesystemOperation {
} }
remoteFiles.add(BrowserFile.getModelFromResponse(rootElement[0], remoteFiles.add(BrowserFile.getModelFromResponse(rootElement[0],
rootElement[0].getHref().toString().substring(basePath.length()))); rootElement[0].getHref().toString().substring(cutOff)));
for (Response memberElement : memberElements) { for (Response memberElement : memberElements) {
remoteFiles.add(BrowserFile.getModelFromResponse(memberElement, remoteFiles.add(BrowserFile.getModelFromResponse(memberElement,
memberElement.getHref().toString().substring(basePath.length()))); memberElement.getHref().toString().substring(cutOff)));
} }
davResponse.setData(remoteFiles); davResponse.setData(remoteFiles);