From: jabarros Date: Mon, 23 Jun 2014 09:25:43 +0000 (+0200) Subject: Update class OCFile to include value of permissions column into db as a field. Modify... X-Git-Tag: oc-android-1.7.0_signed~267^2~11 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/80f6250604e0309a7053adbdd1c4b48ff249791a Update class OCFile to include value of permissions column into db as a field. Modify SyncronizeFolderOperation and FileStorageUtils for setting permissions value --- diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java index 82c341ca..ae2376db 100644 --- 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 { private boolean mShareByLink; private String mPublicLink; + private String mPermissions; + /** * Create new {@link OCFile} with given path. @@ -104,6 +106,7 @@ public class OCFile implements Parcelable, Comparable { mEtag = source.readString(); mShareByLink = source.readInt() == 1; mPublicLink = source.readString(); + mPermissions = source.readString(); } @Override @@ -124,6 +127,7 @@ public class OCFile implements Parcelable, Comparable { dest.writeString(mEtag); dest.writeInt(mShareByLink ? 1 : 0); dest.writeString(mPublicLink); + dest.writeString(mPermissions); } /** @@ -334,6 +338,7 @@ public class OCFile implements Parcelable, Comparable { mEtag = null; mShareByLink = false; mPublicLink = null; + mPermissions = null; } /** @@ -518,4 +523,12 @@ public class OCFile implements Parcelable, Comparable { 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 a8e230d5..a665d570 100644 --- 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.setPermissions(remote.getPermissions()); return file; } diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java index e8e8f48b..2bf05545 100644 --- 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.setPermissions(remote.getPermissions()); return file; } @@ -114,6 +114,7 @@ public class FileStorageUtils { file.setMimeType(ocFile.getMimetype()); file.setModifiedTimestamp(ocFile.getModificationTimestamp()); file.setEtag(ocFile.getEtag()); + file.setPermissions(ocFile.getPermissions()); return file; }