Merge branch 'develop' into refactor_update_filelist_from_database

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

diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index 8df42c9..a61e665 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -16,9 +16,6 @@
  */
 package com.owncloud.android.ui.preview;
 
  */
 package com.owncloud.android.ui.preview;
 

-import java.util.ArrayList;
-import java.util.List;
-

 import android.accounts.Account;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.accounts.Account;
 import android.app.Activity;
 import android.app.AlertDialog;


@@ -50,6 +47,7 @@ import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;

+import com.owncloud.android.files.FileMenuFilter;

 import com.owncloud.android.media.MediaControlView;
 import com.owncloud.android.media.MediaService;
 import com.owncloud.android.media.MediaServiceBinder;
 import com.owncloud.android.media.MediaControlView;
 import com.owncloud.android.media.MediaService;
 import com.owncloud.android.media.MediaServiceBinder;


@@ -90,8 +88,6 @@ public class PreviewMediaFragment extends FileFragment implements
     private boolean mAutoplay;
     public boolean mPrepared;
     
     private boolean mAutoplay;
     public boolean mPrepared;
     

-    private FileFragment.ContainerActivity mContainerActivity;
-

     private static final String TAG = PreviewMediaFragment.class.getSimpleName();
 
     
     private static final String TAG = PreviewMediaFragment.class.getSimpleName();
 
     


@@ -252,6 +248,7 @@ public class PreviewMediaFragment extends FileFragment implements
         super.onCreateOptionsMenu(menu, inflater);
 
         inflater.inflate(R.menu.file_actions_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);
 
         inflater.inflate(R.menu.file_actions_menu, menu);

+        /*

         List<Integer> toHide = new ArrayList<Integer>();    
         
         MenuItem item = null;
         List<Integer> toHide = new ArrayList<Integer>();    
         
         MenuItem item = null;


@@ -279,6 +276,7 @@ public class PreviewMediaFragment extends FileFragment implements
                 item.setEnabled(false);
             }
         }
                 item.setEnabled(false);
             }
         }

+        */

         
     }
 
         
     }
 


@@ -290,6 +288,15 @@ public class PreviewMediaFragment extends FileFragment implements
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
         
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
         

+        FileMenuFilter mf = new FileMenuFilter();
+        mf.setFile(getFile());
+        mf.setComponentGetter(mContainerActivity);
+        mf.setAccount(mContainerActivity.getStorageManager().getAccount());
+        mf.setContext(getSherlockActivity());
+        mf.setFragment(this);
+        mf.filter(menu);
+
+        /*

         MenuItem item = menu.findItem(R.id.action_unshare_file);
         // Options shareLink
         if (!getFile().isShareByLink()) {            
         MenuItem item = menu.findItem(R.id.action_unshare_file);
         // Options shareLink
         if (!getFile().isShareByLink()) {            


@@ -299,6 +306,7 @@ public class PreviewMediaFragment extends FileFragment implements
             item.setVisible(true);
             item.setEnabled(true);
         }
             item.setVisible(true);
             item.setEnabled(true);
         }

+        */

     }
     
     
     }