wip

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / preview / PreviewTextFragment.java

diff --git a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
index bbf4525..f071469 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
@@ -290,6 +290,18 @@ public class PreviewTextFragment extends FileFragment {
             item.setVisible(false);
             item.setEnabled(false);
         }
             item.setVisible(false);
             item.setEnabled(false);
         }

+
+        item = menu.findItem(R.id.action_switch_view);
+        if (item != null){
+            item.setVisible(false);
+            item.setEnabled(false);
+        }
+
+        item = menu.findItem(R.id.action_sort);
+        if (item != null) {
+            item.setVisible(false);
+            item.setEnabled(false);
+        }

     }
 
     /**
     }
 
     /**


@@ -299,11 +311,7 @@ public class PreviewTextFragment extends FileFragment {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_share_file: {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_share_file: {

-                mContainerActivity.getFileOperationsHelper().shareFileWithLink(getFile());
-                return true;
-            }
-            case R.id.action_unshare_file: {
-                mContainerActivity.getFileOperationsHelper().unshareFileWithLink(getFile());
+                mContainerActivity.getFileOperationsHelper().showShareFile(getFile());

                 return true;
             }
             case R.id.action_open_file_with: {
                 return true;
             }
             case R.id.action_open_file_with: {


@@ -393,12 +401,16 @@ public class PreviewTextFragment extends FileFragment {
     public static boolean canBePreviewed(OCFile file) {
         final List<String> unsupportedTypes = new LinkedList<String>();
         unsupportedTypes.add("text/richtext");
     public static boolean canBePreviewed(OCFile file) {
         final List<String> unsupportedTypes = new LinkedList<String>();
         unsupportedTypes.add("text/richtext");

+        unsupportedTypes.add("text/rtf");

         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");
         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()));
+        return (file != null && file.isDown() && file.isText() &&
+                !unsupportedTypes.contains(file.getMimetype()) &&
+                !unsupportedTypes.contains(file.getMimeTypeFromName())
+        );

     }
 
     /**
     }
 
     /**