From 4deaa41c53fec59604d5cd4a0ba63c6e91add5b4 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 1 Jun 2024 14:52:54 -0400 Subject: [PATCH] Cleanup some build warnings --- .../java/eu/kanade/tachiyomi/data/download/DownloadManager.kt | 2 ++ .../main/java/eu/kanade/tachiyomi/data/download/Downloader.kt | 2 ++ .../eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt | 2 ++ .../kanade/tachiyomi/data/notification/NotificationReceiver.kt | 2 ++ app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt | 2 +- .../eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt | 2 ++ .../kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt | 2 +- .../kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt | 2 ++ .../tachiyomi/core/common/util/lang/RxCoroutineBridge.kt | 3 ++- 9 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt index cd653af5d..e714ed2b2 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt @@ -7,6 +7,7 @@ import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.util.storage.DiskUtil import exh.log.xLogE +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.asFlow import kotlinx.coroutines.flow.drop @@ -35,6 +36,7 @@ import uy.kohesive.injekt.api.get * and retrieved through dependency injection. You can use this class to queue new chapters or query * downloaded chapters. */ +@OptIn(DelicateCoroutinesApi::class) class DownloadManager( private val context: Context, private val provider: DownloadProvider = Injekt.get(), diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt index 8d950b4ad..fcf45e96c 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt @@ -21,6 +21,7 @@ import exh.util.DataSaver import exh.util.DataSaver.Companion.getImage import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob @@ -76,6 +77,7 @@ import java.util.zip.ZipOutputStream * * Its queue contains the list of chapters to download. */ +@OptIn(DelicateCoroutinesApi::class) class Downloader( private val context: Context, private val provider: DownloadProvider, diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt index 97dd45d4a..2dd956c78 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt @@ -27,6 +27,7 @@ import eu.kanade.tachiyomi.util.system.cancelNotification import eu.kanade.tachiyomi.util.system.getBitmapOrNull import eu.kanade.tachiyomi.util.system.notificationBuilder import eu.kanade.tachiyomi.util.system.notify +import kotlinx.coroutines.DelicateCoroutinesApi import tachiyomi.core.common.Constants import tachiyomi.core.common.i18n.pluralStringResource import tachiyomi.core.common.i18n.stringResource @@ -41,6 +42,7 @@ import uy.kohesive.injekt.api.get import java.math.RoundingMode import java.text.NumberFormat +@OptIn(DelicateCoroutinesApi::class) class LibraryUpdateNotifier( private val context: Context, diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt index cd4908141..0c4750103 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt @@ -19,6 +19,7 @@ import eu.kanade.tachiyomi.util.system.getParcelableExtraCompat import eu.kanade.tachiyomi.util.system.notificationManager import eu.kanade.tachiyomi.util.system.toShareIntent import eu.kanade.tachiyomi.util.system.toast +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.runBlocking import tachiyomi.core.common.Constants import tachiyomi.core.common.util.lang.launchIO @@ -41,6 +42,7 @@ import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID * Pending Broadcasts should be made from here. * NOTE: Use local broadcasts if possible. */ +@OptIn(DelicateCoroutinesApi::class) class NotificationReceiver : BroadcastReceiver() { private val getManga: GetManga by injectLazy() diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt index 186042ac1..2967aa35a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt @@ -153,7 +153,7 @@ class SyncManager( } // Stop the sync early if the remote backup is null or empty - if (remoteBackup.backupManga?.size == 0) { + if (remoteBackup.backupManga.size == 0) { notifier.showSyncError("No data found on remote server.") return } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt index 1d13925d9..e810151a0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt @@ -13,6 +13,7 @@ import exh.util.DataSaver import exh.util.DataSaver.Companion.getImage import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel @@ -31,6 +32,7 @@ import kotlin.math.min /** * Loader used to load chapters from an online source. */ +@OptIn(DelicateCoroutinesApi::class) internal class HttpPageLoader( private val chapter: ReaderChapter, private val source: HttpSource, diff --git a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt index 5c7894606..1db47502a 100644 --- a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt +++ b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt @@ -7,7 +7,7 @@ import tachiyomi.core.common.util.lang.withIOContext /** * Util for evaluating JavaScript in sources. */ -@Suppress("UNUSED", "UNCHECKED_CAST") +@Suppress("UNUSED", "UNCHECKED_CAST", "UNUSED_PARAMETER") class JavaScriptEngine(context: Context) { /** diff --git a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt index e18fa4299..6692729d5 100644 --- a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt +++ b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt @@ -9,6 +9,7 @@ import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.WebViewUtil import eu.kanade.tachiyomi.util.system.setDefaultSettings import eu.kanade.tachiyomi.util.system.toast +import kotlinx.coroutines.DelicateCoroutinesApi import okhttp3.Headers import okhttp3.Interceptor import okhttp3.Request @@ -48,6 +49,7 @@ abstract class WebViewInterceptor( abstract fun intercept(chain: Interceptor.Chain, request: Request, response: Response): Response + @OptIn(DelicateCoroutinesApi::class) override fun intercept(chain: Interceptor.Chain): Response { val request = chain.request() val response = chain.proceed(request) diff --git a/core/common/src/main/kotlin/tachiyomi/core/common/util/lang/RxCoroutineBridge.kt b/core/common/src/main/kotlin/tachiyomi/core/common/util/lang/RxCoroutineBridge.kt index c936938d8..4e7687a98 100644 --- a/core/common/src/main/kotlin/tachiyomi/core/common/util/lang/RxCoroutineBridge.kt +++ b/core/common/src/main/kotlin/tachiyomi/core/common/util/lang/RxCoroutineBridge.kt @@ -3,6 +3,7 @@ package tachiyomi.core.common.util.lang import kotlinx.coroutines.CancellableContinuation import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineStart +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.GlobalScope @@ -64,7 +65,7 @@ private suspend fun Observable.awaitOne(): T = suspendCancellableCoroutin internal fun CancellableContinuation.unsubscribeOnCancellation(sub: Subscription) = invokeOnCancellation { sub.unsubscribe() } -@OptIn(ExperimentalCoroutinesApi::class) +@OptIn(ExperimentalCoroutinesApi::class, DelicateCoroutinesApi::class) fun runAsObservable( backpressureMode: Emitter.BackpressureMode = Emitter.BackpressureMode.NONE, block: suspend () -> T,