From ee90967e15e6cc16bbaef9d32057fed99f604eaf Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Mon, 25 Sep 2023 18:53:57 -0700
Subject: [PATCH] Fixes to targeting SDK 34

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../extension/util/ExtensionInstaller.kt      |  4 +++-
 .../ui/webview/BaseWebViewActivity.kt         | 23 -------------------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ce21e5a3cb..f259297e09 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,6 +17,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <!-- For managing extensions -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt
index 08292cc107..6553531db2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt
@@ -4,11 +4,13 @@ import android.annotation.SuppressLint
 import android.app.DownloadManager
 import android.content.BroadcastReceiver
 import android.content.Context
+import android.content.Context.RECEIVER_EXPORTED
 import android.content.Intent
 import android.content.IntentFilter
 import android.net.Uri
 import android.os.Build
 import android.os.Environment
+import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import androidx.preference.PreferenceManager
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys
@@ -375,7 +377,7 @@ internal class ExtensionInstaller(private val context: Context) {
             isRegistered = true
 
             val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
-            context.registerReceiver(this, filter)
+            ContextCompat.registerReceiver(context, this, filter, ContextCompat.RECEIVER_EXPORTED)
         }
 
         /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt
index 3eddccafd8..5d9d4decb8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt
@@ -26,12 +26,6 @@ import androidx.core.view.marginBottom
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
-import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
-import androidx.webkit.WebSettingsCompat.FORCE_DARK_OFF
-import androidx.webkit.WebSettingsCompat.FORCE_DARK_ON
-import androidx.webkit.WebSettingsCompat.setForceDark
-import androidx.webkit.WebSettingsCompat.setForceDarkStrategy
-import androidx.webkit.WebViewFeature
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.asImmediateFlowIn
 import eu.kanade.tachiyomi.databinding.WebviewActivityBinding
@@ -121,7 +115,6 @@ open class BaseWebViewActivity : BaseActivity<WebviewActivityBinding>() {
             insets
         }
 
-        setWebDarkMode()
         binding.swipeRefresh.isEnabled = false
 
         if (bundle == null) {
@@ -163,21 +156,6 @@ open class BaseWebViewActivity : BaseActivity<WebviewActivityBinding>() {
             }
     }
 
-    private fun setWebDarkMode() {
-        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
-            setForceDarkStrategy(
-                binding.webview.settings,
-                DARK_STRATEGY_WEB_THEME_DARKENING_ONLY,
-            )
-            if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
-                setForceDark(
-                    binding.webview.settings,
-                    if (isInNightMode()) FORCE_DARK_ON else FORCE_DARK_OFF,
-                )
-            }
-        }
-    }
-
     override fun onProvideAssistContent(outContent: AssistContent?) {
         super.onProvideAssistContent(outContent)
         binding.webview.url?.let { outContent?.webUri = it.toUri() }
@@ -211,7 +189,6 @@ open class BaseWebViewActivity : BaseActivity<WebviewActivityBinding>() {
                 R.attr.colorPrimaryVariant,
             ),
         )
-        setWebDarkMode()
         val colorSurface = attrs.getColor(0, 0)
         val actionBarTintColor = attrs.getColor(1, 0)
         val colorPrimaryVariant = attrs.getColor(2, 0)