projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show users/groups in Search Fragment list
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
datamodel
/
OCFile.java
diff --git
a/src/com/owncloud/android/datamodel/OCFile.java
b/src/com/owncloud/android/datamodel/OCFile.java
index
4b68986
..
a6da654
100644
(file)
--- a/
src/com/owncloud/android/datamodel/OCFile.java
+++ b/
src/com/owncloud/android/datamodel/OCFile.java
@@
-43,6
+43,8
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
}
};
}
};
+ private final static String PERMISSION_SHARED_WITH_ME = "S"; // TODO move to better location
+
public static final String PATH_SEPARATOR = "/";
public static final String ROOT_PATH = PATH_SEPARATOR;
public static final String PATH_SEPARATOR = "/";
public static final String ROOT_PATH = PATH_SEPARATOR;
@@
-75,7
+77,8
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
private boolean mIsDownloading;
private String mEtagInConflict; // Save file etag in the server, when there is a conflict. No conflict = null
private boolean mIsDownloading;
private String mEtagInConflict; // Save file etag in the server, when there is a conflict. No conflict = null
- private boolean mShareWithUser;
+
+ private boolean mShareWithSharee;
/**
/**
@@
-121,7
+124,7
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
mNeedsUpdateThumbnail = source.readInt() == 1;
mIsDownloading = source.readInt() == 1;
mEtagInConflict = source.readString();
mNeedsUpdateThumbnail = source.readInt() == 1;
mIsDownloading = source.readInt() == 1;
mEtagInConflict = source.readString();
- mShareWith
User
= source.readInt() == 1;
+ mShareWith
Sharee
= source.readInt() == 1;
}
}
@@
-148,7
+151,7
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
dest.writeInt(mNeedsUpdateThumbnail ? 1 : 0);
dest.writeInt(mIsDownloading ? 1 : 0);
dest.writeString(mEtagInConflict);
dest.writeInt(mNeedsUpdateThumbnail ? 1 : 0);
dest.writeInt(mIsDownloading ? 1 : 0);
dest.writeString(mEtagInConflict);
- dest.writeInt(mShareWith
User
? 1 : 0);
+ dest.writeInt(mShareWith
Sharee
? 1 : 0);
}
/**
}
/**
@@
-347,7
+350,7
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
mNeedsUpdateThumbnail = false;
mIsDownloading = false;
mEtagInConflict = null;
mNeedsUpdateThumbnail = false;
mIsDownloading = false;
mEtagInConflict = null;
- mShareWith
User
= false;
+ mShareWith
Sharee
= false;
}
/**
}
/**
@@
-492,11
+495,12
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
this.mEtag = (etag != null ? etag : "");
}
this.mEtag = (etag != null ? etag : "");
}
- public boolean isShareByLink() {
+
+ public boolean isSharedViaLink() {
return mShareByLink;
}
return mShareByLink;
}
- public void setShare
By
Link(boolean shareByLink) {
+ public void setShare
Via
Link(boolean shareByLink) {
this.mShareByLink = shareByLink;
}
this.mShareByLink = shareByLink;
}
@@
-596,11
+600,16
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
mEtagInConflict = etagInConflict;
}
mEtagInConflict = etagInConflict;
}
- public boolean isShareWithUser() {
- return mShareWithUser;
+ public boolean isSharedWithSharee() {
+ return mShareWithSharee;
+ }
+
+ public void setShareWithSharee(boolean shareWithSharee) {
+ this.mShareWithSharee = shareWithSharee;
}
}
- public void setShareWithUser(boolean shareWithUser) {
- this.mShareWithUser = shareWithUser;
+ public boolean isSharedWithMe() {
+ String permissions = getPermissions();
+ return (permissions != null && permissions.contains(PERMISSION_SHARED_WITH_ME));
}
}
}
}