From: masensio <masensio@solidgear.es>
Date: Wed, 2 Sep 2015 11:29:14 +0000 (+0200)
Subject: Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android... 
X-Git-Tag: oc-android-1.8~17^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6b84d83b3544f8de4e56186f6ecbccd3d612702b?ds=inline;hp=-c

Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android into text_file_preview_pr_707_with_develop
---

6b84d83b3544f8de4e56186f6ecbccd3d612702b
diff --combined src/com/owncloud/android/datamodel/OCFile.java
index 4baf1ea5,5b843805..afd421d7
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@@ -548,14 -548,6 +548,6 @@@ public class OCFile implements Parcelab
                  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('.');
@@@ -567,13 -559,6 +559,13 @@@
          return (result != null) ? result : "";
      }
  
 +    /**
 +     * @return 'True' if the file is hidden
 +     */
 +    public boolean isHidden() {
 +        return getFileName().startsWith(".");
 +    }
 +
      public String getPermissions() {
          return mPermissions;
      }