From 87a42cf53d27a8a69efca282525cd81049f27f69 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Tue, 8 Aug 2023 21:05:44 +0800 Subject: [PATCH] Revert obsolete Workaround This reverts commit 576ff1b0 Reason for revert: Fixed in `androidx.core:core:1.12.0-beta01`. https://android.googlesource.com/platform/frameworks/support/+/8f7e02550620919fafb4c7fef8743f8c20562945 --- .../com/hippo/ehviewer/util/ParcelableCompat.kt | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) 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 5f35b4cfd..0185c9ec9 100644 --- a/app/src/main/java/com/hippo/ehviewer/util/ParcelableCompat.kt +++ b/app/src/main/java/com/hippo/ehviewer/util/ParcelableCompat.kt @@ -1,18 +1,11 @@ -@file:Suppress("DEPRECATION") - package com.hippo.ehviewer.util import android.content.Intent import android.os.Bundle import android.os.Parcelable +import androidx.core.content.IntentCompat +import androidx.core.os.BundleCompat -// inline fun Bundle.getParcelableCompat(key: String?): T? = BundleCompat.getParcelable(this, key, T::class.java) -// inline fun Bundle.getParcelableArrayListCompat(key: String?): ArrayList? = BundleCompat.getParcelableArrayList(this, key, T::class.java) -// inline fun Intent.getParcelableExtraCompat(key: String?): T? = IntentCompat.getParcelableExtra(this, key, T::class.java) - -// Avoid using new API on Tiramisu -// See https://issuetracker.google.com/issues/240585930 & https://github.com/Ehviewer-Overhauled/Ehviewer/issues/1065 - -inline fun Bundle.getParcelableCompat(key: String?): T? = getParcelable(key) -inline fun Bundle.getParcelableArrayListCompat(key: String?): ArrayList? = getParcelableArrayList(key) -inline fun Intent.getParcelableExtraCompat(key: String?): T? = getParcelableExtra(key) +inline fun Bundle.getParcelableCompat(key: String?): T? = BundleCompat.getParcelable(this, key, T::class.java) +inline fun Bundle.getParcelableArrayListCompat(key: String?): ArrayList? = BundleCompat.getParcelableArrayList(this, key, T::class.java) +inline fun Intent.getParcelableExtraCompat(key: String?): T? = IntentCompat.getParcelableExtra(this, key, T::class.java)