Use IntentCompat and BundleCompat methods

Author: Isira-Seneviratne

app/src/main/java/org/wikipedia/extensions/Bundle.kt

@@ -1,11 +1,9 @@
 package org.wikipedia.extensions
 
-import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
 import androidx.core.os.BundleCompat
 import java.io.Serializable
-import kotlin.reflect.safeCast
 
 inline fun <reified T : Parcelable> Bundle.parcelable(key: String?): T? {
     return BundleCompat.getParcelable(this, key, T::class.java)
@@ -16,14 +14,5 @@ inline fun <reified T : Parcelable> Bundle.parcelableArrayList(key: String?): Ar
 }
 
 inline fun <reified T : Serializable> Bundle.serializable(key: String?): T? {
-    return getSerializable(this, key, T::class.java)
-}
-
-fun <T : Serializable> getSerializable(bundle: Bundle, key: String?, clazz: Class<T>): T? {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-        bundle.getSerializable(key, clazz)
-    } else {
-        @Suppress("DEPRECATION")
-        clazz.kotlin.safeCast(bundle.getSerializable(key))
-    }
+    return BundleCompat.getSerializable(this, key, T::class.java)
 }

app/src/main/java/org/wikipedia/extensions/Intent.kt

@@ -1,25 +1,14 @@
 package org.wikipedia.extensions
 
 import android.content.Intent
-import android.os.Build
 import android.os.Parcelable
 import androidx.core.content.IntentCompat
 import java.io.Serializable
-import kotlin.reflect.safeCast
 
 inline fun <reified T : Parcelable> Intent.parcelableExtra(name: String?): T? {
     return IntentCompat.getParcelableExtra(this, name, T::class.java)
 }
 
 inline fun <reified T : Serializable> Intent.serializableExtra(name: String?): T? {
-    return getSerializableExtra(this, name, T::class.java)
-}
-
-fun <T : Serializable> getSerializableExtra(intent: Intent, name: String?, clazz: Class<T>): T? {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-        intent.getSerializableExtra(name, clazz)
-    } else {
-        @Suppress("DEPRECATION")
-        clazz.kotlin.safeCast(intent.getSerializableExtra(name))
-    }
+    return IntentCompat.getSerializableExtra(this, name, T::class.java)
 }