Optimize type references on CompatExtensions functions

WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt

@@ -89,12 +89,12 @@ class ActivityLogListFragment : Fragment(R.layout.activity_log_list_fragment) {
                 }
             }
 
-            val site: SiteModel = requireNotNull(
+            val site = requireNotNull(
                 if (savedInstanceState == null) {
                     val nonNullIntent = checkNotNull(nonNullActivity.intent)
-                    nonNullIntent.getSerializableExtraCompat(WordPress.SITE)
+                    nonNullIntent.getSerializableExtraCompat<SiteModel>(WordPress.SITE)
                 } else {
-                    savedInstanceState.getSerializableCompat(WordPress.SITE)
+                    savedInstanceState.getSerializableCompat<SiteModel>(WordPress.SITE)
                 }
             )
             val rewindableOnly = nonNullActivity.intent.getBooleanExtra(ACTIVITY_LOG_REWINDABLE_ONLY_KEY, false)

WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanFragment.kt

@@ -177,12 +177,14 @@ class ScanFragment : Fragment(R.layout.scan_fragment) {
     }
 
     private fun getSite(savedInstanceState: Bundle?): SiteModel {
-        val site: SiteModel? = if (savedInstanceState == null) {
-            requireActivity().intent.getSerializableExtraCompat(WordPress.SITE)
-        } else {
-            savedInstanceState.getSerializableCompat(WordPress.SITE)
-        }
-        return requireNotNull(site)
+        val site = requireNotNull(
+            if (savedInstanceState == null) {
+                requireActivity().intent.getSerializableExtraCompat<SiteModel>(WordPress.SITE)
+            } else {
+                savedInstanceState.getSerializableCompat<SiteModel>(WordPress.SITE)
+            }
+        )
+        return site
     }
 
     override fun onSaveInstanceState(outState: Bundle) {

WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryFragment.kt

@@ -123,12 +123,14 @@ class ScanHistoryFragment : Fragment(R.layout.scan_history_fragment), MenuProvid
     }
 
     private fun getSite(savedInstanceState: Bundle?): SiteModel {
-        val site: SiteModel? = if (savedInstanceState == null) {
-            requireActivity().intent.getSerializableExtraCompat(WordPress.SITE)
-        } else {
-            savedInstanceState.getSerializableCompat(WordPress.SITE)
-        }
-        return requireNotNull(site)
+        val site = requireNotNull(
+            if (savedInstanceState == null) {
+                requireActivity().intent.getSerializableExtraCompat<SiteModel>(WordPress.SITE)
+            } else {
+                savedInstanceState.getSerializableCompat<SiteModel>(WordPress.SITE)
+            }
+        )
+        return site
     }
 
     override fun onSaveInstanceState(outState: Bundle) {

WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryListFragment.kt

@@ -81,12 +81,14 @@ class ScanHistoryListFragment : ViewPagerFragment(R.layout.scan_history_list_fra
     }
 
     private fun getSite(savedInstanceState: Bundle?): SiteModel {
-        val site: SiteModel? = if (savedInstanceState == null) {
-            requireActivity().intent.getSerializableExtraCompat(WordPress.SITE)
-        } else {
-            savedInstanceState.getSerializableCompat(WordPress.SITE)
-        }
-        return requireNotNull(site)
+        val site = requireNotNull(
+            if (savedInstanceState == null) {
+                requireActivity().intent.getSerializableExtraCompat<SiteModel>(WordPress.SITE)
+            } else {
+                savedInstanceState.getSerializableCompat<SiteModel>(WordPress.SITE)
+            }
+        )
+        return site
     }
 
     private fun getTabType() = requireNotNull(arguments?.getParcelableCompat<ScanHistoryTabType>(ARG_TAB_TYPE))

WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt

@@ -318,13 +318,13 @@ class PagesFragment : Fragment(R.layout.pages_fragment), ScrollableViewInitializ
         setupActions(activity)
         setupMlpObservers(activity)
 
-        val site: SiteModel = requireNotNull(
+        val site = requireNotNull(
             if (savedInstanceState == null) {
                 val nonNullIntent = checkNotNull(activity.intent)
-                nonNullIntent.getSerializableExtraCompat(WordPress.SITE)
+                nonNullIntent.getSerializableExtraCompat<SiteModel>(WordPress.SITE)
             } else {
                 restorePreviousSearch = true
-                savedInstanceState.getSerializableCompat(WordPress.SITE)
+                savedInstanceState.getSerializableCompat<SiteModel>(WordPress.SITE)
             }
         )
 

WordPress/src/main/java/org/wordpress/android/ui/prefs/categories/list/CategoriesListFragment.kt

@@ -70,12 +70,14 @@ class CategoriesListFragment : Fragment(R.layout.site_settings_categories_list_f
     }
 
     private fun getSite(savedInstanceState: Bundle?): SiteModel {
-        val site: SiteModel? = if (savedInstanceState == null) {
-            requireActivity().intent.getSerializableExtraCompat(WordPress.SITE)
-        } else {
-            savedInstanceState.getSerializableCompat(WordPress.SITE)
-        }
-        return requireNotNull(site)
+        val site = requireNotNull(
+            if (savedInstanceState == null) {
+                requireActivity().intent.getSerializableExtraCompat<SiteModel>(WordPress.SITE)
+            } else {
+                savedInstanceState.getSerializableCompat<SiteModel>(WordPress.SITE)
+            }
+        )
+        return site
     }
 
     private fun SiteSettingsCategoriesListFragmentBinding.setupObservers() {

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt

@@ -157,11 +157,11 @@ class StatsViewAllFragment : DaggerFragment(R.layout.stats_view_all_fragment) {
         savedInstanceState: Bundle?
     ) {
         val nonNullIntent = checkNotNull(activity.intent)
-        val type: StatsViewType = requireNotNull(
+        val type = requireNotNull(
             if (savedInstanceState == null) {
-                nonNullIntent.getSerializableExtraCompat(ARGS_VIEW_TYPE)
+                nonNullIntent.getSerializableExtraCompat<StatsViewType>(ARGS_VIEW_TYPE)
             } else {
-                savedInstanceState.getSerializableCompat(ARGS_VIEW_TYPE)
+                savedInstanceState.getSerializableCompat<StatsViewType>(ARGS_VIEW_TYPE)
             }
         )