Merge branch 'zmatsuo-detailThumbnail' into develop

[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 32e118b..4baf1ea 100644 (file)
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -22,9 +22,9 @@ package com.owncloud.android.datamodel;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
 import android.os.Parcel;
 import android.os.Parcelable;

+import android.webkit.MimeTypeMap;

 
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import com.owncloud.android.lib.common.utils.Log_OC;

-import com.owncloud.android.utils.FileStorageUtils;

 
 import java.io.File;
 
 
 import java.io.File;
 


@@ -60,15 +60,13 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     private boolean mNeedsUpdating;
     private long mLastSyncDateForProperties;
     private long mLastSyncDateForData;
     private boolean mNeedsUpdating;
     private long mLastSyncDateForProperties;
     private long mLastSyncDateForData;

-    private boolean mKeepInSync;
+    private boolean mFavorite;

 
     private String mEtag;
 
     private boolean mShareByLink;
     private String mPublicLink;
 
 
     private String mEtag;
 
     private boolean mShareByLink;
     private String mPublicLink;
 

-    private boolean mFavorite;
-

     private String mPermissions;
     private String mRemoteId;
 
     private String mPermissions;
     private String mRemoteId;
 


@@ -109,12 +107,11 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mLocalPath = source.readString();
         mMimeType = source.readString();
         mNeedsUpdating = source.readInt() == 0;
         mLocalPath = source.readString();
         mMimeType = source.readString();
         mNeedsUpdating = source.readInt() == 0;

-        mKeepInSync = source.readInt() == 1;
+        mFavorite = source.readInt() == 1;

         mLastSyncDateForProperties = source.readLong();
         mLastSyncDateForData = source.readLong();
         mEtag = source.readString();
         mShareByLink = source.readInt() == 1;
         mLastSyncDateForProperties = source.readLong();
         mLastSyncDateForData = source.readLong();
         mEtag = source.readString();
         mShareByLink = source.readInt() == 1;

-        mFavorite = source.readInt() == 1;

         mPublicLink = source.readString();
         mPermissions = source.readString();
         mRemoteId = source.readString();
         mPublicLink = source.readString();
         mPermissions = source.readString();
         mRemoteId = source.readString();


@@ -135,12 +132,11 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         dest.writeString(mLocalPath);
         dest.writeString(mMimeType);
         dest.writeInt(mNeedsUpdating ? 1 : 0);
         dest.writeString(mLocalPath);
         dest.writeString(mMimeType);
         dest.writeInt(mNeedsUpdating ? 1 : 0);

-        dest.writeInt(mKeepInSync ? 1 : 0);
+        dest.writeInt(mFavorite ? 1 : 0);

         dest.writeLong(mLastSyncDateForProperties);
         dest.writeLong(mLastSyncDateForData);
         dest.writeString(mEtag);
         dest.writeInt(mShareByLink ? 1 : 0);
         dest.writeLong(mLastSyncDateForProperties);
         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);
         dest.writeString(mPublicLink);
         dest.writeString(mPermissions);
         dest.writeString(mRemoteId);


@@ -293,11 +289,13 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     /**
      * Sets the name of the file
      * <p/>
     /**
      * Sets the name of the file
      * <p/>

-     * Does nothing if the new name is null, empty or includes "/" ; or if the file is the root directory
+     * Does nothing if the new name is null, empty or includes "/" ; or if the file is the root
+     * directory

      */
     public void setFileName(String name) {
         Log_OC.d(TAG, "OCFile name changin from " + mRemotePath);
      */
     public void setFileName(String name) {
         Log_OC.d(TAG, "OCFile name changin from " + mRemotePath);

-        if (name != null && name.length() > 0 && !name.contains(PATH_SEPARATOR) && !mRemotePath.equals(ROOT_PATH)) {
+        if (name != null && name.length() > 0 && !name.contains(PATH_SEPARATOR) &&
+                !mRemotePath.equals(ROOT_PATH)) {

             String parent = (new File(getRemotePath())).getParent();
             parent = (parent.endsWith(PATH_SEPARATOR)) ? parent : parent + PATH_SEPARATOR;
             mRemotePath = parent + name;
             String parent = (new File(getRemotePath())).getParent();
             parent = (parent.endsWith(PATH_SEPARATOR)) ? parent : parent + PATH_SEPARATOR;
             mRemotePath = parent + name;


@@ -350,11 +348,10 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mModifiedTimestampAtLastSyncForData = 0;
         mLastSyncDateForProperties = 0;
         mLastSyncDateForData = 0;
         mModifiedTimestampAtLastSyncForData = 0;
         mLastSyncDateForProperties = 0;
         mLastSyncDateForData = 0;

-        mKeepInSync = false;
+        mFavorite = false;

         mNeedsUpdating = false;
         mEtag = null;
         mShareByLink = false;
         mNeedsUpdating = false;
         mEtag = null;
         mShareByLink = false;

-        mFavorite = false;

         mPublicLink = null;
         mPermissions = null;
         mRemoteId = null;
         mPublicLink = null;
         mPermissions = null;
         mRemoteId = null;


@@ -449,17 +446,17 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mLastSyncDateForData = lastSyncDate;
     }
 
         mLastSyncDateForData = lastSyncDate;
     }
 

-    public void setKeepInSync(boolean keepInSync) {
-        mKeepInSync = keepInSync;
+    public void setFavorite(boolean favorite) {
+        mFavorite = favorite;

     }
 
     }
 

-    public boolean keepInSync() {
-        return mKeepInSync;
+    public boolean isFavorite() {
+        return mFavorite;

     }
 
     @Override
     public int describeContents() {
     }
 
     @Override
     public int describeContents() {

-        return ((Object) this).hashCode();
+        return super.hashCode();

     }
 
     @Override
     }
 
     @Override


@@ -488,8 +485,11 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
 
     @Override
     public String toString() {
 
     @Override
     public String toString() {

-        String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s, parentId=%s, keepInSync=%s etag=%s]";
-        asString = String.format(asString, Long.valueOf(mId), getFileName(), mMimeType, isDown(), mLocalPath, mRemotePath, Long.valueOf(mParentId), Boolean.valueOf(mKeepInSync), mEtag);
+        String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s, " +
+                "parentId=%s, favorite=%s etag=%s]";
+        asString = String.format(asString, Long.valueOf(mId), getFileName(), mMimeType, isDown(),
+                mLocalPath, mRemotePath, Long.valueOf(mParentId), Boolean.valueOf(mFavorite),
+                mEtag);

         return asString;
     }
 
         return asString;
     }
 


@@ -510,14 +510,6 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         this.mShareByLink = shareByLink;
     }
 
         this.mShareByLink = shareByLink;
     }
 

-    public boolean isFavorite() {
-        return mFavorite;
-    }
-
-    public void setFavorite(boolean mFavorite) {
-        this.mFavorite = mFavorite;
-    }
-

     public String getPublicLink() {
         return mPublicLink;
     }
     public String getPublicLink() {
         return mPublicLink;
     }


@@ -553,7 +545,33 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
      */
     public boolean isImage() {
         return ((mMimeType != null && mMimeType.startsWith("image/")) ||
      */
     public boolean isImage() {
         return ((mMimeType != null && mMimeType.startsWith("image/")) ||

-                FileStorageUtils.getMimeTypeFromName(mRemotePath).startsWith("image/"));
+                getMimeTypeFromName().startsWith("image/"));
+    }
+
+    /**
+     * @return 'True' if the file is simple text (e.g. not application-dependent, like .doc or .docx)
+     */
+    public boolean isText() {
+        return ((mMimeType != null && mMimeType.startsWith("text/")) ||
+                getMimeTypeFromName().startsWith("text/"));
+    }
+
+    public String getMimeTypeFromName() {
+        String extension = "";
+        int pos = mRemotePath.lastIndexOf('.');
+        if (pos >= 0) {
+            extension = mRemotePath.substring(pos + 1);
+        }
+        String result = MimeTypeMap.getSingleton().
+                getMimeTypeFromExtension(extension.toLowerCase());
+        return (result != null) ? result : "";
+    }
+
+    /**
+     * @return 'True' if the file is hidden
+     */
+    public boolean isHidden() {
+        return getFileName().startsWith(".");

     }
 
     public String getPermissions() {
     }
 
     public String getPermissions() {