Update whatIfHasSerializableExtra using whatIfNotNullAs

skydoves · Nov 8, 2020 · e3bafdc · e3bafdc
1 parent 8a03221
commit e3bafdc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/whatif-android/src/main/java/com/skydoves/whatif_android/WhatIfActivity.kt b/whatif-android/src/main/java/com/skydoves/whatif_android/WhatIfActivity.kt
@@ -25,6 +25,7 @@ import android.os.Bundle
 import android.os.Parcelable
 import com.skydoves.whatif.WhatIfInlineOnly
 import com.skydoves.whatif.whatIfNotNull
+import com.skydoves.whatif.whatIfNotNullAs
 import java.io.Serializable
 
 /**
@@ -180,11 +181,11 @@ inline fun Activity.whatIfHasCharSequenceExtra(
  */
 @JvmSynthetic
 @WhatIfInlineOnly
-inline fun Activity.whatIfHasSerializableExtra(
+inline fun <reified T : Serializable> Activity.whatIfHasSerializableExtra(
   name: String,
-  whatIf: (Serializable) -> Unit
+  whatIf: (T) -> Unit
 ) {
-  this.intent.getSerializableExtra(name).whatIfNotNull(
+  this.intent.getSerializableExtra(name).whatIfNotNullAs<T>(
     whatIf = { whatIf(it) },
     whatIfNot = { }
   )
@@ -198,12 +199,12 @@ inline fun Activity.whatIfHasSerializableExtra(
  */
 @JvmSynthetic
 @WhatIfInlineOnly
-inline fun Activity.whatIfHasSerializableExtra(
+inline fun <reified T : Serializable> Activity.whatIfHasSerializableExtra(
   name: String,
-  whatIf: (Serializable) -> Unit,
+  whatIf: (T) -> Unit,
   whatIfNot: () -> Unit
 ) {
-  this.intent.getSerializableExtra(name).whatIfNotNull(
+  this.intent.getSerializableExtra(name).whatIfNotNullAs<T>(
     whatIf = { whatIf(it) },
     whatIfNot = { whatIfNot() }
   )

diff --git a/whatif-android/src/test/java/com/skydoves/whatif_android/WhatIfActivityTest.kt b/whatif-android/src/test/java/com/skydoves/whatif_android/WhatIfActivityTest.kt
@@ -127,4 +127,23 @@ class WhatIfActivityTest {
 
     assertNull(poster)
   }
+
+  @Test
+  fun whatIfHasSerializableExtraTest() {
+    var poster: PosterSerializable? = null
+
+    this.mainTestActivity.whatIfHasSerializableExtra<PosterSerializable>("serializable") {
+      poster = it
+    }
+
+    assertThat(poster, `is`(PosterSerializable.create()))
+
+    this.mainTestActivity.whatIfHasSerializableExtra<PosterSerializable>(
+      name = "null",
+      whatIf = { poster = it },
+      whatIfNot = { poster = null }
+    )
+
+    assertNull(poster)
+  }
 }