AppFuton · LandWarderer2772 · Mar 21, 2026 · Mar 20, 2026 · Mar 21, 2026 · Mar 21, 2026
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,7 +30,7 @@ android {
 		applicationId 'io.github.landwarderer.futon'
 		minSdk = 23
 		targetSdk = 36
-		versionCode project.hasProperty('versionCode') ? project.property('versionCode').toInteger() : 90613
+		versionCode project.hasProperty('versionCode') ? project.property('versionCode').toInteger() : 90614
         versionName project.hasProperty('versionName') ? project.property('versionName') : '9.6.13'
         generatedDensities = []
 		testInstrumentationRunner 'io.github.landwarderer.futon.HiltTestRunner'
@@ -124,7 +124,7 @@ android {
 		unitTests.includeAndroidResources true
 		unitTests.returnDefaultValues false
 		kotlinOptions {
-			freeCompilerArgs += ['-opt-in=io.github.landwarderer.futon.parsers.InternalParsersApi']
+			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
 		}
 	}
 	applicationVariants.configureEach { variant ->
@@ -145,7 +145,7 @@ dependencies {
 		parsersVersion = System.getProperty('parsersVersionOverride')
 	}
 	//noinspection UseTomlInstead
-	implementation("com.github.AppFuton:futon-parsers:$parsersVersion") {
+	implementation("com.github.clquwu:kotatsu-parsers-redo:$parsersVersion") {
 		exclude group: 'org.json', module: 'json'
 	}
 

diff --git a/app/src/androidTest/kotlin/io/github/landwarderer/futon/SampleData.kt b/app/src/androidTest/kotlin/io/github/landwarderer/futon/SampleData.kt
@@ -12,8 +12,8 @@ import okio.buffer
 import okio.source
 import io.github.landwarderer.futon.core.model.FavouriteCategory
 import io.github.landwarderer.futon.core.model.MangaSource
-import io.github.landwarderer.futon.parsers.model.Manga
-import io.github.landwarderer.futon.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import java.time.Instant
 import java.util.Date
 import kotlin.reflect.KClass

diff --git a/app/src/debug/kotlin/io/github/landwarderer/futon/core/parser/TestMangaRepository.kt b/app/src/debug/kotlin/io/github/landwarderer/futon/core/parser/TestMangaRepository.kt
@@ -2,14 +2,14 @@ package io.github.landwarderer.futon.core.parser
 
 import io.github.landwarderer.futon.core.cache.MemoryContentCache
 import io.github.landwarderer.futon.core.model.TestMangaSource
-import io.github.landwarderer.futon.parsers.MangaLoaderContext
-import io.github.landwarderer.futon.parsers.model.Manga
-import io.github.landwarderer.futon.parsers.model.MangaChapter
-import io.github.landwarderer.futon.parsers.model.MangaListFilter
-import io.github.landwarderer.futon.parsers.model.MangaListFilterCapabilities
-import io.github.landwarderer.futon.parsers.model.MangaListFilterOptions
-import io.github.landwarderer.futon.parsers.model.MangaPage
-import io.github.landwarderer.futon.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
+import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.util.EnumSet
 
 /*

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/domain/AlternativesUseCase.kt b/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/domain/AlternativesUseCase.kt
@@ -9,10 +9,10 @@ import kotlinx.coroutines.sync.withPermit
 import io.github.landwarderer.futon.core.parser.MangaRepository
 import io.github.landwarderer.futon.core.util.ext.toLocale
 import io.github.landwarderer.futon.explore.data.MangaSourcesRepository
-import io.github.landwarderer.futon.parsers.model.Manga
-import io.github.landwarderer.futon.parsers.model.MangaParserSource
-import io.github.landwarderer.futon.parsers.model.MangaSource
-import io.github.landwarderer.futon.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaParserSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import io.github.landwarderer.futon.search.domain.SearchKind
 import io.github.landwarderer.futon.search.domain.SearchV2Helper
 import java.util.Locale

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/domain/AutoFixUseCase.kt b/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/domain/AutoFixUseCase.kt
@@ -16,8 +16,8 @@ import io.github.landwarderer.futon.core.model.parcelable.ParcelableManga
 import io.github.landwarderer.futon.core.parser.MangaDataRepository
 import io.github.landwarderer.futon.core.parser.MangaRepository
 import io.github.landwarderer.futon.core.util.ext.concat
-import io.github.landwarderer.futon.parsers.model.Manga
-import io.github.landwarderer.futon.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlin.coroutines.cancellation.CancellationException

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/domain/MigrateUseCase.kt b/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/domain/MigrateUseCase.kt
@@ -9,9 +9,9 @@ import io.github.landwarderer.futon.details.domain.ProgressUpdateUseCase
 import io.github.landwarderer.futon.history.data.HistoryEntity
 import io.github.landwarderer.futon.history.data.toMangaHistory
 import io.github.landwarderer.futon.list.domain.ReadingProgress.Companion.PROGRESS_NONE
-import io.github.landwarderer.futon.parsers.model.Manga
-import io.github.landwarderer.futon.parsers.model.MangaChapter
-import io.github.landwarderer.futon.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import io.github.landwarderer.futon.scrobbling.common.domain.Scrobbler
 import io.github.landwarderer.futon.scrobbling.common.domain.model.ScrobblingStatus
 import io.github.landwarderer.futon.tracker.data.TrackEntity

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/ui/AlternativesActivity.kt b/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/ui/AlternativesActivity.kt
@@ -29,7 +29,7 @@ import io.github.landwarderer.futon.list.ui.adapter.emptyStateListAD
 import io.github.landwarderer.futon.list.ui.adapter.loadingFooterAD
 import io.github.landwarderer.futon.list.ui.adapter.loadingStateAD
 import io.github.landwarderer.futon.list.ui.model.ListModel
-import io.github.landwarderer.futon.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
 import javax.inject.Inject
 
 @AndroidEntryPoint

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/ui/AlternativesViewModel.kt b/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/ui/AlternativesViewModel.kt
@@ -32,9 +32,9 @@ import io.github.landwarderer.futon.list.ui.model.ListModel
 import io.github.landwarderer.futon.list.ui.model.LoadingFooter
 import io.github.landwarderer.futon.list.ui.model.LoadingState
 import io.github.landwarderer.futon.list.ui.model.MangaGridModel
-import io.github.landwarderer.futon.parsers.model.Manga
-import io.github.landwarderer.futon.parsers.util.suspendlazy.getOrDefault
-import io.github.landwarderer.futon.parsers.util.suspendlazy.suspendLazy
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.suspendlazy.getOrDefault
+import org.koitharu.kotatsu.parsers.util.suspendlazy.suspendLazy
 import javax.inject.Inject
 
 @HiltViewModel

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/ui/AutoFixService.kt b/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/ui/AutoFixService.kt
@@ -29,8 +29,8 @@ import io.github.landwarderer.futon.core.util.ext.powerManager
 import io.github.landwarderer.futon.core.util.ext.printStackTraceDebug
 import io.github.landwarderer.futon.core.util.ext.toBitmapOrNull
 import io.github.landwarderer.futon.core.util.ext.withPartialWakeLock
-import io.github.landwarderer.futon.parsers.model.Manga
-import io.github.landwarderer.futon.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 import androidx.appcompat.R as appcompatR

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/ui/MangaAlternativeModel.kt b/app/src/main/kotlin/io/github/landwarderer/futon/alternatives/ui/MangaAlternativeModel.kt
@@ -3,7 +3,7 @@ package io.github.landwarderer.futon.alternatives.ui
 import io.github.landwarderer.futon.core.model.chaptersCount
 import io.github.landwarderer.futon.list.ui.model.ListModel
 import io.github.landwarderer.futon.list.ui.model.MangaGridModel
-import io.github.landwarderer.futon.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
 
 data class MangaAlternativeModel(
 	val mangaModel: MangaGridModel,

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/backups/data/BackupRepository.kt b/app/src/main/kotlin/io/github/landwarderer/futon/backups/data/BackupRepository.kt
@@ -37,7 +37,7 @@ import io.github.landwarderer.futon.core.util.progress.Progress
 import io.github.landwarderer.futon.explore.data.MangaSourcesRepository
 import io.github.landwarderer.futon.filter.data.PersistableFilter
 import io.github.landwarderer.futon.filter.data.SavedFiltersRepository
-import io.github.landwarderer.futon.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import io.github.landwarderer.futon.reader.data.TapGridSettings
 import java.io.InputStream
 import java.io.OutputStream

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/backups/data/model/BookmarkBackup.kt b/app/src/main/kotlin/io/github/landwarderer/futon/backups/data/model/BookmarkBackup.kt
@@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import io.github.landwarderer.futon.bookmarks.data.BookmarkEntity
 import io.github.landwarderer.futon.core.db.entity.MangaWithTags
-import io.github.landwarderer.futon.parsers.util.mapToSet
+import org.koitharu.kotatsu.parsers.util.mapToSet
 
 @Serializable
 class BookmarkBackup(

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/backups/data/model/MangaBackup.kt b/app/src/main/kotlin/io/github/landwarderer/futon/backups/data/model/MangaBackup.kt
@@ -4,8 +4,8 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import io.github.landwarderer.futon.core.db.entity.MangaEntity
 import io.github.landwarderer.futon.core.db.entity.MangaWithTags
-import io.github.landwarderer.futon.parsers.model.RATING_UNKNOWN
-import io.github.landwarderer.futon.parsers.util.mapToSet
+import org.koitharu.kotatsu.parsers.model.RATING_UNKNOWN
+import org.koitharu.kotatsu.parsers.util.mapToSet
 
 @Serializable
 class MangaBackup(

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/backups/domain/ExternalBackupStorage.kt b/app/src/main/kotlin/io/github/landwarderer/futon/backups/domain/ExternalBackupStorage.kt
@@ -7,7 +7,7 @@ import androidx.documentfile.provider.DocumentFile
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.landwarderer.futon.core.prefs.AppSettings
 import io.github.landwarderer.futon.core.util.ext.printStackTraceDebug
-import io.github.landwarderer.futon.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import okio.buffer

diff --git a/.../main/kotlin/io/github/landwarderer/futon/backups/ui/periodical/TelegramBackupUploader.kt b/.../main/kotlin/io/github/landwarderer/futon/backups/ui/periodical/TelegramBackupUploader.kt
@@ -15,10 +15,10 @@ import io.github.landwarderer.futon.R
 import io.github.landwarderer.futon.core.nav.AppRouter
 import io.github.landwarderer.futon.core.network.BaseHttpClient
 import io.github.landwarderer.futon.core.prefs.AppSettings
-import io.github.landwarderer.futon.parsers.util.await
-import io.github.landwarderer.futon.parsers.util.json.getBooleanOrDefault
-import io.github.landwarderer.futon.parsers.util.json.getStringOrNull
-import io.github.landwarderer.futon.parsers.util.parseJson
+import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
+import org.koitharu.kotatsu.parsers.util.parseJson
 import java.io.File
 import javax.inject.Inject
 

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/bookmarks/data/EntityMapping.kt b/app/src/main/kotlin/io/github/landwarderer/futon/bookmarks/data/EntityMapping.kt
@@ -1,7 +1,7 @@
 package io.github.landwarderer.futon.bookmarks.data
 
 import io.github.landwarderer.futon.bookmarks.domain.Bookmark
-import io.github.landwarderer.futon.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
 import java.time.Instant
 
 fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/bookmarks/domain/Bookmark.kt b/app/src/main/kotlin/io/github/landwarderer/futon/bookmarks/domain/Bookmark.kt
@@ -3,8 +3,8 @@ package io.github.landwarderer.futon.bookmarks.domain
 import io.github.landwarderer.futon.core.util.MimeTypes
 import io.github.landwarderer.futon.core.util.ext.isImage
 import io.github.landwarderer.futon.list.ui.model.ListModel
-import io.github.landwarderer.futon.parsers.model.Manga
-import io.github.landwarderer.futon.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaPage
 import java.time.Instant
 
 data class Bookmark(

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/bookmarks/domain/BookmarksRepository.kt b/app/src/main/kotlin/io/github/landwarderer/futon/bookmarks/domain/BookmarksRepository.kt
@@ -14,7 +14,7 @@ import io.github.landwarderer.futon.core.db.entity.toManga
 import io.github.landwarderer.futon.core.ui.util.ReversibleHandle
 import io.github.landwarderer.futon.core.util.ext.mapItems
 import io.github.landwarderer.futon.core.util.ext.printStackTraceDebug
-import io.github.landwarderer.futon.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/bookmarks/ui/AllBookmarksFragment.kt b/app/src/main/kotlin/io/github/landwarderer/futon/bookmarks/ui/AllBookmarksFragment.kt
@@ -38,7 +38,7 @@ import io.github.landwarderer.futon.list.ui.adapter.ListStateHolderListener
 import io.github.landwarderer.futon.list.ui.adapter.TypedListSpacingDecoration
 import io.github.landwarderer.futon.list.ui.model.ListHeader
 import io.github.landwarderer.futon.main.ui.owners.AppBarOwner
-import io.github.landwarderer.futon.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
 import io.github.landwarderer.futon.reader.ui.PageSaveHelper
 import javax.inject.Inject
 

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/bookmarks/ui/AllBookmarksViewModel.kt b/app/src/main/kotlin/io/github/landwarderer/futon/bookmarks/ui/AllBookmarksViewModel.kt
@@ -21,7 +21,7 @@ import io.github.landwarderer.futon.list.ui.model.ListHeader
 import io.github.landwarderer.futon.list.ui.model.ListModel
 import io.github.landwarderer.futon.list.ui.model.LoadingState
 import io.github.landwarderer.futon.list.ui.model.toErrorState
-import io.github.landwarderer.futon.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
 import io.github.landwarderer.futon.reader.ui.PageSaveHelper
 import javax.inject.Inject
 

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/browser/BaseBrowserActivity.kt b/app/src/main/kotlin/io/github/landwarderer/futon/browser/BaseBrowserActivity.kt
@@ -17,8 +17,8 @@ import io.github.landwarderer.futon.core.ui.BaseActivity
 import io.github.landwarderer.futon.core.util.ext.configureForParser
 import io.github.landwarderer.futon.core.util.ext.consumeAll
 import io.github.landwarderer.futon.databinding.ActivityBrowserBinding
-import io.github.landwarderer.futon.parsers.model.MangaSource
-import io.github.landwarderer.futon.parsers.util.nullIfEmpty
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.nullIfEmpty
 import javax.inject.Inject
 
 @AndroidEntryPoint

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/browser/BrowserActivity.kt b/app/src/main/kotlin/io/github/landwarderer/futon/browser/BrowserActivity.kt
@@ -16,7 +16,7 @@ import io.github.landwarderer.futon.core.nav.router
 import io.github.landwarderer.futon.core.parser.ParserMangaRepository
 import io.github.landwarderer.futon.core.util.ext.getDisplayMessage
 import io.github.landwarderer.futon.core.util.ext.printStackTraceDebug
-import io.github.landwarderer.futon.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import kotlinx.coroutines.launch
 
 @AndroidEntryPoint

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/browser/cloudflare/CloudFlareActivity.kt b/app/src/main/kotlin/io/github/landwarderer/futon/browser/cloudflare/CloudFlareActivity.kt
@@ -3,13 +3,20 @@ package io.github.landwarderer.futon.browser.cloudflare
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.core.view.isInvisible
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.yield
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import io.github.landwarderer.futon.R
 import io.github.landwarderer.futon.browser.BaseBrowserActivity
 import io.github.landwarderer.futon.core.exceptions.CloudFlareProtectedException
@@ -20,16 +27,11 @@ import io.github.landwarderer.futon.core.network.cookies.MutableCookieJar
 import io.github.landwarderer.futon.core.parser.ParserMangaRepository
 import io.github.landwarderer.futon.core.util.ext.getDisplayMessage
 import io.github.landwarderer.futon.core.util.ext.printStackTraceDebug
-import io.github.landwarderer.futon.parsers.model.MangaSource
-import io.github.landwarderer.futon.parsers.network.CloudFlareHelper
-import io.github.landwarderer.futon.parsers.util.ifNullOrEmpty
-import io.github.landwarderer.futon.parsers.util.runCatchingCancellable
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runInterruptible
-import kotlinx.coroutines.yield
-import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.network.CloudFlareHelper
+import org.koitharu.kotatsu.parsers.util.ifNullOrEmpty
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -52,7 +54,19 @@ class CloudFlareActivity : BaseBrowserActivity(), CloudFlareCallback {
 			finishAfterTransition()
 			return
 		}
-		cfClient = CloudFlareClient(cookieJar, this, adBlock, url)
+
+		// Check if source needs header interception
+		val needsInterception = shouldUseInterception(source, repository)
+		Log.d(TAG, "Source: ${source.name}, needsInterception: $needsInterception")
+
+		cfClient = if (needsInterception) {
+			Log.d(TAG, "Using CloudFlareInterceptClient with header filtering")
+			CloudFlareInterceptClient(cookieJar, this, adBlock, url)
+		} else {
+			Log.d(TAG, "Using regular CloudFlareClient (no interception)")
+			CloudFlareClient(cookieJar, this, adBlock, url)
+		}
+
 		viewBinding.webView.webViewClient = cfClient
 		lifecycleScope.launch {
 			try {
@@ -141,6 +155,31 @@ class CloudFlareActivity : BaseBrowserActivity(), CloudFlareCallback {
 		}
 	}
 
+	private fun shouldUseInterception(source: MangaSource, repository: ParserMangaRepository?): Boolean {
+		Log.d(TAG, "shouldUseInterception called for source: ${source.name}")
+		Log.d(TAG, "Repository type: ${repository?.javaClass?.simpleName}")
+
+		if (repository !is ParserMangaRepository) {
+			Log.d(TAG, "Repository is not ParserMangaRepository, returning false")
+			return false
+		}
+
+		// Check if parser has InterceptCloudflare ConfigKey
+		val configKeys = repository.getConfigKeys()
+		Log.d(TAG, "Config keys count: ${configKeys.size}")
+		Log.d(TAG, "Config keys: ${configKeys.map { it.javaClass.simpleName }}")
+
+		val interceptKey = configKeys.filterIsInstance<ConfigKey.InterceptCloudflare>().firstOrNull()
+		Log.d(TAG, "InterceptCloudflare key found: ${interceptKey != null}")
+		if (interceptKey != null) {
+			Log.d(TAG, "InterceptCloudflare defaultValue: ${interceptKey.defaultValue}")
+		}
+
+		val result = interceptKey?.defaultValue == true
+		Log.d(TAG, "Returning: $result")
+		return result
+	}
+
 	class Contract : ActivityResultContract<CloudFlareProtectedException, Boolean>() {
 		override fun createIntent(context: Context, input: CloudFlareProtectedException): Intent {
 			return AppRouter.cloudFlareResolveIntent(context, input)

diff --git a/app/src/main/kotlin/io/github/landwarderer/futon/browser/cloudflare/CloudFlareClient.kt b/app/src/main/kotlin/io/github/landwarderer/futon/browser/cloudflare/CloudFlareClient.kt
@@ -5,11 +5,11 @@ import android.webkit.WebView
 import io.github.landwarderer.futon.browser.BrowserClient
 import io.github.landwarderer.futon.core.network.cookies.MutableCookieJar
 import io.github.landwarderer.futon.core.network.webview.adblock.AdBlock
-import io.github.landwarderer.futon.parsers.network.CloudFlareHelper
+import org.koitharu.kotatsu.parsers.network.CloudFlareHelper
 
 private const val LOOP_COUNTER = 3
 
-class CloudFlareClient(
+open class CloudFlareClient(
 	private val cookieJar: MutableCookieJar,
 	private val callback: CloudFlareCallback,
 	adBlock: AdBlock,