flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-11-04 12:28:25 +00:00
Code Issues Releases Wiki Activity

Fixed path of shares on folders, and changed 'drectory' by 'folder'

Browse Source
This commit is contained in:
David A. Velasco 2014-02-06 19:52:55 +01:00
parent d96e31b5e5
commit 858d5f1064
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/owncloud/android/lib/operations/common/OCShare.java
View File

@ -52,7 +52,7 @@ public class OCShare implements Parcelable{
private long mExpirationDate;
private String mToken;
private String mSharedWithDisplayName;
private boolean mIsDirectory;
private boolean mIsFolder;
private long mUserId;
private long mIdRemoteShared;
private String mShareLink;
@ -86,7 +86,7 @@ public class OCShare implements Parcelable{
mExpirationDate = 0;
mToken = null;
mSharedWithDisplayName = null;
mIsDirectory = false;
mIsFolder = false;
mUserId = -1;
mIdRemoteShared = -1;
mShareLink = null;
@ -182,12 +182,12 @@ public class OCShare implements Parcelable{
this.mSharedWithDisplayName = sharedWithDisplayName;
}
public boolean isDirectory() {
return mIsDirectory;
public boolean isFolder() {
return mIsFolder;
}
public void setIsDirectory(boolean isDirectory) {
this.mIsDirectory = isDirectory;
public void setIsFolder(boolean isFolder) {
this.mIsFolder = isFolder;
}
public long getUserId() {
@ -255,7 +255,7 @@ public class OCShare implements Parcelable{
mExpirationDate = source.readLong();
mToken = source.readString();
mSharedWithDisplayName = source.readString();
mIsDirectory = source.readInt() == 0;
mIsFolder = source.readInt() == 0;
mUserId = source.readLong();
mIdRemoteShared = source.readLong();
mShareLink = source.readString();
@ -281,7 +281,7 @@ public class OCShare implements Parcelable{
dest.writeLong(mExpirationDate);
dest.writeString(mToken);
dest.writeString(mSharedWithDisplayName);
dest.writeInt(mIsDirectory ? 1 : 0);
dest.writeInt(mIsFolder ? 1 : 0);
dest.writeLong(mUserId);
dest.writeLong(mIdRemoteShared);
dest.writeString(mShareLink);

2
src/com/owncloud/android/lib/utils/GetSharesForFileXMLParser.java
View File

@ -244,7 +244,7 @@ public class GetSharesForFileXMLParser {
share.setIdRemoteShared(Integer.parseInt(readNode(parser, NODE_ID)));
} else if (name.equalsIgnoreCase(NODE_ITEM_TYPE)) {
share.setIsDirectory(readNode(parser, NODE_ITEM_TYPE).equalsIgnoreCase(TYPE_FOLDER));
share.setIsFolder(readNode(parser, NODE_ITEM_TYPE).equalsIgnoreCase(TYPE_FOLDER));
} else if (name.equalsIgnoreCase(NODE_ITEM_SOURCE)) {
share.setItemSource(Long.parseLong(readNode(parser, NODE_ITEM_SOURCE)));

10
src/com/owncloud/android/lib/utils/ShareXMLParser.java
View File

@ -275,7 +275,8 @@ public class ShareXMLParser {
share.setIdRemoteShared(Integer.parseInt(readNode(parser, NODE_ID)));
} else if (name.equalsIgnoreCase(NODE_ITEM_TYPE)) {
share.setIsDirectory(readNode(parser, NODE_ITEM_TYPE).equalsIgnoreCase(TYPE_FOLDER));
share.setIsFolder(readNode(parser, NODE_ITEM_TYPE).equalsIgnoreCase(TYPE_FOLDER));
fixPathForFolder(share);
} else if (name.equalsIgnoreCase(NODE_ITEM_SOURCE)) {
share.setItemSource(Long.parseLong(readNode(parser, NODE_ITEM_SOURCE)));
@ -295,6 +296,7 @@ public class ShareXMLParser {
} else if (name.equalsIgnoreCase(NODE_PATH)) {
share.setPath(readNode(parser, NODE_PATH));
fixPathForFolder(share);
} else if (name.equalsIgnoreCase(NODE_PERMISSIONS)) {
share.setPermissions(Integer.parseInt(readNode(parser, NODE_PERMISSIONS)));
@ -327,6 +329,12 @@ public class ShareXMLParser {
return share;
}
private void fixPathForFolder(OCShare share) {
if (share.isFolder() && share.getPath() != null && share.getPath().length() > 0 && !share.getPath().endsWith(FileUtils.PATH_SEPARATOR)) {
share.setPath(share.getPath() + FileUtils.PATH_SEPARATOR);
}
}
/**
* Parse a node, to obtain its text. Needs readText method
* @param parser