X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/d8ac7b2241bc99df58b5f4be4c3c4d83fc9efaf6..f0c302b0f8d3d263621c4c2cbb059dcd7ccbc3b4:/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 e6fd4141..32e118b6 100644
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -1,6 +1,8 @@
-/* ownCloud Android client application
+/**
+ *   ownCloud Android client application
+ *
  *   Copyright (C) 2012  Bartek Przybylski
- *   Copyright (C) 2012-2013 ownCloud Inc.
+ *   Copyright (C) 2015 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -20,9 +22,9 @@ package com.owncloud.android.datamodel;
 
 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.utils.FileStorageUtils;
 
 import java.io.File;
 
@@ -65,6 +67,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     private boolean mShareByLink;
     private String mPublicLink;
 
+    private boolean mFavorite;
+
     private String mPermissions;
     private String mRemoteId;
 
@@ -110,6 +114,7 @@ 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();
@@ -135,6 +140,7 @@ 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);
@@ -348,6 +354,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mNeedsUpdating = false;
         mEtag = null;
         mShareByLink = false;
+        mFavorite = false;
         mPublicLink = null;
         mPermissions = null;
         mRemoteId = null;
@@ -503,6 +510,14 @@ 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;
     }
@@ -538,17 +553,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
      */
     public boolean isImage() {
         return ((mMimeType != null && mMimeType.startsWith("image/")) ||
-                getMimeTypeFromName().startsWith("image/"));
-    }
-
-    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 : "";
+                FileStorageUtils.getMimeTypeFromName(mRemotePath).startsWith("image/"));
     }
 
     public String getPermissions() {