From f0c302b0f8d3d263621c4c2cbb059dcd7ccbc3b4 Mon Sep 17 00:00:00 2001 From: purigarcia Date: Wed, 8 Jul 2015 09:08:49 +0200 Subject: [PATCH] first step to detect if the file is favorite --- src/com/owncloud/android/datamodel/OCFile.java | 13 +++++++++++++ src/com/owncloud/android/files/FileMenuFilter.java | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java index 2c9c53be..32e118b6 100644 --- a/src/com/owncloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -67,6 +67,8 @@ public class OCFile implements Parcelable, Comparable { private boolean mShareByLink; private String mPublicLink; + private boolean mFavorite; + private String mPermissions; private String mRemoteId; @@ -112,6 +114,7 @@ public class OCFile implements Parcelable, Comparable { mLastSyncDateForData = source.readLong(); mEtag = source.readString(); mShareByLink = source.readInt() == 1; + mFavorite = source.readInt() == 1; mPublicLink = source.readString(); mPermissions = source.readString(); mRemoteId = source.readString(); @@ -137,6 +140,7 @@ public class OCFile implements Parcelable, Comparable { dest.writeLong(mLastSyncDateForData); dest.writeString(mEtag); dest.writeInt(mShareByLink ? 1 : 0); + dest.writeInt(mFavorite ? 1 : 0); dest.writeString(mPublicLink); dest.writeString(mPermissions); dest.writeString(mRemoteId); @@ -350,6 +354,7 @@ public class OCFile implements Parcelable, Comparable { mNeedsUpdating = false; mEtag = null; mShareByLink = false; + mFavorite = false; mPublicLink = null; mPermissions = null; mRemoteId = null; @@ -505,6 +510,14 @@ public class OCFile implements Parcelable, Comparable { this.mShareByLink = shareByLink; } + public boolean isFavorite() { + return mFavorite; + } + + public void setFavorite(boolean mFavorite) { + this.mFavorite = mFavorite; + } + public String getPublicLink() { return mPublicLink; } diff --git a/src/com/owncloud/android/files/FileMenuFilter.java b/src/com/owncloud/android/files/FileMenuFilter.java index 7ed21e49..2c2754cc 100644 --- a/src/com/owncloud/android/files/FileMenuFilter.java +++ b/src/com/owncloud/android/files/FileMenuFilter.java @@ -216,14 +216,14 @@ public class FileMenuFilter { } // FAVORITES - if (mFile == null || downloading || uploading || mFile.isFolder()) { + if (mFile == null || downloading || uploading || mFile.isFolder() || mFile.isFavorite()) { toHide.add(R.id.action_favorite_file); } else { toShow.add(R.id.action_favorite_file); } // UNFAVORITES - if (mFile == null || downloading || uploading || mFile.isFolder()) { + if (mFile == null || downloading || uploading || mFile.isFolder() || !mFile.isFavorite()) { toHide.add(R.id.action_unfavorite_file); } else { toShow.add(R.id.action_unfavorite_file); -- 2.11.0