From d1184c978e3b7d9e41798d59e9e78f30e1c50c97 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 13 Jan 2013 23:35:25 +0100
Subject: fix #2394: view pager jumps back to details on device rotation

---
 main/src/cgeo/geocaching/CacheDetailActivity.java             | 11 ++++++++++-
 .../cgeo/geocaching/activity/AbstractViewPagerActivity.java   |  8 ++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 634eea6..8f501b7 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -129,6 +129,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
     private static final int CONTEXT_MENU_WAYPOINT_RESET_ORIGINAL_CACHE_COORDINATES = 1241;
 
     private static final Pattern DARK_COLOR_PATTERN = Pattern.compile(Pattern.quote("color=\"#") + "(0[0-9]){3}" + "\"");
+    public static final String STATE_PAGE_INDEX = "cgeo.geocaching.pageIndex";
 
     private cgCache cache;
     private final Progress progress = new Progress();
@@ -287,7 +288,9 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             }
         });
 
-        final int pageToOpen = Settings.isOpenLastDetailsPage() ? Settings.getLastDetailsPage() : 1;
+        final int pageToOpen = savedInstanceState != null ?
+                savedInstanceState.getInt(STATE_PAGE_INDEX, 0) :
+                Settings.isOpenLastDetailsPage() ? Settings.getLastDetailsPage() : 1;
         createViewPager(pageToOpen, new OnPageSelectedListener() {
 
             @Override
@@ -307,6 +310,12 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
     }
 
     @Override
+    public void onSaveInstanceState(final Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(STATE_PAGE_INDEX, getCurrentItem());
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
 
diff --git a/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java b/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
index 56431d4..a25c1bb 100644
--- a/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
@@ -238,7 +238,7 @@ public abstract class AbstractViewPagerActivity<Page extends Enum<Page>> extends
 
         // switch to details page, if we're out of bounds
         final int defaultPage = pagesAndIndex.getRight().intValue();
-        if (viewPager.getCurrentItem() < 0 || viewPager.getCurrentItem() >= viewPagerAdapter.getCount()) {
+        if (getCurrentItem() < 0 || getCurrentItem() >= viewPagerAdapter.getCount()) {
             viewPager.setCurrentItem(defaultPage, false);
         }
 
@@ -267,6 +267,10 @@ public abstract class AbstractViewPagerActivity<Page extends Enum<Page>> extends
     }
 
     protected final boolean isCurrentPage(Page page) {
-        return viewPager.getCurrentItem() == getPageIndex(page);
+        return getCurrentItem() == getPageIndex(page);
+    }
+
+    protected int getCurrentItem() {
+        return viewPager.getCurrentItem();
     }
 }
-- 
cgit v1.1