reinstate context menus for gallery/video views

2 files changed, 13 insertions, 37 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
index bf4a8c15..e9ce9369 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
@@ -25,6 +25,7 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.FrameLayout;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
@@ -62,14 +63,6 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
 
     @Override
     public boolean onSingleTapConfirmed(MotionEvent motionEvent) {
-        /*ActionBar bar = getSupportActionBar();
-
-        if (bar.isShowing()) {
-            bar.hide();
-        } else {
-            bar.show();
-        }*/
-
         return false;
     }
 
@@ -92,10 +85,6 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
             m_urls = urls;
         }
 
-        public ArticleImagesPagerAdapter() {
-            super();
-        }
-
         @Override
         public int getCount() {
             return m_urls.size();
@@ -136,7 +125,7 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
                 ViewCompat.setTransitionName(imgView, "gallery:" + url);
             }
 
-            //registerForContextMenu(imgView);
+            registerForContextMenu(imgView);
 
             view.findViewById(R.id.flavor_image_overflow).setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -350,6 +339,7 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
         m_pager = (ViewPager) findViewById(R.id.article_images_pager);
         m_pager.setAdapter(m_adapter);
         m_pager.setPageTransformer(true, new DepthPageTransformer());
+
     }
 
     @SuppressLint("NewApi")
@@ -358,16 +348,14 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
         super.onResume();
     }
 
-
-    /*@Override
+    @Override
     public void onCreateContextMenu(ContextMenu menu, View v,
                                     ContextMenu.ContextMenuInfo menuInfo) {
 
         getMenuInflater().inflate(R.menu.context_article_content_img, menu);
 
         super.onCreateContextMenu(menu, v, menuInfo);
-    }*/
-
+    }
 
     @Override
     public void onSaveInstanceState(Bundle out) {
@@ -378,19 +366,14 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
         out.putString("content", m_content);
     }
 
-    /*@Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.context_article_content_img, menu);
-
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        int position = m_pager.getCurrentItem();
+        String url = m_checkedUrls.get(position);
 
-        return true;
+        return onImageMenuItemSelected(item, url);
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        return onContextItemSelected(item); // this is really bad :()
-    }*/
-
     public boolean onImageMenuItemSelected(MenuItem item, String url) {
         switch (item.getItemId()) {
             case R.id.article_img_open:
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java
index 284e81e4..db9bf48e 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java
@@ -263,13 +263,6 @@ public class VideoPlayerActivity extends CommonActivity {
     }

 

 

-    /*@Override

-    public boolean onCreateOptionsMenu(Menu menu) {

-        getMenuInflater().inflate(R.menu.activity_video_player, menu);

-        return true;

-    }

-

-

     @Override

     public void onCreateContextMenu(ContextMenu menu, View v,

                                     ContextMenu.ContextMenuInfo menuInfo) {

@@ -281,9 +274,9 @@ public class VideoPlayerActivity extends CommonActivity {
 

 

     @Override

-    public boolean onOptionsItemSelected(MenuItem item) {

-        return onContextItemSelected(item); // this is really bad :()

-    } */

+    public boolean onContextItemSelected(MenuItem item) {

+        return onVideoMenuItemSelected(item);

+    }

 

     public boolean onVideoMenuItemSelected(android.view.MenuItem item) {

         switch (item.getItemId()) {