projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ba43860
)
Update class OCFile to include value of permissions column into db as a field. Modify...
author
jabarros
<jabarros@solidgear.es>
Mon, 23 Jun 2014 09:25:43 +0000
(11:25 +0200)
committer
David A. Velasco
<dvelasco@solidgear.es>
Tue, 1 Jul 2014 07:59:28 +0000
(09:59 +0200)
src/com/owncloud/android/datamodel/OCFile.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/utils/FileStorageUtils.java
patch
|
blob
|
blame
|
history
diff --git
a/src/com/owncloud/android/datamodel/OCFile.java
b/src/com/owncloud/android/datamodel/OCFile.java
index
82c341c
..
ae2376d
100644
(file)
--- a/
src/com/owncloud/android/datamodel/OCFile.java
+++ b/
src/com/owncloud/android/datamodel/OCFile.java
@@
-65,6
+65,8
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
private boolean mShareByLink;
private String mPublicLink;
private boolean mShareByLink;
private String mPublicLink;
+ private String mPermissions;
+
/**
* Create new {@link OCFile} with given path.
/**
* Create new {@link OCFile} with given path.
@@
-104,6
+106,7
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
mEtag = source.readString();
mShareByLink = source.readInt() == 1;
mPublicLink = source.readString();
mEtag = source.readString();
mShareByLink = source.readInt() == 1;
mPublicLink = source.readString();
+ mPermissions = source.readString();
}
@Override
}
@Override
@@
-124,6
+127,7
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
dest.writeString(mEtag);
dest.writeInt(mShareByLink ? 1 : 0);
dest.writeString(mPublicLink);
dest.writeString(mEtag);
dest.writeInt(mShareByLink ? 1 : 0);
dest.writeString(mPublicLink);
+ dest.writeString(mPermissions);
}
/**
}
/**
@@
-334,6
+338,7
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
mEtag = null;
mShareByLink = false;
mPublicLink = null;
mEtag = null;
mShareByLink = false;
mPublicLink = null;
+ mPermissions = null;
}
/**
}
/**
@@
-518,4
+523,12
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
return (result != null) ? result : "";
}
return (result != null) ? result : "";
}
+ public String getPermissions() {
+ return mPermissions;
+ }
+
+ public void setPermissions(String permissions) {
+ this.mPermissions = permissions;
+ }
+
}
}
diff --git
a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index
a8e230d
..
a665d57
100644
(file)
--- a/
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@
-416,6
+416,7
@@
public class SynchronizeFolderOperation extends RemoteOperation {
file.setMimetype(remote.getMimeType());
file.setModificationTimestamp(remote.getModifiedTimestamp());
file.setEtag(remote.getEtag());
file.setMimetype(remote.getMimeType());
file.setModificationTimestamp(remote.getModifiedTimestamp());
file.setEtag(remote.getEtag());
+ file.setPermissions(remote.getPermissions());
return file;
}
return file;
}
diff --git
a/src/com/owncloud/android/utils/FileStorageUtils.java
b/src/com/owncloud/android/utils/FileStorageUtils.java
index
e8e8f48
..
2bf0554
100644
(file)
--- a/
src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/
src/com/owncloud/android/utils/FileStorageUtils.java
@@
-97,7
+97,7
@@
public class FileStorageUtils {
file.setMimetype(remote.getMimeType());
file.setModificationTimestamp(remote.getModifiedTimestamp());
file.setEtag(remote.getEtag());
file.setMimetype(remote.getMimeType());
file.setModificationTimestamp(remote.getModifiedTimestamp());
file.setEtag(remote.getEtag());
-
+ file.setPermissions(remote.getPermissions());
return file;
}
return file;
}
@@
-114,6
+114,7
@@
public class FileStorageUtils {
file.setMimeType(ocFile.getMimetype());
file.setModifiedTimestamp(ocFile.getModificationTimestamp());
file.setEtag(ocFile.getEtag());
file.setMimeType(ocFile.getMimetype());
file.setModifiedTimestamp(ocFile.getModificationTimestamp());
file.setEtag(ocFile.getEtag());
+ file.setPermissions(ocFile.getPermissions());
return file;
}
return file;
}