Merge pull request #1 from rlac/master

Null check when restoring saved fragment tags.
adamsp · Apr 25, 2014 · 5cf7e7f · 5cf7e7f
2 parents 97c6d1f + 90afeed
commit 5cf7e7f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...n/java/com/example/fragmentstatepagerissueexample/app/FixedFragmentStatePagerAdapter.java b/...n/java/com/example/fragmentstatepagerissueexample/app/FixedFragmentStatePagerAdapter.java
@@ -218,7 +218,13 @@ public void restoreState(Parcelable state, ClassLoader loader) {
             Parcelable[] fss = bundle.getParcelableArray("states");
             mSavedState.clear();
             mFragments.clear();
-            mSavedFragmentTags = bundle.getStringArrayList("tags");
+
+            ArrayList<String> tags = bundle.getStringArrayList("tags");
+            if (tags != null) {
+                mSavedFragmentTags = tags;
+            } else {
+                mSavedFragmentTags.clear();
+            }
             if (fss != null) {
                 for (int i=0; i<fss.length; i++) {
                     mSavedState.add((Fragment.SavedState)fss[i]);