ViewPager - Notify when contents of adapter change

Some missing calls to notifyDataSetChanged discovered when testing
latest version of support library

1 files changed, 9 insertions, 4 deletions

diff --git a/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java b/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
index e0c304a..0345633 100644
--- a/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
@@ -208,6 +208,7 @@ public abstract class AbstractViewPagerActivity<Page extends Enum<Page>> extends
                 pageOrder.add(null);
             }
         }
+        viewPagerAdapter.notifyDataSetChanged();
         viewPager.setCurrentItem(startPageIndex, false);
     }
 
@@ -233,15 +234,19 @@ public abstract class AbstractViewPagerActivity<Page extends Enum<Page>> extends
         final Pair<List<? extends Page>, Integer> pagesAndIndex = getOrderedPages();
         pageOrder.addAll(pagesAndIndex.getLeft());
 
+        // Since we just added pages notifyDataSetChanged needs to be called before we possibly setCurrentItem below.
+        //  But, calling it will reset current item and we won't be able to tell if we would have been out of bounds
+        final int currentItem = getCurrentItem();
+
+        // notify the adapter that the data has changed
+        viewPagerAdapter.notifyDataSetChanged();
+
         // switch to details page, if we're out of bounds
         final int defaultPage = pagesAndIndex.getRight();
-        if (getCurrentItem() < 0 || getCurrentItem() >= viewPagerAdapter.getCount()) {
+        if (currentItem < 0 || currentItem >= viewPagerAdapter.getCount()) {
             viewPager.setCurrentItem(defaultPage, false);
         }
 
-        // notify the adapter that the data has changed
-        viewPagerAdapter.notifyDataSetChanged();
-
         // notify the indicator that the data has changed
         titleIndicator.notifyDataSetChanged();
     }