serialization fixes

JayyyR · Dec 27, 2017 · f567f49 · f567f49
1 parent 0560b36
commit f567f49
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/library/src/main/java/com/joeracosta/library/activity/FragmentStackActivity.kt b/library/src/main/java/com/joeracosta/library/activity/FragmentStackActivity.kt
@@ -3,6 +3,7 @@ package com.joeracosta.library.activity
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import java.util.*
+import kotlin.collections.ArrayList
 
 /**
  * Created by Joe on 8/14/2017.
@@ -21,15 +22,24 @@ abstract class FragmentStackActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         savedInstanceState?.getSerializable(BACKSTACK_FRAG_TAGS)?.let {
-            mBackstackTags = it as Stack<String>
+
+            if (it is ArrayList<*>) {
+                val arrayOfTags = it as ArrayList<String>
+                for (tag in arrayOfTags){
+                    mBackstackTags.push(tag)
+                }
+            }
+
             if (!mBackstackTags.isEmpty()) {
                 mCurrentFragment = supportFragmentManager.findFragmentByTag(mBackstackTags.peek()) as SimpleFragment
             }
         }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        outState.putSerializable(BACKSTACK_FRAG_TAGS, mBackstackTags)
+        val arrayOfTags = ArrayList<String>() //stacks don't always serialize...lets preemptively put it in an arraylist
+        arrayOfTags.addAll(mBackstackTags)
+        outState.putSerializable(BACKSTACK_FRAG_TAGS, arrayOfTags)
         super.onSaveInstanceState(outState)
     }
 
@@ -82,7 +92,7 @@ abstract class FragmentStackActivity : AppCompatActivity() {
      */
     protected fun handleBackPress() : Boolean{
         if (mCurrentFragment?.onSimpleBackPressed() ?: false) {
-            return true;
+            return true
         }
         if (supportFragmentManager.backStackEntryCount > 0) {
             mBackstackTags.pop()
@@ -94,9 +104,9 @@ abstract class FragmentStackActivity : AppCompatActivity() {
             } else {
                 finish() //have to call finish to finish the activity when there's one fragment left in the stack
             }
-            return true;
+            return true
         }
-        return false;
+        return false
     }
 }
 

diff --git a/library/src/main/java/com/joeracosta/library/activity/FragmentStackFragment.kt b/library/src/main/java/com/joeracosta/library/activity/FragmentStackFragment.kt
@@ -19,15 +19,22 @@ abstract class FragmentStackFragment : SimpleFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         savedInstanceState?.getSerializable(BACKSTACK_FRAG_TAGS)?.let {
-            mBackstackTags = it as Stack<String>
+            if (it is ArrayList<*>) {
+                val arrayOfTags = it as ArrayList<String>
+                for (tag in arrayOfTags){
+                    mBackstackTags.push(tag)
+                }
+            }
             if (!mBackstackTags.isEmpty()) {
                 mCurrentFragment = childFragmentManager.findFragmentByTag(mBackstackTags.peek()) as SimpleFragment
             }
         }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        outState.putSerializable(BACKSTACK_FRAG_TAGS, mBackstackTags)
+        val arrayOfTags = ArrayList<String>() //stacks don't always serialize...lets preemptively put it in an arraylist
+        arrayOfTags.addAll(mBackstackTags)
+        outState.putSerializable(BACKSTACK_FRAG_TAGS, arrayOfTags)
         super.onSaveInstanceState(outState)
     }