From: purigarcia <pgarcia@solidgear.es>
Date: Wed, 8 Jul 2015 07:12:40 +0000 (+0200)
Subject: reuse a existing method, remove the new one
X-Git-Tag: oc-android-1.8~60^2~10
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/684104ccb86e5f4a29268110ef2fbbce7d33b6da?hp=--cc

reuse a existing method, remove the new one
---

684104ccb86e5f4a29268110ef2fbbce7d33b6da
diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java
index 32e118b6..2c9c53be 100644
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -67,8 +67,6 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     private boolean mShareByLink;
     private String mPublicLink;
 
-    private boolean mFavorite;
-
     private String mPermissions;
     private String mRemoteId;
 
@@ -114,7 +112,6 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mLastSyncDateForData = source.readLong();
         mEtag = source.readString();
         mShareByLink = source.readInt() == 1;
-        mFavorite = source.readInt() == 1;
         mPublicLink = source.readString();
         mPermissions = source.readString();
         mRemoteId = source.readString();
@@ -140,7 +137,6 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         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);
@@ -354,7 +350,6 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mNeedsUpdating = false;
         mEtag = null;
         mShareByLink = false;
-        mFavorite = false;
         mPublicLink = null;
         mPermissions = null;
         mRemoteId = null;
@@ -510,14 +505,6 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         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 2c2754cc..45aef48c 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() || mFile.isFavorite()) {
+        if (mFile == null || downloading || uploading || mFile.isFolder() || mFile.keepInSync()) {
             toHide.add(R.id.action_favorite_file);
         } else {
             toShow.add(R.id.action_favorite_file);
         }
 
         // UNFAVORITES
-        if (mFile == null || downloading || uploading || mFile.isFolder() || !mFile.isFavorite()) {
+        if (mFile == null || downloading || uploading || mFile.isFolder() || !mFile.keepInSync()) {
             toHide.add(R.id.action_unfavorite_file);
         } else {
             toShow.add(R.id.action_unfavorite_file);