From 38294e8cfcb2fc5956efb09f8e1e8303673e5626 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Tue, 8 Aug 2023 21:51:03 +0800
Subject: [PATCH] Fix deprecated function

---
 app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.kt   | 5 +++--
 .../main/java/com/hippo/ehviewer/util/ParcelableCompat.kt    | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.kt
index 162ce932a..730750c24 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.kt
@@ -29,11 +29,12 @@ import androidx.core.view.SoftwareKeyboardControllerCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
 import com.hippo.ehviewer.ui.MainActivity
+import com.hippo.ehviewer.util.getSparseParcelableArrayCompat
 import rikka.core.res.resolveDrawable
 
 abstract class BaseScene : Fragment() {
     private var drawerView: View? = null
-    private var drawerViewState: SparseArray<Parcelable?>? = null
+    private var drawerViewState: SparseArray<Parcelable>? = null
     fun addAboveSnackView(view: View) {
         val activity = activity
         if (activity is MainActivity) {
@@ -120,7 +121,7 @@ abstract class BaseScene : Fragment() {
         if (drawerView != null) {
             var saved = drawerViewState
             if (saved == null && savedInstanceState != null) {
-                saved = savedInstanceState.getSparseParcelableArray(KEY_DRAWER_VIEW_STATE)
+                saved = savedInstanceState.getSparseParcelableArrayCompat(KEY_DRAWER_VIEW_STATE)
             }
             if (saved != null) {
                 drawerView!!.restoreHierarchyState(saved)
diff --git a/app/src/main/java/com/hippo/ehviewer/util/ParcelableCompat.kt b/app/src/main/java/com/hippo/ehviewer/util/ParcelableCompat.kt
index 0185c9ec9..bd802850c 100644
--- a/app/src/main/java/com/hippo/ehviewer/util/ParcelableCompat.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/ParcelableCompat.kt
@@ -3,9 +3,11 @@ package com.hippo.ehviewer.util
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
+import android.util.SparseArray
 import androidx.core.content.IntentCompat
 import androidx.core.os.BundleCompat
 
 inline fun <reified T : Parcelable> Bundle.getParcelableCompat(key: String?): T? = BundleCompat.getParcelable(this, key, T::class.java)
 inline fun <reified T : Parcelable> Bundle.getParcelableArrayListCompat(key: String?): ArrayList<T>? = BundleCompat.getParcelableArrayList(this, key, T::class.java)
+inline fun <reified T : Parcelable> Bundle.getSparseParcelableArrayCompat(key: String?): SparseArray<T>? = BundleCompat.getSparseParcelableArray(this, key, T::class.java)
 inline fun <reified T : Parcelable> Intent.getParcelableExtraCompat(key: String?): T? = IntentCompat.getParcelableExtra(this, key, T::class.java)