bugfix: null checks

kroegerama · Oct 6, 2018 · 8e00d17 · 8e00d17
1 parent 7b347a1
commit 8e00d17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/library/src/main/java/com/kroegerama/kaiteki/recyclerview/StateRecyclerView.kt b/library/src/main/java/com/kroegerama/kaiteki/recyclerview/StateRecyclerView.kt
@@ -16,12 +16,12 @@ class StateRecyclerView @JvmOverloads constructor(
     override fun onSaveInstanceState(): Parcelable? {
         val bundle = Bundle()
         bundle.putParcelable(STATE_SUPER, super.onSaveInstanceState())
-        bundle.putParcelable(STATE_LAYOUT, layoutManager.onSaveInstanceState())
+        bundle.putParcelable(STATE_LAYOUT, layoutManager?.onSaveInstanceState())
         return bundle
     }
 
     override fun onRestoreInstanceState(state: Parcelable) {
-        var superstate: Parcelable = state
+        var superstate: Parcelable? = state
         if (state is Bundle) {
             layoutManagerState = state.getParcelable(STATE_LAYOUT)
             superstate = state.getParcelable(STATE_SUPER)
@@ -31,12 +31,12 @@ class StateRecyclerView @JvmOverloads constructor(
 
     private fun restorePosition() {
         if (layoutManagerState != null) {
-            layoutManager.onRestoreInstanceState(layoutManagerState)
+            layoutManager?.onRestoreInstanceState(layoutManagerState)
             layoutManagerState = null
         }
     }
 
-    override fun setAdapter(adapter: RecyclerView.Adapter<*>) {
+    override fun setAdapter(adapter: RecyclerView.Adapter<*>?) {
         super.setAdapter(adapter)
         restorePosition()
     }

diff --git a/...java/com/kroegerama/kaiteki/recyclerview/layout/StaggeredGridLayoutSpaceItemDecoration.kt b/...java/com/kroegerama/kaiteki/recyclerview/layout/StaggeredGridLayoutSpaceItemDecoration.kt
@@ -18,7 +18,7 @@ class StaggeredGridLayoutSpaceItemDecoration(
 
         val lp = view.layoutParams as StaggeredGridLayoutManager.LayoutParams
 
-        val count = parent.adapter.itemCount
+        val count = parent.adapter?.itemCount ?: 0
         val pos = lp.viewLayoutPosition
 
         val spanCount = layoutManager.spanCount