From 0895af0ecce5c55b7efa3b0edab8a93a06a464b5 Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 1 Feb 2023 15:17:35 +0800 Subject: [PATCH] Fix deprecated funcs Only fix kotlin code, because JAVA SUCKS --- .../hippo/ehviewer/download/DownloadService.kt | 9 +++++---- .../java/com/hippo/ehviewer/ui/MainActivity.kt | 3 ++- app/src/main/java/com/hippo/util/BundleUtils.kt | 8 -------- .../main/java/com/hippo/util/ParcelableCompat.kt | 15 +++++++++++++++ .../kanade/tachiyomi/ui/reader/ReaderActivity.kt | 3 ++- 5 files changed, 24 insertions(+), 14 deletions(-) delete mode 100644 app/src/main/java/com/hippo/util/BundleUtils.kt create mode 100644 app/src/main/java/com/hippo/util/ParcelableCompat.kt diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt index dd7c4256f..e06c60ea5 100644 --- a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt +++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt @@ -38,6 +38,7 @@ import com.hippo.ehviewer.dao.DownloadInfo import com.hippo.ehviewer.ui.MainActivity import com.hippo.ehviewer.ui.scene.DownloadsScene import com.hippo.util.ReadableTime +import com.hippo.util.getParcelableExtraCompat import com.hippo.yorozuya.FileUtils import com.hippo.yorozuya.SimpleHandler import com.hippo.yorozuya.collect.LongList @@ -98,13 +99,13 @@ class DownloadService : Service(), DownloadManager.DownloadListener { action = intent.action } if (ACTION_START == action) { - val gi = intent!!.getParcelableExtra(KEY_GALLERY_INFO) + val gi = intent!!.getParcelableExtraCompat(KEY_GALLERY_INFO) val label = intent.getStringExtra(KEY_LABEL) if (gi != null && mDownloadManager != null) { mDownloadManager!!.startDownload(gi, label) } } else if (ACTION_START_RANGE == action) { - val gidList = intent!!.getParcelableExtra(KEY_GID_LIST) + val gidList = intent!!.getParcelableExtraCompat(KEY_GID_LIST) if (gidList != null && mDownloadManager != null) { mDownloadManager!!.startRangeDownload(gidList) } @@ -122,7 +123,7 @@ class DownloadService : Service(), DownloadManager.DownloadListener { mDownloadManager!!.stopCurrentDownload() } } else if (ACTION_STOP_RANGE == action) { - val gidList = intent!!.getParcelableExtra(KEY_GID_LIST) + val gidList = intent!!.getParcelableExtraCompat(KEY_GID_LIST) if (gidList != null && mDownloadManager != null) { mDownloadManager!!.stopRangeDownload(gidList) } @@ -136,7 +137,7 @@ class DownloadService : Service(), DownloadManager.DownloadListener { mDownloadManager!!.deleteDownload(gid) } } else if (ACTION_DELETE_RANGE == action) { - val gidList = intent!!.getParcelableExtra(KEY_GID_LIST) + val gidList = intent!!.getParcelableExtraCompat(KEY_GID_LIST) if (gidList != null && mDownloadManager != null) { mDownloadManager!!.deleteRangeDownload(gidList) } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt index 390459727..c0a4848e6 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt @@ -73,6 +73,7 @@ import com.hippo.ehviewer.ui.scene.ProgressScene import com.hippo.image.Image import com.hippo.util.addTextToClipboard import com.hippo.util.getClipboardManager +import com.hippo.util.getParcelableExtraCompat import com.hippo.util.getUrlFromClipboard import com.hippo.yorozuya.IOUtils import eu.kanade.tachiyomi.util.lang.launchUI @@ -181,7 +182,7 @@ class MainActivity : EhActivity() { ) return true } else if (type != null && type.startsWith("image/")) { - val uri = intent.getParcelableExtra(Intent.EXTRA_STREAM) + val uri = intent.getParcelableExtraCompat(Intent.EXTRA_STREAM) if (null != uri) { val temp = saveImageToTempFile(uri) if (null != temp) { diff --git a/app/src/main/java/com/hippo/util/BundleUtils.kt b/app/src/main/java/com/hippo/util/BundleUtils.kt deleted file mode 100644 index f6e1a0950..000000000 --- a/app/src/main/java/com/hippo/util/BundleUtils.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.hippo.util - -import android.os.Bundle -import androidx.core.os.BundleCompat - -inline fun Bundle.getParcelableCompat(key: String?): T? { - return BundleCompat.getParcelable(this, key, T::class.java) -} diff --git a/app/src/main/java/com/hippo/util/ParcelableCompat.kt b/app/src/main/java/com/hippo/util/ParcelableCompat.kt new file mode 100644 index 000000000..afea45252 --- /dev/null +++ b/app/src/main/java/com/hippo/util/ParcelableCompat.kt @@ -0,0 +1,15 @@ +package com.hippo.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? { + return BundleCompat.getParcelable(this, key, T::class.java) +} + +inline fun Intent.getParcelableExtraCompat(key: String?): T? { + return IntentCompat.getParcelableExtra(this, key, T::class.java) +} diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 415cb6363..f5d87294d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -76,6 +76,7 @@ import com.hippo.image.Image import com.hippo.unifile.UniFile import com.hippo.util.ExceptionUtils import com.hippo.util.getParcelableCompat +import com.hippo.util.getParcelableExtraCompat import com.hippo.yorozuya.FileUtils import com.hippo.yorozuya.IOUtils import dev.chrisbanes.insetter.applyInsetter @@ -223,7 +224,7 @@ class ReaderActivity : EhActivity() { mAction = intent.action mFilename = intent.getStringExtra(KEY_FILENAME) mUri = intent.data - mGalleryInfo = intent.getParcelableExtra(KEY_GALLERY_INFO) + mGalleryInfo = intent.getParcelableExtraCompat(KEY_GALLERY_INFO) mPage = intent.getIntExtra(KEY_PAGE, -1) buildProvider() }