flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #362 from owncloud/fix/ocis_size

Browse Source 
Use constants instead of hardcoded values for dir mimetypes
This commit is contained in:
Abel García de Prada 2021-01-14 13:44:16 +01:00 committed by GitHub
commit 7ccda7d249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/FileUtils.java
View File

@ -30,6 +30,8 @@ import java.io.File;
public class FileUtils { public class FileUtils {
public static final String FINAL_CHUNKS_FILE = ".file"; public static final String FINAL_CHUNKS_FILE = ".file";
public static final String MIME_DIR = "DIR";
public static final String MIME_DIR_UNIX = "httpd/unix-directory";
static String getParentPath(String remotePath) { static String getParentPath(String remotePath) {
String parentPath = new File(remotePath).getParent(); String parentPath = new File(remotePath).getParent();

25
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RemoteFile.java
View File

@ -29,7 +29,17 @@ import android.os.Parcelable;
import at.bitfire.dav4jvm.Property; import at.bitfire.dav4jvm.Property;
import at.bitfire.dav4jvm.Response; import at.bitfire.dav4jvm.Response;
import at.bitfire.dav4jvm.property.*; import at.bitfire.dav4jvm.property.CreationDate;
import at.bitfire.dav4jvm.property.GetContentLength;
import at.bitfire.dav4jvm.property.GetContentType;
import at.bitfire.dav4jvm.property.GetETag;
import at.bitfire.dav4jvm.property.GetLastModified;
import at.bitfire.dav4jvm.property.OCId;
import at.bitfire.dav4jvm.property.OCPermissions;
import at.bitfire.dav4jvm.property.OCPrivatelink;
import at.bitfire.dav4jvm.property.OCSize;
import at.bitfire.dav4jvm.property.QuotaAvailableBytes;
import at.bitfire.dav4jvm.property.QuotaUsedBytes;
import java.io.File; import java.io.File;
import java.io.Serializable; import java.io.Serializable;
@ -83,7 +93,8 @@ public class RemoteFile implements Parcelable, Serializable {
/** /**
* Create new {@link RemoteFile} with given path. * Create new {@link RemoteFile} with given path.
* <p> * <p>
* The path received must be URL-decoded. Path separator must be File.separator, and it must be the first character in 'path'. * The path received must be URL-decoded. Path separator must be File.separator, and it must be the first
* character in 'path'.
* *
* @param path The remote path of the file. * @param path The remote path of the file.
*/ */
@ -95,7 +106,7 @@ public class RemoteFile implements Parcelable, Serializable {
mRemotePath = path; mRemotePath = path;
mCreationTimestamp = 0; mCreationTimestamp = 0;
mLength = 0; mLength = 0;
mMimeType = "DIR"; mMimeType = FileUtils.MIME_DIR;
mQuotaUsedBytes = BigDecimal.ZERO; mQuotaUsedBytes = BigDecimal.ZERO;
mQuotaAvailableBytes = BigDecimal.ZERO; mQuotaAvailableBytes = BigDecimal.ZERO;
mPrivateLink = null; mPrivateLink = null;
@ -154,6 +165,14 @@ public class RemoteFile implements Parcelable, Serializable {
readFromParcel(source); readFromParcel(source);
} }
/**
* Use this to find out if this file is a folder.
*
* @return true if it is a folder
*/
public boolean isFolder() {
return mMimeType != null && (mMimeType.equals(FileUtils.MIME_DIR) || mMimeType.equals(FileUtils.MIME_DIR_UNIX));
}
/** /**
* Getters and Setters * Getters and Setters