gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-05 22:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with filesystem browser

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-07-24 17:08:56 +02:00
parent c0c98a27a5
commit e1cdc58cef
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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