fix #3471: avoid null being possible in the interface

This change also prohibits the same error to occur again in another
implementation of the same interface and should therefore be preferred
to just checking for null in the current interface implementation.

1 files changed, 5 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java b/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
index bb0273f..24c0a1b 100644
--- a/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractViewPagerActivity.java
@@ -7,6 +7,7 @@ import com.viewpagerindicator.TitlePageIndicator;
 import com.viewpagerindicator.TitleProvider;
 
 import org.apache.commons.lang3.tuple.Pair;
+import org.eclipse.jdt.annotation.NonNull;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -90,7 +91,7 @@ public abstract class AbstractViewPagerActivity<Page extends Enum<Page>> extends
         /**
          * Set the state of the view
          */
-        public void setViewState(Bundle state);
+        public void setViewState(@NonNull Bundle state);
     }
 
     /**
@@ -153,7 +154,9 @@ public abstract class AbstractViewPagerActivity<Page extends Enum<Page>> extends
 
                     // Restore the state of the view if the page supports it
                     Bundle state = viewStates.get(page);
-                    creator.setViewState(state);
+                    if (state != null) {
+                        creator.setViewState(state);
+                    }
 
                     container.addView(view, 0);
                 }