Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta

[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 574a927..a37a1bb 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 = 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);
+        }
     }
 
     /**
@@ -303,7 +315,7 @@ public class PreviewTextFragment extends FileFragment {
                 return true;
             }
             case R.id.action_share_with_users: {
-                seeShareFile();
+                mContainerActivity.getFileOperationsHelper().showShareFile(getFile());
                 return true;
             }
             case R.id.action_unshare_file: {
@@ -354,10 +366,6 @@ public class PreviewTextFragment extends FileFragment {
         mContainerActivity.showDetails(getFile());
     }
 
-    private void seeShareFile(){
-        mContainerActivity.showShareFile(getFile());
-    }
-
     @Override
     public void onPause() {
         Log_OC.e(TAG, "onPause");