From ad1afdc52979537ff8439297acd6b0d5726cb7b0 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 4 Nov 2023 23:21:24 -0400 Subject: [PATCH] Minor cleanup (cherry picked from commit 056dbaefda791b53240265c8e9562a01f17118c4) --- app/src/main/java/eu/kanade/tachiyomi/App.kt | 7 ++++--- .../eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index 4173d2e16..5dd3cedaa 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -12,6 +12,7 @@ import android.os.Build import android.os.Environment import android.os.Looper import android.webkit.WebView +import androidx.core.content.ContextCompat import androidx.core.content.getSystemService import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner @@ -211,7 +212,7 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory { if (chromiumElement?.methodName.equals("getAll", ignoreCase = true)) { return WebViewUtil.SPOOF_PACKAGE_NAME } - } catch (e: Exception) { + } catch (_: Exception) { } } return super.getPackageName() @@ -303,7 +304,7 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory { fun register() { if (!registered) { - registerReceiver(this, IntentFilter(ACTION_DISABLE_INCOGNITO_MODE)) + ContextCompat.registerReceiver(this@App, this, IntentFilter(ACTION_DISABLE_INCOGNITO_MODE), ContextCompat.RECEIVER_NOT_EXPORTED) registered = true } } @@ -322,7 +323,7 @@ private const val ACTION_DISABLE_INCOGNITO_MODE = "tachi.action.DISABLE_INCOGNIT /** * Direct copy of Coil's internal SingletonDiskCache so that [MangaCoverFetcher] can access it. */ -internal object CoilDiskCache { +private object CoilDiskCache { private const val FOLDER_NAME = "image_cache" private var instance: DiskCache? = null diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt index 243abb1fa..4e6351de7 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt @@ -15,10 +15,10 @@ class AppUpdateChecker { private val getApplicationRelease: GetApplicationRelease by injectLazy() suspend fun checkForUpdate(context: Context, forceCheck: Boolean = false): GetApplicationRelease.Result { - // Disabling app update checks for older Android versions that we're going to drop support for if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { return GetApplicationRelease.Result.OsTooOld } + // Disable app update checks for older Android versions that we're going to drop support for return withIOContext { val result = getApplicationRelease.await(