even more gallery stuff

3 files changed, 13 insertions, 38 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
index 538e1c8f..97e66ffb 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
@@ -251,7 +251,7 @@ public class GalleryActivity extends CommonActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        // ActivityCompat.postponeEnterTransition(this);
+        ActivityCompat.postponeEnterTransition(this);
 
         // we use that before parent onCreate so let's init locally
         m_prefs = PreferenceManager
@@ -277,17 +277,9 @@ public class GalleryActivity extends CommonActivity {
             m_title = getIntent().getStringExtra("title");
             m_content = getIntent().getStringExtra("content");
 
-            // this should be returned first so that transition completes properly
+            // this should be dealt with first so that transition completes properly
             String firstSrc = getIntent().getStringExtra("firstSrc");
 
-            // Document doc = Jsoup.parse(m_content);
-
-            // if we were unable to find first image, try again for all media content so that
-            // gallery doesn't lock up because of a pending shared transition
-            /* if (!collectGalleryContents(imgSrcFirst, doc, uncheckedItems))
-                if (!collectGalleryContents("", doc, uncheckedItems))
-                    m_items.add(new GalleryEntry(imgSrcFirst, GalleryEntry.GalleryEntryType.TYPE_IMAGE, null)); */
-
             GalleryModel model = new ViewModelProvider(this).get(GalleryModel.class);
             model.collectItems(m_content, firstSrc);
 
@@ -295,7 +287,16 @@ public class GalleryActivity extends CommonActivity {
                 Log.d(TAG, "observed gallery entries=" + galleryEntries + " firstSrc=" + firstSrc);
 
                 m_adapter.submitList(galleryEntries, () -> {
-                    Log.d(TAG, "selecting first src=" + firstSrc);
+                    for (GalleryEntry entry : galleryEntries) {
+                        if (entry.url.equals(firstSrc)) {
+                            int position = galleryEntries.indexOf(entry);
+
+                            Log.d(TAG, "selecting first src=" + firstSrc + " pos=" + position);
+                            m_pager.setCurrentItem(position);
+
+                            break;
+                        }
+                    }
                 });
             });
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryModel.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryModel.java
index 1e059e0f..16c38ed4 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryModel.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryModel.java
@@ -65,7 +65,7 @@ public class GalleryModel extends AndroidViewModel {
 
                     Log.d(TAG, "checking vid src=" + src + " poster=" + poster);
 
-                    if (poster != null && poster.equals(srcFirst) || src != null && src.equals(srcFirst)) {
+                    if (src != null && src.equals(srcFirst)) {
                         Log.d(TAG, "first item found, vid=" + src);
 
                         GalleryEntry item = new GalleryEntry(src, GalleryEntry.GalleryEntryType.TYPE_VIDEO, poster);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java
index a96e59b5..28d6cf7d 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java
@@ -57,32 +57,6 @@ public class GalleryVideoFragment extends GalleryBaseFragment {
 
         registerForContextMenu(imgView);
 
-        /*final GlideDrawableImageViewTarget glideImage = new GlideDrawableImageViewTarget(imgView);
-
-        Glide.with(this)
-                .load(m_coverUrl)
-                //.dontAnimate()
-                .diskCacheStrategy(DiskCacheStrategy.ALL)
-                .skipMemoryCache(false)
-                .listener(new RequestListener<String, GlideDrawable>() {
-                    @Override
-                    public boolean onException(Exception e, String model, Target<GlideDrawable> target, boolean isFirstResource) {
-                        ActivityCompat.startPostponedEnterTransition(m_activity);
-
-                        initializeVideoPlayer(view);
-                        return false;
-                    }
-
-                    @Override
-                    public boolean onResourceReady(GlideDrawable resource, String model, Target<GlideDrawable> target, boolean isFromMemoryCache, boolean isFirstResource) {
-                        ActivityCompat.startPostponedEnterTransition(m_activity);
-
-                        initializeVideoPlayer(view);
-                        return false;
-                    }
-                })
-                .into(glideImage); */
-
         ActivityCompat.startPostponedEnterTransition(m_activity);
         initializeVideoPlayer(view);