From: David A. Velasco Date: Fri, 4 Sep 2015 13:01:25 +0000 (+0200) Subject: Reverse filter for preview of text files: all text/ but those in black list X-Git-Tag: oc-android-1.8~17^2~2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/68ce6e62bf79c04265aa82c6f11c834222dd9bb2?ds=inline;hp=-c Reverse filter for preview of text files: all text/ but those in black list --- 68ce6e62bf79c04265aa82c6f11c834222dd9bb2 diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java index afd421d7..4baf1ea5 100644 --- a/src/com/owncloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -548,6 +548,14 @@ public class OCFile implements Parcelable, Comparable { 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('.'); diff --git a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java index 4f4a65a6..bbf4525a 100644 --- a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java @@ -391,13 +391,14 @@ public class PreviewTextFragment extends FileFragment { * @return 'True' if the file can be handled by the fragment. */ public static boolean canBePreviewed(OCFile file) { - final List supportedTypes = new LinkedList(); - supportedTypes.add("text/plain"); - supportedTypes.add("text/html"); - supportedTypes.add("text/css"); - supportedTypes.add("text/csv"); - - return (file != null && file.isDown() && supportedTypes.contains(file.getMimetype())); + final List unsupportedTypes = new LinkedList(); + unsupportedTypes.add("text/richtext"); + unsupportedTypes.add("text/vnd.abc"); + unsupportedTypes.add("text/vnd.fmi.flexstor"); + unsupportedTypes.add("text/vnd.rn-realtext"); + unsupportedTypes.add("text/vnd.wap.wml"); + unsupportedTypes.add("text/vnd.wap.wmlscript"); + return (file != null && file.isDown() && file.isText() && !unsupportedTypes.contains(file.getMimetype())); } /**