Fix problems in PreviewTextFragment related with changes in develop

diff --git a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
index b3384c0..e9479a3 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java
@@ -7,6 +7,9 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.view.LayoutInflater;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.view.LayoutInflater;

+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;

 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;


@@ -108,8 +111,8 @@ public class PreviewTextFragment extends FileFragment {
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);

-        outState.putParcelable(PreviewImageFragment.EXTRA_FILE, getFile());
-        outState.putParcelable(PreviewImageFragment.EXTRA_ACCOUNT, mAccount);
+        outState.putParcelable(PreviewTextFragment.EXTRA_FILE, getFile());
+        outState.putParcelable(PreviewTextFragment.EXTRA_ACCOUNT, mAccount);

     }
 
     @Override
     }
 
     @Override


@@ -239,7 +242,7 @@ public class PreviewTextFragment extends FileFragment {
                     getFile(),
                     mContainerActivity.getStorageManager().getAccount(),
                     mContainerActivity,
                     getFile(),
                     mContainerActivity.getStorageManager().getAccount(),
                     mContainerActivity,

-                    getSherlockActivity()
+                    getActivity()

             );
             mf.filter(menu);
         }
             );
             mf.filter(menu);
         }


@@ -265,18 +268,6 @@ public class PreviewTextFragment extends FileFragment {
             item.setEnabled(false);
         }
 
             item.setEnabled(false);
         }
 

-        item = menu.findItem(R.id.action_settings);
-        if (item != null) {
-            item.setVisible(false);
-            item.setEnabled(false);
-        }
-
-        item = menu.findItem(R.id.action_logger);
-        if (item != null) {
-            item.setVisible(false);
-            item.setEnabled(false);
-        }
-

         item = menu.findItem(R.id.action_sync_file);
         if (item != null) {
             item.setVisible(false);
         item = menu.findItem(R.id.action_sync_file);
         if (item != null) {
             item.setVisible(false);


@@ -399,7 +390,7 @@ public class PreviewTextFragment extends FileFragment {
         getActivity().runOnUiThread(new Runnable() {
             @Override
             public void run() {
         getActivity().runOnUiThread(new Runnable() {
             @Override
             public void run() {

-                getSherlockActivity().onBackPressed();
+                getActivity().onBackPressed();

             }
         });
     }
             }
         });
     }