mirror of
https://github.com/owncloud/android-library.git
synced 2025-06-07 16:06:08 +00:00
Merge pull request #327 from owncloud/new_arch/sync_user
[New Arch] Sync user profile
This commit is contained in:
Abel García de Prada
GitHub
commit
d28927712c
@ -1,185 +0,0 @@
|
|||||||
/* ownCloud Android Library is available under MIT license
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 ownCloud GmbH.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
||||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
||||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.owncloud.android.lib.resources.users;
|
|
||||||
|
|
||||||
import com.owncloud.android.lib.common.OwnCloudClient;
|
|
||||||
import com.owncloud.android.lib.common.http.HttpConstants;
|
|
||||||
import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
|
|
||||||
import com.owncloud.android.lib.common.network.WebdavUtils;
|
|
||||||
import com.owncloud.android.lib.common.operations.RemoteOperation;
|
|
||||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
|
|
||||||
import timber.log.Timber;
|
|
||||||
|
|
||||||
import java.io.BufferedInputStream;
|
|
||||||
import java.io.ByteArrayOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.net.URL;
|
|
||||||
|
|
||||||
import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets avatar about the user logged in, if available
|
|
||||||
*
|
|
||||||
* @author David A. Velasco
|
|
||||||
* @author David González Verdugo
|
|
||||||
*/
|
|
||||||
public class GetRemoteUserAvatarOperation extends RemoteOperation<GetRemoteUserAvatarOperation.ResultData> {
|
|
||||||
|
|
||||||
private static final String NON_OFFICIAL_AVATAR_PATH = "/index.php/avatar/";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Desired size in pixels of the squared image
|
|
||||||
*/
|
|
||||||
private int mDimension;
|
|
||||||
|
|
||||||
public GetRemoteUserAvatarOperation(int dimension) {
|
|
||||||
mDimension = dimension;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected RemoteOperationResult<ResultData> run(OwnCloudClient client) {
|
|
||||||
GetMethod getMethod = null;
|
|
||||||
RemoteOperationResult<ResultData> result;
|
|
||||||
InputStream inputStream = null;
|
|
||||||
BufferedInputStream bis = null;
|
|
||||||
ByteArrayOutputStream bos = null;
|
|
||||||
|
|
||||||
try {
|
|
||||||
final String url = client.getBaseUri() + NON_OFFICIAL_AVATAR_PATH + client.getCredentials().getUsername() + "/" + mDimension;
|
|
||||||
Timber.d("avatar URI: %s", url);
|
|
||||||
|
|
||||||
getMethod = new GetMethod(new URL(url));
|
|
||||||
|
|
||||||
int status = client.executeHttpMethod(getMethod);
|
|
||||||
|
|
||||||
if (isSuccess(status)) {
|
|
||||||
// find out size of file to read
|
|
||||||
int totalToTransfer = 0;
|
|
||||||
String contentLength = getMethod.getResponseHeader(HttpConstants.CONTENT_LENGTH_HEADER);
|
|
||||||
|
|
||||||
if (contentLength != null && contentLength.length() > 0) {
|
|
||||||
totalToTransfer = Integer.parseInt(contentLength);
|
|
||||||
}
|
|
||||||
|
|
||||||
// find out MIME-type!
|
|
||||||
String mimeType;
|
|
||||||
String contentType = getMethod.getResponseHeader(HttpConstants.CONTENT_TYPE_HEADER);
|
|
||||||
|
|
||||||
if (contentType == null || !contentType.startsWith("image")) {
|
|
||||||
Timber.w("Not an image, failing with no avatar");
|
|
||||||
result = new RemoteOperationResult<>(RemoteOperationResult.ResultCode.FILE_NOT_FOUND);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
mimeType = contentType;
|
|
||||||
|
|
||||||
/// download will be performed to a buffer
|
|
||||||
inputStream = getMethod.getResponseBodyAsStream();
|
|
||||||
bis = new BufferedInputStream(inputStream);
|
|
||||||
bos = new ByteArrayOutputStream(totalToTransfer);
|
|
||||||
|
|
||||||
byte[] bytes = new byte[4096];
|
|
||||||
int readResult;
|
|
||||||
while ((readResult = bis.read(bytes)) != -1) {
|
|
||||||
bos.write(bytes, 0, readResult);
|
|
||||||
}
|
|
||||||
// TODO check total bytes transferred?
|
|
||||||
|
|
||||||
// find out etag
|
|
||||||
String etag = WebdavUtils.getEtagFromResponse(getMethod);
|
|
||||||
if (etag.length() == 0) {
|
|
||||||
Timber.w("Could not read Etag from avatar");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Result
|
|
||||||
result = new RemoteOperationResult<>(OK);
|
|
||||||
result.setData(new ResultData(bos.toByteArray(), mimeType, etag));
|
|
||||||
|
|
||||||
} else {
|
|
||||||
result = new RemoteOperationResult<>(getMethod);
|
|
||||||
client.exhaustResponse(getMethod.getResponseBodyAsStream());
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
result = new RemoteOperationResult<>(e);
|
|
||||||
Timber.e(e, "Exception while getting OC user avatar");
|
|
||||||
|
|
||||||
} finally {
|
|
||||||
if (getMethod != null) {
|
|
||||||
try {
|
|
||||||
if (inputStream != null) {
|
|
||||||
client.exhaustResponse(inputStream);
|
|
||||||
if (bis != null) {
|
|
||||||
bis.close();
|
|
||||||
} else {
|
|
||||||
inputStream.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (IOException i) {
|
|
||||||
Timber.e(i, "Unexpected exception closing input stream");
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
if (bos != null) {
|
|
||||||
bos.close();
|
|
||||||
}
|
|
||||||
} catch (IOException o) {
|
|
||||||
Timber.e(o, "Unexpected exception closing output stream");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isSuccess(int status) {
|
|
||||||
return (status == HttpConstants.HTTP_OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ResultData {
|
|
||||||
private String mEtag;
|
|
||||||
private String mMimeType;
|
|
||||||
private byte[] mAvatarData;
|
|
||||||
|
|
||||||
ResultData(byte[] avatarData, String mimeType, String etag) {
|
|
||||||
mAvatarData = avatarData;
|
|
||||||
mMimeType = (mimeType == null) ? "" : mimeType;
|
|
||||||
mEtag = (etag == null) ? "" : etag;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getEtag() {
|
|
||||||
return mEtag;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getMimeType() {
|
|
||||||
return mMimeType;
|
|
||||||
}
|
|
||||||
|
|
||||||
public byte[] getAvatarData() {
|
|
||||||
return mAvatarData;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,114 @@
|
|||||||
|
/* ownCloud Android Library is available under MIT license
|
||||||
|
*
|
||||||
|
* Copyright (C) 2020 ownCloud GmbH.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||||
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||||
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
package com.owncloud.android.lib.resources.users
|
||||||
|
|
||||||
|
import com.owncloud.android.lib.common.OwnCloudClient
|
||||||
|
import com.owncloud.android.lib.common.http.HttpConstants
|
||||||
|
import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod
|
||||||
|
import com.owncloud.android.lib.common.network.WebdavUtils
|
||||||
|
import com.owncloud.android.lib.common.operations.RemoteOperation
|
||||||
|
import com.owncloud.android.lib.common.operations.RemoteOperationResult
|
||||||
|
import com.owncloud.android.lib.resources.files.FileUtils.PATH_SEPARATOR
|
||||||
|
import timber.log.Timber
|
||||||
|
import java.io.IOException
|
||||||
|
import java.io.InputStream
|
||||||
|
import java.net.URL
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets avatar about the user logged in, if available
|
||||||
|
*
|
||||||
|
* @author David A. Velasco
|
||||||
|
* @author David González Verdugo
|
||||||
|
*/
|
||||||
|
class GetRemoteUserAvatarOperation(private val avatarDimension: Int) : RemoteOperation<RemoteAvatarData>() {
|
||||||
|
override fun run(client: OwnCloudClient): RemoteOperationResult<RemoteAvatarData> {
|
||||||
|
var inputStream: InputStream? = null
|
||||||
|
var result: RemoteOperationResult<RemoteAvatarData>
|
||||||
|
|
||||||
|
try {
|
||||||
|
val endPoint =
|
||||||
|
client.baseUri.toString() + NON_OFFICIAL_AVATAR_PATH + client.credentials.username + PATH_SEPARATOR + avatarDimension
|
||||||
|
Timber.d("avatar URI: %s", endPoint)
|
||||||
|
|
||||||
|
val getMethod = GetMethod(URL(endPoint))
|
||||||
|
|
||||||
|
val status = client.executeHttpMethod(getMethod)
|
||||||
|
|
||||||
|
if (isSuccess(status)) {
|
||||||
|
// find out size of file to read
|
||||||
|
val contentLength = getMethod.getResponseHeader(HttpConstants.CONTENT_LENGTH_HEADER).toInt()
|
||||||
|
|
||||||
|
// find out MIME-type!
|
||||||
|
val mimeType = getMethod.getResponseHeader(HttpConstants.CONTENT_TYPE_HEADER)
|
||||||
|
|
||||||
|
if (mimeType == null || !mimeType.startsWith("image")) {
|
||||||
|
Timber.w("Not an image, failing with no avatar")
|
||||||
|
return RemoteOperationResult(RemoteOperationResult.ResultCode.FILE_NOT_FOUND)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// download will be performed to a buffer
|
||||||
|
inputStream = getMethod.responseBodyAsStream
|
||||||
|
val bytesArray = inputStream.readBytes()
|
||||||
|
|
||||||
|
// TODO check total bytes transferred?
|
||||||
|
Timber.d("Avatar size: Bytes received ${bytesArray.size} of $contentLength")
|
||||||
|
|
||||||
|
// find out etag
|
||||||
|
val etag = WebdavUtils.getEtagFromResponse(getMethod)
|
||||||
|
if (etag.isEmpty()) {
|
||||||
|
Timber.w("Could not read Etag from avatar")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Result
|
||||||
|
result = RemoteOperationResult(RemoteOperationResult.ResultCode.OK)
|
||||||
|
result.setData(RemoteAvatarData(bytesArray, mimeType, etag))
|
||||||
|
|
||||||
|
} else {
|
||||||
|
result = RemoteOperationResult(getMethod)
|
||||||
|
client.exhaustResponse(getMethod.responseBodyAsStream)
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (e: Exception) {
|
||||||
|
result = RemoteOperationResult(e)
|
||||||
|
Timber.e(e, "Exception while getting OC user avatar")
|
||||||
|
|
||||||
|
} finally {
|
||||||
|
try {
|
||||||
|
client.exhaustResponse(inputStream)
|
||||||
|
inputStream?.close()
|
||||||
|
} catch (i: IOException) {
|
||||||
|
Timber.e(i, "Unexpected exception closing input stream")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun isSuccess(status: Int) = status == HttpConstants.HTTP_OK
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private const val NON_OFFICIAL_AVATAR_PATH = "/index.php/avatar/"
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,185 +0,0 @@
|
|||||||
/* ownCloud Android Library is available under MIT license
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 ownCloud Inc.
|
|
||||||
* Copyright (C) 2015 Bartosz Przybylski
|
|
||||||
* Copyright (C) 2014 Marcello Steiner
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
||||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
||||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.owncloud.android.lib.resources.users;
|
|
||||||
|
|
||||||
import at.bitfire.dav4android.Property;
|
|
||||||
import at.bitfire.dav4android.property.QuotaAvailableBytes;
|
|
||||||
import at.bitfire.dav4android.property.QuotaUsedBytes;
|
|
||||||
import com.owncloud.android.lib.common.OwnCloudClient;
|
|
||||||
import com.owncloud.android.lib.common.http.HttpConstants;
|
|
||||||
import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
|
|
||||||
import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
|
|
||||||
import com.owncloud.android.lib.common.network.WebdavUtils;
|
|
||||||
import com.owncloud.android.lib.common.operations.RemoteOperation;
|
|
||||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
|
|
||||||
import timber.log.Timber;
|
|
||||||
|
|
||||||
import java.net.URL;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import static com.owncloud.android.lib.common.http.methods.webdav.DavConstants.DEPTH_0;
|
|
||||||
import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author marcello
|
|
||||||
* @author David González Verdugo
|
|
||||||
*/
|
|
||||||
public class GetRemoteUserQuotaOperation extends RemoteOperation<GetRemoteUserQuotaOperation.RemoteQuota> {
|
|
||||||
|
|
||||||
private String mRemotePath;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructor
|
|
||||||
*
|
|
||||||
* @param remotePath Remote path of the file.
|
|
||||||
*/
|
|
||||||
public GetRemoteUserQuotaOperation(String remotePath) {
|
|
||||||
mRemotePath = remotePath;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected RemoteOperationResult<RemoteQuota> run(OwnCloudClient client) {
|
|
||||||
RemoteOperationResult<RemoteQuota> result = null;
|
|
||||||
|
|
||||||
try {
|
|
||||||
PropfindMethod propfindMethod = new PropfindMethod(
|
|
||||||
new URL(client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
|
|
||||||
DEPTH_0,
|
|
||||||
DavUtils.getQuotaPropSet());
|
|
||||||
|
|
||||||
int status = client.executeHttpMethod(propfindMethod);
|
|
||||||
|
|
||||||
if (isSuccess(status)) {
|
|
||||||
RemoteQuota remoteQuota = readData(propfindMethod.getRoot().getProperties());
|
|
||||||
|
|
||||||
result = new RemoteOperationResult<>(OK);
|
|
||||||
|
|
||||||
// Add data to the result
|
|
||||||
if (result.isSuccess()) {
|
|
||||||
result.setData(remoteQuota);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else { // synchronization failed
|
|
||||||
result = new RemoteOperationResult<>(propfindMethod);
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
result = new RemoteOperationResult<>(e);
|
|
||||||
|
|
||||||
} finally {
|
|
||||||
if (result.isSuccess()) {
|
|
||||||
Timber.i("Get quota from " + mRemotePath + ": " + result.getLogMessage());
|
|
||||||
} else {
|
|
||||||
if (result.isException()) {
|
|
||||||
Timber.e(result.getException(), "Get quota from " + mRemotePath + ": " + result.getLogMessage());
|
|
||||||
} else {
|
|
||||||
Timber.e("Get quota from " + mRemotePath + ": " + result.getLogMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isSuccess(int status) {
|
|
||||||
return status == HttpConstants.HTTP_MULTI_STATUS || status == HttpConstants.HTTP_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Read the data retrieved from the server about the quota
|
|
||||||
*
|
|
||||||
* @param properties WebDAV properties containing quota data
|
|
||||||
* @return new {@link RemoteQuota} instance representing the data read from the server
|
|
||||||
*/
|
|
||||||
private RemoteQuota readData(List<Property> properties) {
|
|
||||||
long quotaAvailable = 0;
|
|
||||||
long quotaUsed = 0;
|
|
||||||
|
|
||||||
for (Property property : properties) {
|
|
||||||
if (property instanceof QuotaAvailableBytes) {
|
|
||||||
quotaAvailable = ((QuotaAvailableBytes) property).getQuotaAvailableBytes();
|
|
||||||
}
|
|
||||||
if (property instanceof QuotaUsedBytes) {
|
|
||||||
quotaUsed = ((QuotaUsedBytes) property).getQuotaUsedBytes();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// If there's a special case, quota available will contain a negative code
|
|
||||||
// -1, PENDING: Not computed yet, e.g. external storage mounted but folder sizes need scanning
|
|
||||||
// -2, UNKNOWN: Storage not accessible, e.g. external storage with no API to ask for the free space
|
|
||||||
// -3, UNLIMITED: Quota using all the storage
|
|
||||||
if (quotaAvailable < 0) {
|
|
||||||
return new RemoteQuota(
|
|
||||||
quotaAvailable,
|
|
||||||
quotaUsed,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
long totalQuota = quotaAvailable + quotaUsed;
|
|
||||||
double relativeQuota = (double) (quotaUsed * 100) / totalQuota;
|
|
||||||
double roundedRelativeQuota = Math.round(relativeQuota * 100) / 100.0d;
|
|
||||||
|
|
||||||
return new RemoteQuota(
|
|
||||||
quotaAvailable,
|
|
||||||
quotaUsed,
|
|
||||||
totalQuota,
|
|
||||||
roundedRelativeQuota
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static public class RemoteQuota {
|
|
||||||
|
|
||||||
long mFree, mUsed, mTotal;
|
|
||||||
double mRelative;
|
|
||||||
|
|
||||||
public RemoteQuota(long free, long used, long total, double relative) {
|
|
||||||
mFree = free;
|
|
||||||
mUsed = used;
|
|
||||||
mTotal = total;
|
|
||||||
mRelative = relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
public long getFree() {
|
|
||||||
return mFree;
|
|
||||||
}
|
|
||||||
|
|
||||||
public long getUsed() {
|
|
||||||
return mUsed;
|
|
||||||
}
|
|
||||||
|
|
||||||
public long getTotal() {
|
|
||||||
return mTotal;
|
|
||||||
}
|
|
||||||
|
|
||||||
public double getRelative() {
|
|
||||||
return mRelative;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,119 @@
|
|||||||
|
/* ownCloud Android Library is available under MIT license
|
||||||
|
*
|
||||||
|
* Copyright (C) 2020 ownCloud Inc.
|
||||||
|
* Copyright (C) 2015 Bartosz Przybylski
|
||||||
|
* Copyright (C) 2014 Marcello Steiner
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||||
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||||
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
package com.owncloud.android.lib.resources.users
|
||||||
|
|
||||||
|
import at.bitfire.dav4android.Property
|
||||||
|
import at.bitfire.dav4android.property.QuotaAvailableBytes
|
||||||
|
import at.bitfire.dav4android.property.QuotaUsedBytes
|
||||||
|
import com.owncloud.android.lib.common.OwnCloudClient
|
||||||
|
import com.owncloud.android.lib.common.http.HttpConstants
|
||||||
|
import com.owncloud.android.lib.common.http.methods.webdav.DavConstants
|
||||||
|
import com.owncloud.android.lib.common.http.methods.webdav.DavUtils
|
||||||
|
import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod
|
||||||
|
import com.owncloud.android.lib.common.operations.RemoteOperation
|
||||||
|
import com.owncloud.android.lib.common.operations.RemoteOperationResult
|
||||||
|
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
|
||||||
|
import com.owncloud.android.lib.resources.users.GetRemoteUserQuotaOperation.RemoteQuota
|
||||||
|
import timber.log.Timber
|
||||||
|
import java.net.URL
|
||||||
|
import kotlin.math.roundToLong
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author marcello
|
||||||
|
* @author David González Verdugo
|
||||||
|
*/
|
||||||
|
class GetRemoteUserQuotaOperation : RemoteOperation<RemoteQuota>() {
|
||||||
|
override fun run(client: OwnCloudClient): RemoteOperationResult<RemoteQuota> =
|
||||||
|
try {
|
||||||
|
val propfindMethod = PropfindMethod(
|
||||||
|
URL(client.userFilesWebDavUri.toString()),
|
||||||
|
DavConstants.DEPTH_0,
|
||||||
|
DavUtils.getQuotaPropSet()
|
||||||
|
)
|
||||||
|
with(client.executeHttpMethod(propfindMethod)) {
|
||||||
|
if (isSuccess(this)) {
|
||||||
|
RemoteOperationResult<RemoteQuota>(ResultCode.OK).apply {
|
||||||
|
data = readData(propfindMethod.root.properties)
|
||||||
|
}.also {
|
||||||
|
Timber.i("Get quota completed: ${it.data} and message: ${it.logMessage}")
|
||||||
|
}
|
||||||
|
} else { // synchronization failed
|
||||||
|
RemoteOperationResult<RemoteQuota>(propfindMethod).also {
|
||||||
|
Timber.e("Get quota without success: ${it.logMessage}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
RemoteOperationResult<RemoteQuota>(e).also {
|
||||||
|
Timber.e(it.exception, "Get quota: ${it.logMessage}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun isSuccess(status: Int) = status == HttpConstants.HTTP_MULTI_STATUS || status == HttpConstants.HTTP_OK
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Read the data retrieved from the server about the quota
|
||||||
|
*
|
||||||
|
* @param properties WebDAV properties containing quota data
|
||||||
|
* @return new [RemoteQuota] instance representing the data read from the server
|
||||||
|
*/
|
||||||
|
private fun readData(properties: List<Property>): RemoteQuota {
|
||||||
|
var quotaAvailable: Long = 0
|
||||||
|
var quotaUsed: Long = 0
|
||||||
|
for (property in properties) {
|
||||||
|
if (property is QuotaAvailableBytes) {
|
||||||
|
quotaAvailable = property.quotaAvailableBytes
|
||||||
|
}
|
||||||
|
if (property is QuotaUsedBytes) {
|
||||||
|
quotaUsed = property.quotaUsedBytes
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Timber.d("Quota used: $quotaUsed, QuotaAvailable: $quotaAvailable")
|
||||||
|
// If there's a special case, quota available will contain a negative code
|
||||||
|
// -1, PENDING: Not computed yet, e.g. external storage mounted but folder sizes need scanning
|
||||||
|
// -2, UNKNOWN: Storage not accessible, e.g. external storage with no API to ask for the free space
|
||||||
|
// -3, UNLIMITED: Quota using all the storage
|
||||||
|
return if (quotaAvailable < 0) {
|
||||||
|
RemoteQuota(
|
||||||
|
free = quotaAvailable,
|
||||||
|
used = quotaUsed,
|
||||||
|
total = 0,
|
||||||
|
relative = 0.0
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
val totalQuota = quotaAvailable + quotaUsed
|
||||||
|
val roundedRelativeQuota = if (totalQuota > 0) {
|
||||||
|
val relativeQuota = (quotaUsed * 100).toDouble() / totalQuota
|
||||||
|
(relativeQuota * 100).roundToLong() / 100.0
|
||||||
|
} else 0.0
|
||||||
|
|
||||||
|
RemoteQuota(quotaAvailable, quotaUsed, totalQuota, roundedRelativeQuota)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
data class RemoteQuota(var free: Long, var used: Long, var total: Long, var relative: Double)
|
||||||
|
}
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
/* ownCloud Android Library is available under MIT license
|
||||||
|
*
|
||||||
|
* Copyright (C) 2020 ownCloud GmbH.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||||
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||||
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package com.owncloud.android.lib.resources.users
|
||||||
|
|
||||||
|
data class RemoteAvatarData(
|
||||||
|
val avatarData: ByteArray = byteArrayOf(),
|
||||||
|
val mimeType: String = "",
|
||||||
|
val eTag: String = ""
|
||||||
|
)
|
||||||
@ -26,8 +26,12 @@ package com.owncloud.android.lib.resources.users.services
|
|||||||
|
|
||||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult
|
import com.owncloud.android.lib.common.operations.RemoteOperationResult
|
||||||
import com.owncloud.android.lib.resources.Service
|
import com.owncloud.android.lib.resources.Service
|
||||||
|
import com.owncloud.android.lib.resources.users.GetRemoteUserQuotaOperation
|
||||||
|
import com.owncloud.android.lib.resources.users.RemoteAvatarData
|
||||||
import com.owncloud.android.lib.resources.users.RemoteUserInfo
|
import com.owncloud.android.lib.resources.users.RemoteUserInfo
|
||||||
|
|
||||||
interface UserService: Service {
|
interface UserService : Service {
|
||||||
fun getUserInfo() : RemoteOperationResult<RemoteUserInfo>
|
fun getUserInfo(): RemoteOperationResult<RemoteUserInfo>
|
||||||
|
fun getUserQuota(): RemoteOperationResult<GetRemoteUserQuotaOperation.RemoteQuota>
|
||||||
|
fun getUserAvatar(avatarDimension: Int): RemoteOperationResult<RemoteAvatarData>
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,12 +21,21 @@ package com.owncloud.android.lib.resources.users.services.implementation
|
|||||||
|
|
||||||
import com.owncloud.android.lib.common.OwnCloudClient
|
import com.owncloud.android.lib.common.OwnCloudClient
|
||||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult
|
import com.owncloud.android.lib.common.operations.RemoteOperationResult
|
||||||
|
import com.owncloud.android.lib.resources.users.GetRemoteUserAvatarOperation
|
||||||
import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation
|
import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation
|
||||||
|
import com.owncloud.android.lib.resources.users.GetRemoteUserQuotaOperation
|
||||||
|
import com.owncloud.android.lib.resources.users.RemoteAvatarData
|
||||||
import com.owncloud.android.lib.resources.users.RemoteUserInfo
|
import com.owncloud.android.lib.resources.users.RemoteUserInfo
|
||||||
import com.owncloud.android.lib.resources.users.services.UserService
|
import com.owncloud.android.lib.resources.users.services.UserService
|
||||||
|
|
||||||
class OCUserService(override val client: OwnCloudClient) :
|
class OCUserService(override val client: OwnCloudClient) : UserService {
|
||||||
UserService {
|
|
||||||
override fun getUserInfo(): RemoteOperationResult<RemoteUserInfo> =
|
override fun getUserInfo(): RemoteOperationResult<RemoteUserInfo> =
|
||||||
GetRemoteUserInfoOperation().execute(client)
|
GetRemoteUserInfoOperation().execute(client)
|
||||||
|
|
||||||
|
override fun getUserQuota(): RemoteOperationResult<GetRemoteUserQuotaOperation.RemoteQuota> =
|
||||||
|
GetRemoteUserQuotaOperation().execute(client)
|
||||||
|
|
||||||
|
override fun getUserAvatar(avatarDimension: Int): RemoteOperationResult<RemoteAvatarData> =
|
||||||
|
GetRemoteUserAvatarOperation(avatarDimension).execute(client)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user