regression fix

yuliskov · Nov 8, 2020 · 11d244b · 11d244b
1 parent ef3684c
commit 11d244b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/...tv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/browse/CategoryFragmentFactory.java b/...tv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/browse/CategoryFragmentFactory.java
@@ -70,7 +70,7 @@ public Fragment createFragment(Object rowObj) {
             }
 
             updateCurrentFragmentFromCache();
-            restoreItemIndex();
+            setCurrentFragmentItemIndex(mSelectedItemIndex);
 
             return fragment;
         }
@@ -141,6 +141,7 @@ public int getCurrentFragmentItemIndex() {
     public void setCurrentFragmentItemIndex(int index) {
         if (mCurrentFragment instanceof VideoCategoryFragment) {
             ((VideoCategoryFragment) mCurrentFragment).setItemIndex(index);
+            mSelectedItemIndex = -1;
         } else {
             mSelectedItemIndex = index;
         }
@@ -171,9 +172,4 @@ private void clearFragment(Fragment fragment) {
             Log.e(TAG, "clearFragment: Page group fragment has incompatible type: " + fragment.getClass().getSimpleName());
         }
     }
-
-    private void restoreItemIndex() {
-        setCurrentFragmentItemIndex(mSelectedItemIndex);
-        mSelectedItemIndex = -1;
-    }
 }
diff --git a/...src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/browse/video/MultipleRowsFragment.java b/...src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/browse/video/MultipleRowsFragment.java
@@ -149,6 +149,7 @@ public void setItemIndex(int index) {
 
         if (mRowsAdapter != null && index < mRowsAdapter.size()) {
             setSelectedPosition(index);
+            mSelectedItemIndex = -1;
         } else {
             mSelectedItemIndex = index;
         }

diff --git a/...tv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/browse/video/VideoGridFragment.java b/...tv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/browse/video/VideoGridFragment.java
@@ -96,6 +96,7 @@ public void setItemIndex(int index) {
 
         if (mGridAdapter != null && index < mGridAdapter.size()) {
             setSelectedPosition(index);
+            mSelectedItemIndex = -1;
         } else {
             mSelectedItemIndex = index;
         }