Add new attribute to OCFile to know if this file is shared with users/groups

diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java
index fcde054..4b68986 100644 (file)
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -75,6 +75,7 @@ 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;

 
 
     /**
 
 
     /**


@@ -120,6 +121,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();

+        mShareWithUser = source.readInt() == 1;

 
     }
 
 
     }
 


@@ -146,6 +148,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(mShareWithUser ? 1 : 0);

     }
 
     /**
     }
 
     /**


@@ -344,6 +347,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mNeedsUpdateThumbnail = false;
         mIsDownloading = false;
         mEtagInConflict = null;
         mNeedsUpdateThumbnail = false;
         mIsDownloading = false;
         mEtagInConflict = null;

+        mShareWithUser = false;

     }
 
     /**
     }
 
     /**


@@ -591,4 +595,12 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     public void setEtagInConflict(String etagInConflict) {
         mEtagInConflict = etagInConflict;
     }
     public void setEtagInConflict(String etagInConflict) {
         mEtagInConflict = etagInConflict;
     }

+
+    public boolean isShareWithUser() {
+        return mShareWithUser;
+    }
+
+    public void setShareWithUser(boolean shareWithUser) {
+        this.mShareWithUser = shareWithUser;
+    }

 }
 }

diff --git a/src/com/owncloud/android/files/FileMenuFilter.java b/src/com/owncloud/android/files/FileMenuFilter.java
index 6d53c99..01ca41f 100644 (file)
--- a/src/com/owncloud/android/files/FileMenuFilter.java
+++ b/src/com/owncloud/android/files/FileMenuFilter.java
@@ -209,7 +209,7 @@ public class FileMenuFilter {
         }
 
         // UNSHARE FILE, with Users
         }
 
         // UNSHARE FILE, with Users

-        if ( !shareAllowed || !shareWithUsersEnable || (mFile == null || !mFile.isShareByLink())) {
+        if ( !shareAllowed || !shareWithUsersEnable || (mFile == null || !mFile.isShareWithUser())) {

             toHide.add(R.id.action_unshare_with_users);
         } else {
             toShow.add(R.id.action_unshare_with_users);
             toHide.add(R.id.action_unshare_with_users);
         } else {
             toShow.add(R.id.action_unshare_with_users);