Merge branch 'beta' of https://github.com/owncloud/android into beta

[pub/Android/ownCloud.git] / src / com / owncloud / android / datamodel / OCFile.java

diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java
index 8c7101b..4fcd439 100644 (file)
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -31,18 +31,18 @@ import java.io.File;
 import third_parties.daveKoeller.AlphanumComparator;
 public class OCFile implements Parcelable, Comparable<OCFile> {
 
 import third_parties.daveKoeller.AlphanumComparator;
 public class OCFile implements Parcelable, Comparable<OCFile> {
 

-    public static final Parcelable.Creator<OCFile> CREATOR = new Parcelable.Creator<OCFile>() {
-        @Override
+    public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {

         public OCFile createFromParcel(Parcel source) {
             return new OCFile(source);
         }
 
         public OCFile createFromParcel(Parcel source) {
             return new OCFile(source);
         }
 

-        @Override

         public OCFile[] newArray(int size) {
             return new OCFile[size];
         }
     };
 
         public OCFile[] newArray(int size) {
             return new OCFile[size];
         }
     };
 

+    private final static String PERMISSION_SHARED_WITH_ME = "S";    // TODO move to better location
+

     public static final String PATH_SEPARATOR = "/";
     public static final String ROOT_PATH = PATH_SEPARATOR;
 
     public static final String PATH_SEPARATOR = "/";
     public static final String ROOT_PATH = PATH_SEPARATOR;
 


@@ -74,9 +74,11 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
 
     private boolean mIsDownloading;
 
 
     private boolean mIsDownloading;
 

+    private boolean mShowGridView;
+

     private String mEtagInConflict;    // Save file etag in the server, when there is a conflict. No conflict =  null
 
     private String mEtagInConflict;    // Save file etag in the server, when there is a conflict. No conflict =  null
 

-    private boolean mShareWithUser;
+    private boolean mShareWithSharee;

 
 
     /**
 
 
     /**


@@ -122,7 +124,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;
+        mShareWithSharee = source.readInt() == 1;

 
     }
 
 
     }
 


@@ -149,7 +151,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);
+        dest.writeInt(mShareWithSharee ? 1 : 0);

     }
 
     /**
     }
 
     /**


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

-        mShareWithUser = false;
+        mShareWithSharee = false;

     }
 
     /**
     }
 
     /**


@@ -493,11 +495,12 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         this.mEtag = (etag != null ? etag : "");
     }
 
         this.mEtag = (etag != null ? etag : "");
     }
 

-    public boolean isShareByLink() {
+
+    public boolean isSharedViaLink() {

         return mShareByLink;
     }
 
         return mShareByLink;
     }
 

-    public void setShareByLink(boolean shareByLink) {
+    public void setShareViaLink(boolean shareByLink) {

         this.mShareByLink = shareByLink;
     }
 
         this.mShareByLink = shareByLink;
     }
 


@@ -597,12 +600,16 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mEtagInConflict = etagInConflict;
     }
 
         mEtagInConflict = etagInConflict;
     }
 

-    public boolean isShareWithUser() {
-        return mShareWithUser;
+    public boolean isSharedWithSharee() {
+        return mShareWithSharee;

     }
 
     }
 

-    public void setShareWithUser(boolean shareWithUser) {
-        this.mShareWithUser = shareWithUser;
+    public void setShareWithSharee(boolean shareWithSharee) {
+        this.mShareWithSharee = shareWithSharee;

     }
 
     }
 

+    public boolean isSharedWithMe() {
+        String permissions = getPermissions();
+        return (permissions != null && permissions.contains(PERMISSION_SHARED_WITH_ME));
+    }

 }
 }