From: Jorge Antonio Diaz-Benito Soriano Date: Wed, 19 Aug 2015 19:07:14 +0000 (+0200) Subject: Fixes the text preview issue X-Git-Tag: oc-android-1.8~17^2~4^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ae0e116ffc620bb9c5c94f1a9a24a5500e89bd8f?hp=--cc Fixes the text preview issue --- ae0e116ffc620bb9c5c94f1a9a24a5500e89bd8f diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java index f9882fa4..5b843805 100644 --- a/src/com/owncloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -548,14 +548,6 @@ 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 c1511aae..4f4a65a6 100644 --- a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java @@ -29,6 +29,8 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.StringWriter; import java.lang.ref.WeakReference; +import java.util.LinkedList; +import java.util.List; import java.util.Scanner; public class PreviewTextFragment extends FileFragment { @@ -389,7 +391,13 @@ public class PreviewTextFragment extends FileFragment { * @return 'True' if the file can be handled by the fragment. */ public static boolean canBePreviewed(OCFile file) { - return (file != null && file.isDown() && file.isText()); + 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())); } /**