Address misc. build warnings

2025-11-12 20:19:05 +01:00 · 2022-08-10 23:26:34 -04:00
parent 24e64f52e2
commit d6f1534ee8
29 changed files with 96 additions and 37 deletions
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
@@ -17,6 +17,7 @@ import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchPresenter
 import eu.kanade.tachiyomi.ui.manga.MangaController
+import eu.kanade.tachiyomi.util.system.getSerializableCompat
 import kotlinx.coroutines.runBlocking
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -50,8 +51,8 @@ class SearchController(

    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
        super.onRestoreInstanceState(savedInstanceState)
-        manga = savedInstanceState.getSerializable(::manga.name) as? Manga
-        newManga = savedInstanceState.getSerializable(::newManga.name) as? Manga
+        manga = savedInstanceState.getSerializableCompat(::manga.name)
+        newManga = savedInstanceState.getSerializableCompat(::newManga.name)
    }

    fun migrateManga(manga: Manga? = null, newManga: Manga?) {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
@@ -6,6 +6,7 @@ import eu.kanade.domain.manga.model.Manga
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.browse.source.browse.SourceItem
+import eu.kanade.tachiyomi.util.system.getSerializableCompat

 class SourceSearchController(
    bundle: Bundle,
@@ -20,7 +21,7 @@ class SourceSearchController(
            }
        },
    )
-    private var oldManga: Manga? = args.getSerializable(MANGA_KEY) as Manga?
+    private var oldManga: Manga? = args.getSerializableCompat(MANGA_KEY)
    private var newManga: Manga? = null

    override fun onItemClick(view: View, position: Int): Boolean {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
@@ -52,12 +52,12 @@ class SourceItem(val manga: Manga, private val displayMode: Preference<DisplayMo
    override fun equals(other: Any?): Boolean {
        if (this === other) return true
        if (other is SourceItem) {
-            return manga.id!! == other.manga.id!!
+            return manga.id == other.manga.id
        }
        return false
    }

    override fun hashCode(): Int {
-        return manga.id!!.hashCode()
+        return manga.id.hashCode()
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/AddDuplicateMangaDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/AddDuplicateMangaDialog.kt
@@ -40,7 +40,7 @@ class AddDuplicateMangaDialog(bundle: Bundle? = null) : DialogController(bundle)
            .setNegativeButton(android.R.string.cancel, null)
            .setNeutralButton(activity?.getString(R.string.action_show_manga)) { _, _ ->
                dismissDialog()
-                router.pushController(MangaController(libraryManga.id!!))
+                router.pushController(MangaController(libraryManga.id))
            }
            .setCancelable(true)
            .create()
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetChapterSettingsDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetChapterSettingsDialog.kt
@@ -8,6 +8,7 @@ import eu.kanade.domain.manga.model.Manga
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.util.chapter.ChapterSettingsHelper
+import eu.kanade.tachiyomi.util.system.getSerializableCompat
 import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.widget.DialogCheckboxView

@@ -27,7 +28,7 @@ class SetChapterSettingsDialog(bundle: Bundle? = null) : DialogController(bundle
            .setTitle(R.string.chapter_settings)
            .setView(view)
            .setPositiveButton(android.R.string.ok) { _, _ ->
-                ChapterSettingsHelper.setGlobalSettings(args.getSerializable(MANGA_KEY)!! as Manga)
+                ChapterSettingsHelper.setGlobalSettings(args.getSerializableCompat(MANGA_KEY)!!)
                if (view.isChecked()) {
                    ChapterSettingsHelper.updateAllMangasWithGlobalDefaults()
                }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt
@@ -11,6 +11,7 @@ import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.databinding.TrackChaptersDialogBinding
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
+import eu.kanade.tachiyomi.util.system.getSerializableCompat
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

@@ -31,7 +32,7 @@ class SetTrackChaptersDialog<T> : DialogController

    @Suppress("unused")
    constructor(bundle: Bundle) : super(bundle) {
-        val track = bundle.getSerializable(KEY_ITEM_TRACK) as Track
+        val track = bundle.getSerializableCompat<Track>(KEY_ITEM_TRACK)!!
        val service = Injekt.get<TrackManager>().getService(track.sync_id.toLong())!!
        item = TrackItem(track, service)
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt
@@ -11,6 +11,7 @@ import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.databinding.TrackScoreDialogBinding
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
+import eu.kanade.tachiyomi.util.system.getSerializableCompat
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

@@ -31,7 +32,7 @@ class SetTrackScoreDialog<T> : DialogController

    @Suppress("unused")
    constructor(bundle: Bundle) : super(bundle) {
-        val track = bundle.getSerializable(KEY_ITEM_TRACK) as Track
+        val track = bundle.getSerializableCompat<Track>(KEY_ITEM_TRACK)!!
        val service = Injekt.get<TrackManager>().getService(track.sync_id.toLong())!!
        item = TrackItem(track, service)
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt
@@ -9,6 +9,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
+import eu.kanade.tachiyomi.util.system.getSerializableCompat
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

@@ -29,7 +30,7 @@ class SetTrackStatusDialog<T> : DialogController

    @Suppress("unused")
    constructor(bundle: Bundle) : super(bundle) {
-        val track = bundle.getSerializable(KEY_ITEM_TRACK) as Track
+        val track = bundle.getSerializableCompat<Track>(KEY_ITEM_TRACK)!!
        val service = Injekt.get<TrackManager>().getService(track.sync_id.toLong())!!
        item = TrackItem(track, service)
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
@@ -103,7 +103,7 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
                }
            },
        )
-        pager.tapListener = f@{ event ->
+        pager.tapListener = { event ->
            val pos = PointF(event.rawX / pager.width, event.rawY / pager.height)
            val navigator = config.navigator

--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt
@@ -116,7 +116,7 @@ class WebtoonViewer(val activity: ReaderActivity, val isContinuous: Boolean = tr
                }
            },
        )
-        recycler.tapListener = f@{ event ->
+        recycler.tapListener = { event ->
            val pos = PointF(event.rawX / recycler.width, event.rawY / recycler.height)
            val navigator = config.navigator

--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
@@ -37,6 +37,7 @@ import eu.kanade.tachiyomi.util.preference.preferenceCategory
 import eu.kanade.tachiyomi.util.preference.summaryRes
 import eu.kanade.tachiyomi.util.preference.titleRes
 import eu.kanade.tachiyomi.util.system.DeviceUtil
+import eu.kanade.tachiyomi.util.system.getParcelableCompat
 import eu.kanade.tachiyomi.util.system.openInBrowser
 import eu.kanade.tachiyomi.util.system.toast
 import kotlinx.coroutines.flow.launchIn
@@ -266,7 +267,7 @@ class SettingsBackupController : SettingsController() {

        override fun onCreateDialog(savedViewState: Bundle?): Dialog {
            val activity = activity!!
-            val uri: Uri = args.getParcelable(KEY_URI)!!
+            val uri = args.getParcelableCompat<Uri>(KEY_URI)!!

            return try {
                val results = BackupFileValidator().validate(activity, uri)