Fix a bug regarding restoring state on Lollipop APIs

mars885 · Dec 8, 2019 · ef21a76 · ef21a76
1 parent 6d8aec8
commit ef21a76
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/...searchview/src/main/java/com/paulrybitskyi/persistentsearchview/PersistentSearchView.java b/...searchview/src/main/java/com/paulrybitskyi/persistentsearchview/PersistentSearchView.java
@@ -58,6 +58,7 @@
 import com.paulrybitskyi.persistentsearchview.utils.AnimationType;
 import com.paulrybitskyi.persistentsearchview.utils.KeyboardManagingUtil;
 import com.paulrybitskyi.persistentsearchview.utils.Preconditions;
+import com.paulrybitskyi.persistentsearchview.utils.StateUtils;
 import com.paulrybitskyi.persistentsearchview.utils.Utils;
 import com.paulrybitskyi.persistentsearchview.utils.ViewUtils;
 import com.paulrybitskyi.persistentsearchview.utils.VoiceRecognitionDelegate;
@@ -2835,9 +2836,9 @@ public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
 
     @Override
     protected void onRestoreInstanceState(Parcelable state) {
-        final SavedState savedState = (SavedState) state;
+        super.onRestoreInstanceState(StateUtils.fetchParentState(state));
 
-        super.onRestoreInstanceState(state);
+        final SavedState savedState = (SavedState) state;
 
         // Restoring our state
         setQueryInputHintColor(savedState.queryInputHintColor);

diff --git a/...tentsearchview/src/main/java/com/paulrybitskyi/persistentsearchview/utils/StateUtils.java b/...tentsearchview/src/main/java/com/paulrybitskyi/persistentsearchview/utils/StateUtils.java
@@ -0,0 +1,22 @@
+package com.paulrybitskyi.persistentsearchview.utils;
+
+import android.os.Parcelable;
+import android.view.View;
+
+public class StateUtils {
+
+
+    public static Parcelable fetchParentState(Parcelable state) {
+        if(state == null) {
+            return null;
+        }
+
+        if(Utils.IS_AT_LEAST_MARSHMALLOW) {
+            return state;
+        } else {
+            return View.BaseSavedState.EMPTY_STATE;
+        }
+    }
+
+
+}